Skip to content

Commit 820f2e0

Browse files
authored
Merge pull request #1563 from ropalka/UNDERTOW-2353
[UNDERTOW-2353] A few adjustments to make Undertow build and test on JDK21
2 parents cfe3439 + b0be853 commit 820f2e0

File tree

3 files changed

+17
-3
lines changed

3 files changed

+17
-3
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
matrix:
6060
os: [ubuntu-latest, windows-latest, macos-latest]
6161
module: [core, servlet, websockets-jsr]
62-
jdk: [11, 17]
62+
jdk: [11, 17, 21]
6363
openjdk_impl: [ temurin ]
6464
steps:
6565
- name: Update hosts - linux

core/src/main/java/io/undertow/util/HeaderValues.java

+4
Original file line numberDiff line numberDiff line change
@@ -581,4 +581,8 @@ public boolean addAll(final Collection<? extends String> c) {
581581
}
582582
return !c.isEmpty();
583583
}
584+
585+
public HeaderValues reversed() {
586+
throw new UnsupportedOperationException();
587+
}
584588
}

pom.xml

+12-2
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,9 @@
8787
<spotbugs.exclude.filter.file>../spotbugs-exclude.xml</spotbugs.exclude.filter.file>
8888

8989
<!-- Surefire args -->
90+
<modular.jdk.props></modular.jdk.props>
9091
<surefire.jpda.args/>
91-
<surefire.system.args>-ea ${surefire.jpda.args} -Xmx1024m</surefire.system.args>
92+
<surefire.system.args>-ea ${surefire.jpda.args} -Xmx1024m ${modular.jdk.props}</surefire.system.args>
9293
<!--by default run all tests-->
9394
<test.categories>io.undertow.testutils.category.UnitTest OR NOT io.undertow.testutils.category.UnitTest</test.categories>
9495

@@ -632,6 +633,15 @@
632633
<module>karaf</module>
633634
</modules>
634635
</profile>
635-
</profiles>
636636

637+
<profile>
638+
<id>jdk18</id>
639+
<activation>
640+
<jdk>[18,)</jdk>
641+
</activation>
642+
<properties>
643+
<modular.jdk.props>-Djava.security.manager=allow</modular.jdk.props>
644+
</properties>
645+
</profile>
646+
</profiles>
637647
</project>

0 commit comments

Comments
 (0)