This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/main by this push:
new 7597604958 Remove obsolete Maven profiles targeting JDKs before 17
(#2558)
7597604958 is described below
commit 7597604958c40e96baf720e312d03fbc76441dd5
Author: Peter Palaga <[email protected]>
AuthorDate: Wed Aug 20 02:54:42 2025 +0200
Remove obsolete Maven profiles targeting JDKs before 17 (#2558)
---
core/pom.xml | 30 --------
.../security/DeprecatedSecurityContextTest.java | 45 ------------
.../interceptor/security/test/GroupWrapper.java | 82 ----------------------
.../samples/jax_rs/basic_http2_jetty/pom.xml | 22 ++----
.../src/it/jaxb-xjc-runtime-sources/pom.xml | 43 +++++-------
.../src/it/jdk-cxf-with-toolchain/pom.xml | 43 +++++-------
.../codegen-plugin/src/it/mark-generated/pom.xml | 45 +++++-------
.../src/it/wsdl-artifact-resolution/pom.xml | 43 +++++-------
parent/pom.xml | 47 ++++---------
systests/transports/pom.xml | 13 +---
10 files changed, 95 insertions(+), 318 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index a366b953bf..6566f72354 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -308,34 +308,4 @@
</plugins>
</pluginManagement>
</build>
-
- <profiles>
- <profile>
- <id>before-jdk14</id>
- <activation>
- <jdk>(,14)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase>generate-test-sources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
-
<source>${project.basedir}/src/test/java8</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git
a/core/src/test/java8/org/apache/cxf/interceptor/security/DeprecatedSecurityContextTest.java
b/core/src/test/java8/org/apache/cxf/interceptor/security/DeprecatedSecurityContextTest.java
deleted file mode 100644
index 3f3f9310ff..0000000000
---
a/core/src/test/java8/org/apache/cxf/interceptor/security/DeprecatedSecurityContextTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cxf.interceptor.security;
-
-import java.security.Principal;
-
-import javax.security.auth.Subject;
-
-import org.apache.cxf.common.security.SimplePrincipal;
-import org.apache.cxf.interceptor.security.test.GroupWrapper;
-import org.apache.cxf.security.LoginSecurityContext;
-
-import org.junit.Test;
-
-import static org.junit.Assert.assertTrue;
-
-public class DeprecatedSecurityContextTest {
- @Test
- public void testPrivateStaticGroup() {
- Subject s = new Subject();
- Principal p = new SimplePrincipal("Barry");
- s.getPrincipals().add(p);
- //create a friend group and add Barry to this group
- GroupWrapper test = new GroupWrapper("friend", "Barry");
- s.getPrincipals().add(test.getGroup());
- LoginSecurityContext context = new DefaultSecurityContext(p, s);
- assertTrue(context.isUserInRole("Barry"));
- }
-}
\ No newline at end of file
diff --git
a/core/src/test/java8/org/apache/cxf/interceptor/security/test/GroupWrapper.java
b/core/src/test/java8/org/apache/cxf/interceptor/security/test/GroupWrapper.java
deleted file mode 100644
index 445e298ad4..0000000000
---
a/core/src/test/java8/org/apache/cxf/interceptor/security/test/GroupWrapper.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cxf.interceptor.security.test;
-
-import java.security.Principal;
-import java.security.acl.Group;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.apache.cxf.common.security.SimplePrincipal;
-
-public class GroupWrapper {
-
- private Principal group;
-
- public GroupWrapper(String groupName, String userName) {
- SimpleGroup simpeG = new SimpleGroup(groupName);
- simpeG.addMember(new SimplePrincipal(userName));
- group = simpeG;
-
- }
-
- public Principal getGroup() {
- return this.group;
- }
-
-
-
- private static class SimpleGroup implements Group {
- private String name;
- private final Set<Principal> principals;
-
- SimpleGroup(String name) {
- this.name = name;
- this.principals = new HashSet<>();
- }
-
- @Override
- public String getName() {
- return this.name;
- }
-
- @Override
- public boolean addMember(Principal principal) {
- return this.principals.add(principal);
- }
-
- @Override
- public boolean removeMember(Principal principal) {
- return this.principals.remove(principal);
- }
-
- @Override
- public Enumeration<? extends Principal> members() {
- return Collections.enumeration(this.principals);
- }
-
- @Override
- public boolean isMember(Principal principal) {
- return this.principals.contains(principal);
- }
- }
-
-}
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 88afd55ca7..0dd07a7b82 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
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -76,19 +76,6 @@
</plugins>
</build>
</profile>
- <profile>
- <id>jdk9+</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-alpn-java-server</artifactId>
- <version>${cxf.jetty12.version}</version>
- </dependency>
- </dependencies>
- </profile>
</profiles>
<dependencies>
<dependency>
@@ -115,5 +102,10 @@
<artifactId>jetty-alpn-server</artifactId>
<version>${cxf.jetty12.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-alpn-java-server</artifactId>
+ <version>${cxf.jetty12.version}</version>
+ </dependency>
</dependencies>
</project>
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 04f8593eea..820f992336 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
@@ -13,6 +13,24 @@
<wsdl.version>1.0.0</wsdl.version>
</properties>
+ <dependencies>
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ <version>2.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.xml.ws</groupId>
+ <artifactId>jakarta.xml.ws-api</artifactId>
+ <version>4.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>4.0.0</version>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
@@ -75,29 +93,4 @@
</plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>java11</id>
- <activation>
- <jdk>[11,)</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>jakarta.annotation</groupId>
- <artifactId>jakarta.annotation-api</artifactId>
- <version>2.1.1</version>
- </dependency>
- <dependency>
- <groupId>jakarta.xml.ws</groupId>
- <artifactId>jakarta.xml.ws-api</artifactId>
- <version>4.0.0</version>
- </dependency>
- <dependency>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- <version>4.0.0</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
</project>
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 0d7f821267..8eb286b471 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
@@ -11,7 +11,24 @@
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
</properties>
-
+
+ <dependencies>
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ <version>2.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.xml.ws</groupId>
+ <artifactId>jakarta.xml.ws-api</artifactId>
+ <version>4.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>4.0.0</version>
+ </dependency>
+ </dependencies>
<build>
<plugins>
<plugin>
@@ -82,7 +99,6 @@
<profile><!-- used to avoid integration test failures for devs that have
no toolchain config -->
<id>toolchain</id>
<activation>
- <jdk>[9,)</jdk>
<property><!-- Jenkins -->
<name>env.BUILD_NUMBER</name>
</property>
@@ -111,28 +127,5 @@
</plugins>
</build>
</profile>
- <profile>
- <id>java11</id>
- <activation>
- <jdk>[11,)</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>jakarta.annotation</groupId>
- <artifactId>jakarta.annotation-api</artifactId>
- <version>2.1.1</version>
- </dependency>
- <dependency>
- <groupId>jakarta.xml.ws</groupId>
- <artifactId>jakarta.xml.ws-api</artifactId>
- <version>4.0.0</version>
- </dependency>
- <dependency>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- <version>4.0.0</version>
- </dependency>
- </dependencies>
- </profile>
</profiles>
</project>
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 5800611efd..6bf9873777 100644
--- a/maven-plugins/codegen-plugin/src/it/mark-generated/pom.xml
+++ b/maven-plugins/codegen-plugin/src/it/mark-generated/pom.xml
@@ -6,13 +6,31 @@
<version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>cxf7708-codegen</name>
-
+
<properties>
<wsdl.groupid>org.apache.cxf.cxf7708</wsdl.groupid>
<wsdl.artifactid>Cxf7708Service</wsdl.artifactid>
<wsdl.version>1.0.0</wsdl.version>
</properties>
+ <dependencies>
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ <version>2.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.xml.ws</groupId>
+ <artifactId>jakarta.xml.ws-api</artifactId>
+ <version>4.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>4.0.0</version>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
@@ -73,29 +91,4 @@
</plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>java11</id>
- <activation>
- <jdk>[11,)</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>jakarta.annotation</groupId>
- <artifactId>jakarta.annotation-api</artifactId>
- <version>2.1.1</version>
- </dependency>
- <dependency>
- <groupId>jakarta.xml.ws</groupId>
- <artifactId>jakarta.xml.ws-api</artifactId>
- <version>4.0.0</version>
- </dependency>
- <dependency>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- <version>4.0.0</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
</project>
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 f3af090016..14e78b6832 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
@@ -13,6 +13,24 @@
<wsdl.version>1.0.0</wsdl.version>
</properties>
+ <dependencies>
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ <version>2.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.xml.ws</groupId>
+ <artifactId>jakarta.xml.ws-api</artifactId>
+ <version>4.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>4.0.0</version>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
@@ -75,29 +93,4 @@
</plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>java11</id>
- <activation>
- <jdk>[11,)</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>jakarta.annotation</groupId>
- <artifactId>jakarta.annotation-api</artifactId>
- <version>2.1.1</version>
- </dependency>
- <dependency>
- <groupId>jakarta.xml.ws</groupId>
- <artifactId>jakarta.xml.ws-api</artifactId>
- <version>4.0.0</version>
- </dependency>
- <dependency>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- <version>4.0.0</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
</project>
diff --git a/parent/pom.xml b/parent/pom.xml
index a06cf6d7bd..9bc807321f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -32,11 +32,12 @@
<properties>
<cxf.protect-xmlschema-collections>false</cxf.protect-xmlschema-collections>
<cxf.surefire.fork.count>1</cxf.surefire.fork.count>
+ <!-- JAXB: see please https://github.com/javaee/jaxb-v2/issues/1184 -->
<cxf.surefire.format>brief</cxf.surefire.format>
<cxf.surefire.usefile>false</cxf.surefire.usefile>
<org.apache.cxf.transport.websocket.atmosphere.disabled>false</org.apache.cxf.transport.websocket.atmosphere.disabled>
<cxf.surefire.parallel.mode />
- <cxf.surefire.fork.vmargs>-ea</cxf.surefire.fork.vmargs>
+ <cxf.surefire.fork.vmargs>-ea --add-opens
java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED
--add-opens java.base/sun.net.www.protocol.https=ALL-UNNAMED --add-opens
java.base/java.io=ALL-UNNAMED</cxf.surefire.fork.vmargs>
<cxf.server.launcher.vmargs>-ea</cxf.server.launcher.vmargs>
<cxf.surefire.enable.assertions>true</cxf.surefire.enable.assertions>
<cxf.surefire.rerun.count>3</cxf.surefire.rerun.count>
@@ -609,6 +610,16 @@
<compilerArgument>${cxf.compile.flags}</compilerArgument>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <!-- https://github.com/bcgit/bc-java/issues/589 -->
+
<jdk.tls.namedGroups>secp256r1,secp384r1,secp521r1,sect283k1,sect283r1,sect409k1,sect409r1,sect571k1,sect571r1,secp256k1,ffdhe2048,ffdhe3072,ffdhe4096,ffdhe6144,ffdhe8192</jdk.tls.namedGroups>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.cxf.build-utils</groupId>
<artifactId>cxf-xml2fastinfoset-plugin</artifactId>
@@ -2231,7 +2242,7 @@
<name>ekstazi</name>
</property>
</activation>
-
+
<build>
<plugins>
<plugin>
@@ -2252,7 +2263,7 @@
</execution>
</executions>
</plugin>
-
+
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
@@ -2267,36 +2278,6 @@
</plugins>
</build>
</profile>
- <profile>
- <id>jdk13</id>
- <activation>
- <jdk>[13,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemPropertyVariables>
- <!--
https://github.com/bcgit/bc-java/issues/589 -->
-
<jdk.tls.namedGroups>secp256r1,secp384r1,secp521r1,sect283k1,sect283r1,sect409k1,sect409r1,sect571k1,sect571r1,secp256k1,ffdhe2048,ffdhe3072,ffdhe4096,ffdhe6144,ffdhe8192</jdk.tls.namedGroups>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>jdk16</id>
- <activation>
- <jdk>[16,)</jdk>
- </activation>
- <properties>
- <!-- JAXB: see please
https://github.com/javaee/jaxb-v2/issues/1184 -->
- <cxf.surefire.fork.vmargs>-ea --add-opens
java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED
--add-opens java.base/sun.net.www.protocol.https=ALL-UNNAMED --add-opens
java.base/java.io=ALL-UNNAMED</cxf.surefire.fork.vmargs>
- </properties>
- </profile>
<profile>
<id>coverage</id>
<build>
diff --git a/systests/transports/pom.xml b/systests/transports/pom.xml
index a38c59d2ef..69a68e6f63 100644
--- a/systests/transports/pom.xml
+++ b/systests/transports/pom.xml
@@ -32,6 +32,7 @@
<url>https://cxf.apache.org</url>
<properties>
<cxf.surefire.fork.vmargs>-Djdk.http.auth.tunneling.disabledSchemes=""</cxf.surefire.fork.vmargs>
+ <cxf.surefire.fork.vmargs>--add-opens
java.xml/com.sun.org.apache.xerces.internal.dom=ALL-UNNAMED
-Djdk.http.auth.tunneling.disabledSchemes=""</cxf.surefire.fork.vmargs>
<cxf.module.name>org.apache.cxf.systests.transport</cxf.module.name>
</properties>
<build>
@@ -411,16 +412,4 @@
<artifactId>jetty-security</artifactId>
</dependency>
</dependencies>
-
- <profiles>
- <profile>
- <id>jdk16</id>
- <activation>
- <jdk>[16,)</jdk>
- </activation>
- <properties>
- <cxf.surefire.fork.vmargs>--add-opens
java.xml/com.sun.org.apache.xerces.internal.dom=ALL-UNNAMED
-Djdk.http.auth.tunneling.disabledSchemes=""</cxf.surefire.fork.vmargs>
- </properties>
- </profile>
- </profiles>
</project>
