You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by em...@apache.org on 2022/11/09 07:49:23 UTC
[cxf] branch main updated: [CXF-8787]:Fix sample build failures
This is an automated email from the ASF dual-hosted git repository.
ema 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 bdb88222f4 [CXF-8787]:Fix sample build failures
bdb88222f4 is described below
commit bdb88222f4de2d57d74a61e0850f1843ceed73c8
Author: Jim Ma <em...@apache.org>
AuthorDate: Wed Nov 9 10:03:05 2022 +0800
[CXF-8787]:Fix sample build failures
---
.../src/main/release/samples/corba/bank/pom.xml | 4 ++
.../samples/corba/bank_ws_addressing/pom.xml | 4 ++
.../main/release/samples/corba/hello_world/pom.xml | 4 ++
.../jax_rs/spring_boot_scan/application/pom.xml | 13 ++++
.../main/release/samples/jaxws_spring_boot/pom.xml | 6 ++
distribution/src/main/release/samples/pom.xml | 80 +++-------------------
6 files changed, 39 insertions(+), 72 deletions(-)
diff --git a/distribution/src/main/release/samples/corba/bank/pom.xml b/distribution/src/main/release/samples/corba/bank/pom.xml
index 5a663d7b2d..d9f8c768f5 100644
--- a/distribution/src/main/release/samples/corba/bank/pom.xml
+++ b/distribution/src/main/release/samples/corba/bank/pom.xml
@@ -129,5 +129,9 @@
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.glassfish.corba</groupId>
+ <artifactId>glassfish-corba-orb</artifactId>
+ </dependency>
</dependencies>
</project>
diff --git a/distribution/src/main/release/samples/corba/bank_ws_addressing/pom.xml b/distribution/src/main/release/samples/corba/bank_ws_addressing/pom.xml
index a689c629ab..c7078a91f2 100644
--- a/distribution/src/main/release/samples/corba/bank_ws_addressing/pom.xml
+++ b/distribution/src/main/release/samples/corba/bank_ws_addressing/pom.xml
@@ -236,5 +236,9 @@
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.glassfish.corba</groupId>
+ <artifactId>glassfish-corba-orb</artifactId>
+ </dependency>
</dependencies>
</project>
diff --git a/distribution/src/main/release/samples/corba/hello_world/pom.xml b/distribution/src/main/release/samples/corba/hello_world/pom.xml
index 3141cc21cb..881188e11b 100644
--- a/distribution/src/main/release/samples/corba/hello_world/pom.xml
+++ b/distribution/src/main/release/samples/corba/hello_world/pom.xml
@@ -289,5 +289,9 @@
<artifactId>junit</artifactId>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.glassfish.corba</groupId>
+ <artifactId>glassfish-corba-orb</artifactId>
+ </dependency>
</dependencies>
</project>
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
index b18de9d0dc..4f461abc05 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
@@ -37,7 +37,20 @@
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
<version>${spring.cloud.eureka.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>${cxf.gson.version}</version>
</dependency>
+
<!-- Actuator Endpoints -->
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml b/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
index a9791f0d53..5c49279081 100644
--- a/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
+++ b/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
@@ -58,6 +58,12 @@
<artifactId>spring-boot-starter-web-services</artifactId>
<version>${spring.boot.version}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
<build>
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index 82f30675ed..7591b8fbc3 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -40,6 +40,7 @@
<cxf.tomcat.version>10.1.1</cxf.tomcat.version>
<graalvm.version>21.1.0</graalvm.version>
<cxf.jboss.weld.version>4.0.2.Final</cxf.jboss.weld.version>
+ <cxf.gson.version>2.8.5</cxf.gson.version>
</properties>
<dependencies>
<dependency>
@@ -162,6 +163,11 @@
<type>pom</type>
<scope>import</scope>
</dependency>
+ <dependency>
+ <groupId>org.glassfish.corba</groupId>
+ <artifactId>glassfish-corba-orb</artifactId>
+ <version>4.2.2</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<build>
@@ -240,56 +246,7 @@
</pluginRepository>
</pluginRepositories>
</profile>
- <profile>
- <id>java9-plus</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- </dependency>
- <dependency>
- <groupId>jakarta.annotation</groupId>
- <artifactId>jakarta.annotation-api</artifactId>
- </dependency>
- <dependency>
- <groupId>jakarta.xml.ws</groupId>
- <artifactId>jakarta.xml.ws-api</artifactId>
- </dependency>
- <dependency>
- <groupId>jakarta.activation</groupId>
- <artifactId>jakarta.activation-api</artifactId>
- <version>2.1.0</version>
- </dependency>
- <dependency>
- <groupId>jakarta.jws</groupId>
- <artifactId>jakarta.jws-api</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.messaging.saaj</groupId>
- <artifactId>saaj-impl</artifactId>
- <version>2.0.1</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-runtime</artifactId>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-xjc</artifactId>
- </dependency>
- <dependency>
- <groupId>org.glassfish.corba</groupId>
- <artifactId>glassfish-corba-orb</artifactId>
- <version>4.2.2</version>
- </dependency>
- </dependencies>
- </profile>
-
- <!--
+ <!--
TODO: Please remove, temporary repository settings in order to enable snapshots for
Spring Boot 3.0.0
-->
@@ -299,17 +256,6 @@
<activeByDefault>true</activeByDefault>
</activation>
<repositories>
- <repository>
- <id>spring.snapshots</id>
- <url>https://repo.spring.io/snapshot/</url>
- <name>Spring Snapshot Repo</name>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
<repository>
<id>spring.milestone</id>
<url>https://repo.spring.io/milestone/</url>
@@ -324,17 +270,6 @@
</repository>
</repositories>
<pluginRepositories>
- <pluginRepository>
- <id>spring.snapshots</id>
- <url>https://repo.spring.io/snapshot/</url>
- <name>Spring Snapshot Repo</name>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </pluginRepository>
<pluginRepository>
<id>spring.milestone</id>
<url>https://repo.spring.io/milestone/</url>
@@ -342,6 +277,7 @@
</pluginRepository>
</pluginRepositories>
</profile>
+
</profiles>
<!--
we turn off the deploy in the properties above, but deploy plugin will