This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new fd26145 CXF-8660: Set minimum JDK baseline to 11 (#913)
fd26145 is described below
commit fd261453cf08ac22d2c5be3c2fe4100438c740a5
Author: Andriy Redko <[email protected]>
AuthorDate: Sun Feb 27 10:57:05 2022 -0500
CXF-8660: Set minimum JDK baseline to 11 (#913)
---
Jenkinsfile | 2 +-
benchmark/performance/base/pom.xml | 4 ++--
benchmark/performance/soap_http_doc_lit/pom.xml | 4 ++--
.../release/samples/jax_rs/basic_http2_jetty/pom.xml | 13 -------------
distribution/src/main/release/samples/pom.xml | 4 ++--
.../src/main/resources/archetype-resources/pom.xml | 4 ++--
.../src/main/resources/archetype-resources/pom.xml | 4 ++--
.../src/main/resources/archetype-resources/pom.xml | 4 ++--
.../src/it/jaxb-xjc-runtime-sources/pom.xml | 4 ++--
.../src/it/jdk-cxf-with-toolchain/pom.xml | 4 ++--
.../codegen-plugin/src/it/mark-generated/pom.xml | 4 ++--
.../src/it/wsdl-artifact-resolution/pom.xml | 4 ++--
.../wadl2java-plugin/src/it/wadl-generate-rx/pom.xml | 4 ++--
.../src/it/wsdl-artifact-resolution/pom.xml | 4 ++--
parent/pom.xml | 2 +-
pom.xml | 7 +++++--
systests/transports/pom.xml | 20 --------------------
systests/wsdl_maven/codegen/src/it/it-parent/pom.xml | 4 ++--
18 files changed, 33 insertions(+), 63 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 06f2bb7..ebf88fa 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -33,7 +33,7 @@ pipeline {
axes {
axis {
name 'JAVA_VERSION'
- values 'jdk_1.8_latest', 'jdk_11_latest', 'jdk_17_latest'
+ values 'jdk_11_latest', 'jdk_17_latest', 'jdk_18_latest'
}
}
stages {
diff --git a/benchmark/performance/base/pom.xml
b/benchmark/performance/base/pom.xml
index 2c0f6aa..5108828 100644
--- a/benchmark/performance/base/pom.xml
+++ b/benchmark/performance/base/pom.xml
@@ -37,8 +37,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>11</source>
+ <target>11</target>
</configuration>
</plugin>
</plugins>
diff --git a/benchmark/performance/soap_http_doc_lit/pom.xml
b/benchmark/performance/soap_http_doc_lit/pom.xml
index 9b27194..a9fae2d 100644
--- a/benchmark/performance/soap_http_doc_lit/pom.xml
+++ b/benchmark/performance/soap_http_doc_lit/pom.xml
@@ -94,8 +94,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>11</source>
+ <target>11</target>
</configuration>
</plugin>
</plugins>
diff --git
a/distribution/src/main/release/samples/jax_rs/basic_http2_jetty/pom.xml
b/distribution/src/main/release/samples/jax_rs/basic_http2_jetty/pom.xml
index f9762bf..5cf0985 100644
--- a/distribution/src/main/release/samples/jax_rs/basic_http2_jetty/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/basic_http2_jetty/pom.xml
@@ -76,19 +76,6 @@
</build>
</profile>
<profile>
- <id>jdk8</id>
- <activation>
- <jdk>1.8</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-alpn-openjdk8-server</artifactId>
- <version>${cxf.jetty9.version}</version>
- </dependency>
- </dependencies>
- </profile>
- <profile>
<id>jdk9+</id>
<activation>
<jdk>[9,)</jdk>
diff --git a/distribution/src/main/release/samples/pom.xml
b/distribution/src/main/release/samples/pom.xml
index e653adf..38ce950 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -185,8 +185,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>11</source>
+ <target>11</target>
</configuration>
</plugin>
<plugin>
diff --git
a/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/pom.xml
b/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/pom.xml
index 32e4965..d2dbd52 100644
---
a/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/pom.xml
+++
b/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/pom.xml
@@ -73,8 +73,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>11</source>
+ <target>11</target>
</configuration>
</plugin>
<plugin>
diff --git
a/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/pom.xml
b/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/pom.xml
index 06f4aa5..f58a666 100644
---
a/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/pom.xml
+++
b/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/pom.xml
@@ -80,8 +80,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>11</source>
+ <target>11</target>
</configuration>
</plugin>
<plugin>
diff --git
a/maven-plugins/archetypes/cxf-jaxws-wsdlfirst/src/main/resources/archetype-resources/pom.xml
b/maven-plugins/archetypes/cxf-jaxws-wsdlfirst/src/main/resources/archetype-resources/pom.xml
index 63fe3fb..b19e77e 100644
---
a/maven-plugins/archetypes/cxf-jaxws-wsdlfirst/src/main/resources/archetype-resources/pom.xml
+++
b/maven-plugins/archetypes/cxf-jaxws-wsdlfirst/src/main/resources/archetype-resources/pom.xml
@@ -107,8 +107,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>11</source>
+ <target>11</target>
</configuration>
</plugin>
<plugin>
diff --git
a/maven-plugins/codegen-plugin/src/it/jaxb-xjc-runtime-sources/pom.xml
b/maven-plugins/codegen-plugin/src/it/jaxb-xjc-runtime-sources/pom.xml
index 40b62a6..658ccd9 100644
--- a/maven-plugins/codegen-plugin/src/it/jaxb-xjc-runtime-sources/pom.xml
+++ b/maven-plugins/codegen-plugin/src/it/jaxb-xjc-runtime-sources/pom.xml
@@ -38,8 +38,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>11</source>
+ <target>11</target>
</configuration>
</plugin>
<plugin>
diff --git a/maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml
b/maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml
index a839b6e..3abc8fc 100644
--- a/maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml
+++ b/maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml
@@ -8,8 +8,8 @@
<packaging>jar</packaging>
<properties>
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
+ <maven.compiler.source>11</maven.compiler.source>
+ <maven.compiler.target>11</maven.compiler.target>
</properties>
<build>
diff --git a/maven-plugins/codegen-plugin/src/it/mark-generated/pom.xml
b/maven-plugins/codegen-plugin/src/it/mark-generated/pom.xml
index bb54e3e..e02721e 100644
--- a/maven-plugins/codegen-plugin/src/it/mark-generated/pom.xml
+++ b/maven-plugins/codegen-plugin/src/it/mark-generated/pom.xml
@@ -38,8 +38,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>11</source>
+ <target>11</target>
</configuration>
</plugin>
<plugin>
diff --git
a/maven-plugins/codegen-plugin/src/it/wsdl-artifact-resolution/pom.xml
b/maven-plugins/codegen-plugin/src/it/wsdl-artifact-resolution/pom.xml
index 93ee03f..6d464b8 100644
--- a/maven-plugins/codegen-plugin/src/it/wsdl-artifact-resolution/pom.xml
+++ b/maven-plugins/codegen-plugin/src/it/wsdl-artifact-resolution/pom.xml
@@ -38,8 +38,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>11</source>
+ <target>11</target>
</configuration>
</plugin>
<plugin>
diff --git a/maven-plugins/wadl2java-plugin/src/it/wadl-generate-rx/pom.xml
b/maven-plugins/wadl2java-plugin/src/it/wadl-generate-rx/pom.xml
index ea72046..c80c22c 100644
--- a/maven-plugins/wadl2java-plugin/src/it/wadl-generate-rx/pom.xml
+++ b/maven-plugins/wadl2java-plugin/src/it/wadl-generate-rx/pom.xml
@@ -47,8 +47,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>11</source>
+ <target>11</target>
</configuration>
</plugin>
<plugin>
diff --git
a/maven-plugins/wadl2java-plugin/src/it/wsdl-artifact-resolution/pom.xml
b/maven-plugins/wadl2java-plugin/src/it/wsdl-artifact-resolution/pom.xml
index 19dd1da..222049d 100644
--- a/maven-plugins/wadl2java-plugin/src/it/wsdl-artifact-resolution/pom.xml
+++ b/maven-plugins/wadl2java-plugin/src/it/wsdl-artifact-resolution/pom.xml
@@ -47,8 +47,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>11</source>
+ <target>11</target>
</configuration>
</plugin>
<plugin>
diff --git a/parent/pom.xml b/parent/pom.xml
index 502267b..f86693e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -444,7 +444,7 @@
<ruleset>${cxf.resources.base.path}cxf-pmd-ruleset.xml</ruleset>
</rulesets>
<sourceEncoding>UTF-8</sourceEncoding>
- <targetJdk>1.8</targetJdk>
+ <targetJdk>11</targetJdk>
<linkXRef>false</linkXRef>
<includeTests>true</includeTests>
<verbose>true</verbose>
diff --git a/pom.xml b/pom.xml
index 5bad82f..5d762da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
<cxf.compiler.fork>false</cxf.compiler.fork>
<cxf.build-utils.version>3.4.4</cxf.build-utils.version>
<cxf.xjc-utils.version>3.3.1</cxf.xjc-utils.version>
- <cxf.jdk.version>1.8</cxf.jdk.version>
+ <cxf.jdk.version>11</cxf.jdk.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<site.deploy.url>scp://people.apache.org/www/cxf.apache.org/maven-site</site.deploy.url>
<maven-owasp-plugin-version>6.1.6</maven-owasp-plugin-version>
@@ -638,9 +638,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>3.0.0-M3</version>
+ <version>3.0.0</version>
<configuration>
<rules>
+ <requireJavaVersion>
+ <version>11</version>
+ </requireJavaVersion>
<requireMavenVersion>
<version>3.5</version>
</requireMavenVersion>
diff --git a/systests/transports/pom.xml b/systests/transports/pom.xml
index 49f862e..1b40dd8 100644
--- a/systests/transports/pom.xml
+++ b/systests/transports/pom.xml
@@ -364,26 +364,6 @@
<profiles>
<profile>
- <id>jdk8</id>
- <activation>
- <jdk>1.8</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-alpn-openjdk8-server</artifactId>
- <version>${cxf.jetty9.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-alpn-openjdk8-client</artifactId>
- <version>${cxf.jetty9.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
<id>jdk9+</id>
<activation>
<jdk>[9,)</jdk>
diff --git a/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml
b/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml
index aac93cc..2c7ea3c 100644
--- a/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml
+++ b/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml
@@ -40,8 +40,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>11</source>
+ <target>11</target>
</configuration>
</plugin>
</plugins>
