You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2022/06/23 01:10:53 UTC
[cxf] branch master updated: Fixing samples build
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 3455275281 Fixing samples build
3455275281 is described below
commit 34552752819b0bad272fcb67537c8df1b4c1ba3c
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Wed Jun 22 21:00:42 2022 -0400
Fixing samples build
---
.../main/release/samples/jax_rs/spring_boot/pom.xml | 14 ++------------
.../jax_rs/spring_boot_scan/application/pom.xml | 14 ++------------
.../samples/jax_rs/spring_boot_scan/client/pom.xml | 12 ------------
.../jax_rs/spring_boot_scan/eureka-registry/pom.xml | 7 -------
.../samples/jax_rs/tracing_opentracing_camel/pom.xml | 19 +++----------------
.../main/release/samples/jaxws_spring_boot/pom.xml | 15 +++------------
distribution/src/main/release/samples/pom.xml | 5 +++++
.../src/main/release/samples/ws_transaction/pom.xml | 17 +++++------------
8 files changed, 20 insertions(+), 83 deletions(-)
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml b/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml
index 0bee4f4a54..c769f99cf0 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml
@@ -11,18 +11,6 @@
<artifactId>spring-boot-sample-rs</artifactId>
<name>Spring Boot CXF REST Application</name>
<description>Spring Boot CXF REST Application with Swagger UI</description>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <!-- Import dependency management from Spring Boot -->
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-dependencies</artifactId>
- <version>${spring.boot.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -57,10 +45,12 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
+ <version>${spring.boot.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
+ <version>${spring.boot.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
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 5296e61aaf..f26a4375e0 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
@@ -10,18 +10,6 @@
<artifactId>spring-boot-sample-rs-scan-app</artifactId>
<name>Spring Boot CXF REST Scan Application</name>
<description>Spring Boot CXF REST Scan Application</description>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <!-- Import dependency management from Spring Boot -->
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-dependencies</artifactId>
- <version>${spring.boot.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -59,6 +47,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
+ <version>${spring.boot.version}</version>
</dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
@@ -67,6 +56,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
+ <version>${spring.boot.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/pom.xml b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/pom.xml
index b68ac0b73b..3ef7020654 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/pom.xml
@@ -14,18 +14,6 @@
<properties>
<cxf.zest.version>2.1</cxf.zest.version>
</properties>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <!-- Import dependency management from Spring Boot -->
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-dependencies</artifactId>
- <version>${spring.boot.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
<dependencies>
<!-- CXF JAX-RS Client -->
<dependency>
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml
index 60b2028b30..1df09cbb38 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml
@@ -15,13 +15,6 @@
</properties>
<dependencyManagement>
<dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-dependencies</artifactId>
- <version>${spring.boot.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-netflix-dependencies</artifactId>
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/pom.xml b/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/pom.xml
index e7835b72a8..d93871a9ff 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/pom.xml
@@ -108,13 +108,6 @@
<dependencyManagement>
<dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-dependencies</artifactId>
- <version>${spring.boot.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring-boot-dependencies</artifactId>
@@ -129,43 +122,35 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
- <version>4.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
- <version>4.0.0-SNAPSHOT</version>
</dependency>
<!-- This dependency is needed if you're using the Jetty container -->
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http-jetty</artifactId>
- <version>4.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
- <version>4.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-integration-tracing-opentracing</artifactId>
- <version>4.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-providers</artifactId>
- <version>4.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-spring-boot-starter-jaxrs</artifactId>
- <version>4.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>jakarta.ws.rs</groupId>
@@ -188,6 +173,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
+ <version>${spring.boot.version}</version>
<exclusions>
<exclusion>
<groupId>ch.qos.logback</groupId>
@@ -198,6 +184,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
+ <version>${spring.boot.version}</version>
</dependency>
<!-- camel -->
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 1e330297ee..a9791f0d53 100644
--- a/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
+++ b/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
@@ -10,18 +10,6 @@
<artifactId>spring-boot-sample-ws-cxf</artifactId>
<name>Spring Boot CXF Web Services Sample</name>
<description>Spring Boot CXF Web Services Sample</description>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <!-- Import dependency management from Spring Boot -->
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-dependencies</artifactId>
- <version>${spring.boot.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -37,6 +25,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
+ <version>${spring.boot.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -50,6 +39,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
+ <version>${spring.boot.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -66,6 +56,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web-services</artifactId>
+ <version>${spring.boot.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index 82fca20d15..41dd8f5ac8 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -340,6 +340,11 @@
<enabled>false</enabled>
</releases>
</pluginRepository>
+ <pluginRepository>
+ <id>spring.milestone</id>
+ <url>https://repo.spring.io/milestone/</url>
+ <name>Spring Milestone Repo</name>
+ </pluginRepository>
</pluginRepositories>
</profile>
</profiles>
diff --git a/distribution/src/main/release/samples/ws_transaction/pom.xml b/distribution/src/main/release/samples/ws_transaction/pom.xml
index 1c011032e2..88c4a084b8 100644
--- a/distribution/src/main/release/samples/ws_transaction/pom.xml
+++ b/distribution/src/main/release/samples/ws_transaction/pom.xml
@@ -36,19 +36,8 @@
<narayana.version>5.9.0.Final</narayana.version>
<version.org.jboss.ws>1.0.2.Final</version.org.jboss.ws>
<jbossws-cxf.version>5.2.4.Final</jbossws-cxf.version>
+ <h2.version>2.1.214</h2.version>
</properties>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <!-- Import dependency management from Spring Boot -->
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-dependencies</artifactId>
- <version>${spring.boot.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
@@ -110,19 +99,23 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
+ <version>${spring.boot.version}</version>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
+ <version>${h2.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
+ <version>${spring.boot.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web-services</artifactId>
+ <version>${spring.boot.version}</version>
<scope>test</scope>
</dependency>
</dependencies>