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 fc765ea775 Minor distribution/samples fixes to aling version
properties naming conventions
new 73362d5cc2 Merge branch 'main' of github.com:apache/cxf
fc765ea775 is described below
commit fc765ea775f73285262b2a0240a995b72258a27f
Author: Andriy Redko <[email protected]>
AuthorDate: Sat Jul 29 12:49:05 2023 -0400
Minor distribution/samples fixes to aling version properties naming
conventions
---
.../src/main/release/samples/jax_rs/spring_boot/pom.xml | 10 +++++-----
.../samples/jax_rs/spring_boot_scan/application/pom.xml | 10 +++++-----
.../release/samples/jax_rs/spring_boot_scan/client/pom.xml | 4 ++--
.../samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml | 6 +++---
.../src/main/release/samples/jaxws_spring_boot/pom.xml | 8 ++++----
distribution/src/main/release/samples/pom.xml | 4 ++--
distribution/src/main/release/samples/ws_transaction/pom.xml | 6 +++---
.../src/main/release/samples/ws_transaction/ws_first/pom.xml | 2 +-
.../src/main/release/samples/ws_transaction/ws_second/pom.xml | 2 +-
9 files changed, 26 insertions(+), 26 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 5129d50db0..7dee0ade84 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
@@ -46,12 +46,12 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
- <version>${spring.boot.version}</version>
+ <version>${cxf.spring.boot.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
- <version>${spring.boot.version}</version>
+ <version>${cxf.spring.boot.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -61,7 +61,7 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
- <version>${spring.boot.version}</version>
+ <version>${cxf.spring.boot.version}</version>
<configuration>
<mainClass>sample.rs.service.SampleRestApplication</mainClass>
</configuration>
@@ -104,7 +104,7 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
- <version>${spring.boot.version}</version>
+ <version>${cxf.spring.boot.version}</version>
<configuration>
<mainClass>sample.rs.service.SampleRestApplication</mainClass>
</configuration>
@@ -120,7 +120,7 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
- <version>${spring.boot.version}</version>
+ <version>${cxf.spring.boot.version}</version>
<configuration>
<mainClass>sample.rs.client.SampleRestClientApplication</mainClass>
</configuration>
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 590d692dad..9530ae27c3 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,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
- <version>${spring.cloud.eureka.version}</version>
+ <version>${cxf.spring.cloud.eureka.version}</version>
<exclusions>
<exclusion>
<groupId>com.google.code.gson</groupId>
@@ -56,7 +56,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
- <version>${spring.boot.version}</version>
+ <version>${cxf.spring.boot.version}</version>
</dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
@@ -65,7 +65,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
- <version>${spring.boot.version}</version>
+ <version>${cxf.spring.boot.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -75,7 +75,7 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
- <version>${spring.boot.version}</version>
+ <version>${cxf.spring.boot.version}</version>
<configuration>
<mainClass>sample.rs.service.SampleRestApplication</mainClass>
</configuration>
@@ -122,7 +122,7 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
- <version>${spring.boot.version}</version>
+ <version>${cxf.spring.boot.version}</version>
</plugin>
</plugins>
</build>
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 5481b153d5..7bc2850f11 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
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
- <version>${spring.cloud.eureka.version}</version>
+ <version>${cxf.spring.cloud.eureka.version}</version>
<exclusions>
<exclusion>
<groupId>com.sun.jersey</groupId>
@@ -81,7 +81,7 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
- <version>${spring.boot.version}</version>
+ <version>${cxf.spring.boot.version}</version>
<configuration>
<mainClass>sample.rs.client.SampleRestClientApplication</mainClass>
</configuration>
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 6ff54d7901..8c08f3dff1 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
@@ -18,7 +18,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-netflix-dependencies</artifactId>
- <version>${spring.cloud.eureka.version}</version>
+ <version>${cxf.spring.cloud.eureka.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
- <version>${spring.cloud.eureka.version}</version>
+ <version>${cxf.spring.cloud.eureka.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -54,7 +54,7 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
- <version>${spring.boot.version}</version>
+ <version>${cxf.spring.boot.version}</version>
<executions>
<execution>
<goals>
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 5025bff024..b78a882538 100644
--- a/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
+++ b/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
@@ -26,7 +26,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
- <version>${spring.boot.version}</version>
+ <version>${cxf.spring.boot.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
- <version>${spring.boot.version}</version>
+ <version>${cxf.spring.boot.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -57,7 +57,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web-services</artifactId>
- <version>${spring.boot.version}</version>
+ <version>${cxf.spring.boot.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -72,7 +72,7 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
- <version>${spring.boot.version}</version>
+ <version>${cxf.spring.boot.version}</version>
<configuration>
<mainClass>sample.ws.SampleWsApplication</mainClass>
</configuration>
diff --git a/distribution/src/main/release/samples/pom.xml
b/distribution/src/main/release/samples/pom.xml
index b84f5fd117..b50b8212dc 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -31,8 +31,8 @@
<!-- don't deploy the samples, kind of pointless -->
<maven.deploy.skip>true</maven.deploy.skip>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <spring.boot.version>3.0.9</spring.boot.version>
- <spring.cloud.eureka.version>4.0.3</spring.cloud.eureka.version>
+ <cxf.spring.boot.version>3.0.9</cxf.spring.boot.version>
+
<cxf.spring.cloud.eureka.version>4.0.3</cxf.spring.cloud.eureka.version>
<cxf.jetty11.version>11.0.15</cxf.jetty11.version>
<cxf.netty.version>4.1.96.Final</cxf.netty.version>
<cxf.httpcomponents.client.version>4.5.14</cxf.httpcomponents.client.version>
diff --git a/distribution/src/main/release/samples/ws_transaction/pom.xml
b/distribution/src/main/release/samples/ws_transaction/pom.xml
index de2a76d65d..c697906f35 100644
--- a/distribution/src/main/release/samples/ws_transaction/pom.xml
+++ b/distribution/src/main/release/samples/ws_transaction/pom.xml
@@ -91,7 +91,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
- <version>${spring.boot.version}</version>
+ <version>${cxf.spring.boot.version}</version>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
@@ -105,13 +105,13 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
- <version>${spring.boot.version}</version>
+ <version>${cxf.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>
+ <version>${cxf.spring.boot.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git
a/distribution/src/main/release/samples/ws_transaction/ws_first/pom.xml
b/distribution/src/main/release/samples/ws_transaction/ws_first/pom.xml
index 053f08ea99..2273c81186 100644
--- a/distribution/src/main/release/samples/ws_transaction/ws_first/pom.xml
+++ b/distribution/src/main/release/samples/ws_transaction/ws_first/pom.xml
@@ -33,7 +33,7 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
- <version>${spring.boot.version}</version>
+ <version>${cxf.spring.boot.version}</version>
</plugin>
</plugins>
</build>
diff --git
a/distribution/src/main/release/samples/ws_transaction/ws_second/pom.xml
b/distribution/src/main/release/samples/ws_transaction/ws_second/pom.xml
index 494cd100b6..1162a91471 100644
--- a/distribution/src/main/release/samples/ws_transaction/ws_second/pom.xml
+++ b/distribution/src/main/release/samples/ws_transaction/ws_second/pom.xml
@@ -33,7 +33,7 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
- <version>${spring.boot.version}</version>
+ <version>${cxf.spring.boot.version}</version>
</plugin>
</plugins>
</build>
