JDK version for the GH validations Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 5748a52..ddf4e77 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml
@@ -15,7 +15,7 @@ on: [pull_request, push] env: - JAVA_VERSION: '8' + JAVA_VERSION: '21' JAVA_DISTRO: 'temurin' concurrency:
diff --git a/bundles/apidocs/pom.xml b/bundles/apidocs/pom.xml index 9e05e28..c55b813 100644 --- a/bundles/apidocs/pom.xml +++ b/bundles/apidocs/pom.xml
@@ -293,12 +293,14 @@ <fileExclude>META-INF/versions/17/org/glassfish/jersey/jetty/connector/*.java</fileExclude> <fileExclude>META-INF/versions/17/org/glassfish/jersey/helidon/connector/*.java</fileExclude> <fileExclude>org/glassfish/jersey/helidon/connector/*.java</fileExclude> + <fileExclude>org/glassfish/jersey/jetty/*.java</fileExclude> + <fileExclude>org/glassfish/jersey/jetty/connector/*.java</fileExclude> <fileExclude>org/glassfish/jersey/wadl/doclet/*.java</fileExclude> </sourceFileExcludes> <dependencySourceIncludes> <dependencySourceInclude>org.glassfish.jersey.*:*</dependencySourceInclude> </dependencySourceIncludes> - <excludePackageNames>*.internal.*:*.innate.*</excludePackageNames> + <excludePackageNames>*.internal:*.internal.*:*.innate:*.innate.*</excludePackageNames> </configuration> </execution> </executions>
diff --git a/pom.xml b/pom.xml index 77da50c..0d7206f 100644 --- a/pom.xml +++ b/pom.xml
@@ -2239,6 +2239,7 @@ <junit4.version>4.13.2</junit4.version> <junit5.version>5.10.2</junit5.version> <junit-platform-suite.version>1.10.2</junit-platform-suite.version> + <junit-platform-suite.legacy.version>1.10.0</junit-platform-suite.legacy.version> <kryo.version>4.0.3</kryo.version> <mockito.version>3.12.4</mockito.version> <!-- CQ 17673 --> <mustache.version>0.9.11</mustache.version>
diff --git a/tests/e2e-client/pom.xml b/tests/e2e-client/pom.xml index 14f07f8..5c8f6bc 100644 --- a/tests/e2e-client/pom.xml +++ b/tests/e2e-client/pom.xml
@@ -303,35 +303,12 @@ <version>${slf4j.version}</version> </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <executions> - <execution> - <id>default-testCompile</id> - <phase>test-compile</phase> - <configuration> - <testExcludes> - <testExclude>org/glassfish/jersey/tests/e2e/client/connector/proxy/Proxy*Test.java</testExclude> - <testExclude>org/glassfish/jersey/tests/e2e/client/nettyconnector/Expect100ContinueTest.java</testExclude> - </testExcludes> - </configuration> - <goals> - <goal>testCompile</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> </profile> <profile> <id>JettyTestExclude</id> <activation> - <jdk>[11,17)</jdk> + <jdk>[11,)</jdk> </activation> <build> <plugins>
diff --git a/tests/e2e-entity/pom.xml b/tests/e2e-entity/pom.xml index 719134a..68c4cfc 100644 --- a/tests/e2e-entity/pom.xml +++ b/tests/e2e-entity/pom.xml
@@ -225,6 +225,15 @@ </properties> </profile> <profile> + <id>test-suit</id> <!--due to the broadcast test failure after update to the latest junit platform suite --> + <activation> <!--for JDK 11 (only in CI/CD job) it's required to used legacy junit version --> + <jdk>11</jdk> + </activation> + <properties> + <junit-platform-suite.version>${junit-platform-suite.legacy.version}</junit-platform-suite.version> + </properties> + </profile> + <profile> <id>sonar</id> <build> <pluginManagement>