This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.3.x-fixes by this push:
new 09eb958 [CXF-8117]make
org.jboss.spec.javax.rmi:jboss-rmi-api_1.0_spec:jar dependency optional
09eb958 is described below
commit 09eb95891b4db046a522648f3d39a7d340b92cdf
Author: Freeman Fang <[email protected]>
AuthorDate: Mon Jul 12 09:50:42 2021 -0400
[CXF-8117]make org.jboss.spec.javax.rmi:jboss-rmi-api_1.0_spec:jar
dependency optional
(cherry picked from commit 0fec443f163d622434cc7c6eb2fbefb062d6fa64)
(cherry picked from commit f95189560a4e0c9fc124d00b854dc27ef23f07ad)
---
integration/jca/pom.xml | 16 ++++++++++++++++
parent/pom.xml | 5 -----
rt/bindings/corba/pom.xml | 24 ++++++++++++++++++++++++
systests/uncategorized/pom.xml | 15 +++++++++++++++
4 files changed, 55 insertions(+), 5 deletions(-)
diff --git a/integration/jca/pom.xml b/integration/jca/pom.xml
index 7480c47..1f18c3c 100644
--- a/integration/jca/pom.xml
+++ b/integration/jca/pom.xml
@@ -113,4 +113,20 @@
<scope>provided</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>
diff --git a/parent/pom.xml b/parent/pom.xml
index 124608b..8e38411 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2909,11 +2909,6 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</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>
</profile>
</profiles>
diff --git a/rt/bindings/corba/pom.xml b/rt/bindings/corba/pom.xml
index e9c400f..6725621 100644
--- a/rt/bindings/corba/pom.xml
+++ b/rt/bindings/corba/pom.xml
@@ -122,4 +122,28 @@
</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>
diff --git a/systests/uncategorized/pom.xml b/systests/uncategorized/pom.xml
index eb2b1d3..95e976f 100644
--- a/systests/uncategorized/pom.xml
+++ b/systests/uncategorized/pom.xml
@@ -412,5 +412,20 @@
</dependency>
</dependencies>
</profile>
+ <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>
+ <scope>test</scope>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
