Skip to content
Permalink
Browse files
Start getting rid of the "java9" profiles in the build since we requi…
…re java11 now
  • Loading branch information
dkulp committed Apr 14, 2022
1 parent cad4f0b commit ba839e6b1f3ee5c26fd600834ea10227dd4cc317
Showing 90 changed files with 462 additions and 438 deletions.
@@ -81,6 +81,15 @@
</cxf.export.service>
</properties>
<dependencies>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.xml.ws</groupId>
<artifactId>jakarta.xml.ws-api</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -214,6 +223,12 @@
<artifactId>xercesImpl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.sun.xml.messaging.saaj</groupId>
<artifactId>saaj-impl</artifactId>
<scope>test</scope>
</dependency>

</dependencies>
<build>
<plugins>
@@ -20,6 +20,8 @@
package org.apache.cxf.endpoint;

public class ListenerRegistrationException extends RuntimeException {
private static final long serialVersionUID = 1L;

public ListenerRegistrationException(String message) {
super(message);
}
@@ -53,8 +53,10 @@ public void testDiff() throws Exception {

@Test
public void testIsEmpty() throws Exception {
assertTrue(CollectionUtils.isEmpty((Collection) null));
assertTrue(CollectionUtils.isEmpty((Map) null));
Collection<String> c = null;
Map<String, String> m = null;
assertTrue(CollectionUtils.isEmpty(c));
assertTrue(CollectionUtils.isEmpty(m));

Collection<String> l = Arrays.asList(null, null);
assertTrue(CollectionUtils.isEmpty(l));
@@ -581,6 +581,11 @@
<groupId>io.micrometer</groupId>
<artifactId>micrometer-core</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.rmi</groupId>
<artifactId>jboss-rmi-api_1.0_spec</artifactId>
<version>1.0.6.Final</version>
</dependency>
</dependencies>
<build>
<plugins>
@@ -734,19 +739,4 @@
</plugins>
</pluginManagement>
</build>
<profiles>
<profile>
<id>java9-plus</id>
<activation>
<jdk>[9,)</jdk>
</activation>
<dependencies>
<dependency>
<groupId>org.jboss.spec.javax.rmi</groupId>
<artifactId>jboss-rmi-api_1.0_spec</artifactId>
<version>1.0.6.Final</version>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
@@ -112,21 +112,17 @@
<artifactId>geronimo-ejb_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.rmi</groupId>
<artifactId>jboss-rmi-api_1.0_spec</artifactId>
<version>1.0.6.Final</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.jacorb</groupId>
<artifactId>jacorb</artifactId>
<version>${cxf.jacorb.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<profiles>
<profile>
<id>java9-plus</id>
<activation>
<jdk>[9,)</jdk>
</activation>
<dependencies>
<dependency>
<groupId>org.jboss.spec.javax.rmi</groupId>
<artifactId>jboss-rmi-api_1.0_spec</artifactId>
<version>1.0.6.Final</version>
<optional>true</optional>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
@@ -41,6 +41,11 @@
</properties>

<dependencies>
<dependency>
<groupId>jakarta.xml.ws</groupId>
<artifactId>jakarta.xml.ws-api</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -41,6 +41,11 @@
</properties>

<dependencies>
<dependency>
<groupId>jakarta.xml.ws</groupId>
<artifactId>jakarta.xml.ws-api</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -99,7 +99,7 @@
<cxf.commons-lang3.version>3.12.0</cxf.commons-lang3.version>
<cxf.commons-logging.version>1.2</cxf.commons-logging.version>
<cxf.commons-text.version>1.9</cxf.commons-text.version>
<cxf.derby.version>10.14.2.0</cxf.derby.version>
<cxf.derby.version>10.15.2.0</cxf.derby.version>
<cxf.dom4j.version>2.1.3</cxf.dom4j.version>
<cxf.dropwizard3.version>3.2.6</cxf.dropwizard3.version>
<cxf.dropwizard4.version>4.2.9</cxf.dropwizard4.version>
@@ -1653,6 +1653,11 @@
<artifactId>${cxf.servlet-api.artifact}</artifactId>
<version>${cxf.servlet-api.version}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.messaging.saaj</groupId>
<artifactId>saaj-impl</artifactId>
<version>${cxf.saaj-impl.version}</version>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>jakarta.mail</artifactId>
@@ -1749,6 +1754,12 @@
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>${cxf.xerces.version}</version>
<exclusions>
<exclusion>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- if we use the new woodstox artifact, we're using the new version -->
<dependency>
@@ -1924,12 +1935,6 @@
<invoker.skip>true</invoker.skip>
</properties>
</profile>
<profile>
<id>jetty9</id>
<properties>
<cxf.jetty.version>${cxf.jetty9.version}</cxf.jetty.version>
</properties>
</profile>
<profile>
<!-- Profile for testing with EclipseLink MOXy based JAXB implementation -->
<id>eclipse.moxy</id>
@@ -2190,95 +2195,6 @@
</plugins>
</build>
</profile>
<profile>
<id>java9-plus</id>
<activation>
<jdk>[9,)</jdk>
</activation>
<properties>
<cxf.derby.version>10.15.2.0</cxf.derby.version>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<showDeprecation>${cxf.compile.show.deprecation}</showDeprecation>
<showWarnings>true</showWarnings>
<compilerArgs>
<arg>${cxf.compile.flags}</arg>
</compilerArgs>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.xml.ws</groupId>
<artifactId>jakarta.xml.ws-api</artifactId>
<version>${cxf.jakarta.wsapi.version}</version>
</dependency>
<dependency>
<groupId>jakarta.jws</groupId>
<artifactId>jakarta.jws-api</artifactId>
<version>${cxf.jakarta.jwsapi.version}</version>
</dependency>
<dependency>
<groupId>jakarta.xml.soap</groupId>
<artifactId>jakarta.xml.soap-api</artifactId>
<version>${cxf.jakarta.soapapi.version}</version>
</dependency>
<dependency>
<groupId>com.sun.activation</groupId>
<artifactId>jakarta.activation</artifactId>
<version>${cxf.jakarta.activation.version}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.messaging.saaj</groupId>
<artifactId>saaj-impl</artifactId>
<version>${cxf.saaj-impl.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.jacorb</groupId>
<artifactId>jacorb</artifactId>
<version>${cxf.jacorb.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>${cxf.xerces.version}</version>
<exclusions>
<exclusion>
<artifactId>xml-apis</artifactId>
<groupId>xml-apis</groupId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</dependencyManagement>
</profile>
<profile>
<id>jdk13</id>
<activation>
@@ -44,6 +44,10 @@
</cxf.export.service>
</properties>
<dependencies>
<dependency>
<groupId>jakarta.xml.ws</groupId>
<artifactId>jakarta.xml.ws-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
@@ -81,6 +81,24 @@
<artifactId>spring-context</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jacorb</groupId>
<artifactId>jacorb-omgapi</artifactId>
<version>${cxf.jacorb.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.rmi</groupId>
<artifactId>jboss-rmi-api_1.0_spec</artifactId>
<version>1.0.6.Final</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.jacorb</groupId>
<artifactId>jacorb</artifactId>
<version>${cxf.jacorb.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
@@ -122,28 +140,4 @@
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>java9-plus</id>
<activation>
<jdk>[9,)</jdk>
</activation>
<dependencies>
<!-- This artifact needs to be included in compile scope since the corba module has been removed from jdk 11 -->
<dependency>
<groupId>org.jacorb</groupId>
<artifactId>jacorb-omgapi</artifactId>
<version>${cxf.jacorb.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.rmi</groupId>
<artifactId>jboss-rmi-api_1.0_spec</artifactId>
<version>1.0.6.Final</version>
<optional>true</optional>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
@@ -47,6 +47,18 @@
</cxf.export.service>
</properties>
<dependencies>
<dependency>
<groupId>jakarta.xml.soap</groupId>
<artifactId>jakarta.xml.soap-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.jws</groupId>
<artifactId>jakarta.jws-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.xml.ws</groupId>
<artifactId>jakarta.xml.ws-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
@@ -56,6 +68,12 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
<groupId>com.sun.xml.messaging.saaj</groupId>
<artifactId>saaj-impl</artifactId>
<scope>runtime</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>

0 comments on commit ba839e6

Please sign in to comment.