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 2025/12/12 01:49:37 UTC
(cxf) branch 3.6.x-fixes updated (0643272697 -> 4aa0e56258)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
from 0643272697 Recording .gitmergeinfo Changes
new b3cbe2ba6d CXF-9188: Update Maven Archetypes and 'JAX-RS: Maven Plugins' guide (#2779)
new 739ccf806f Bump org.sonarsource.scanner.maven:sonar-maven-plugin (#2780)
new 4aa0e56258 Recording .gitmergeinfo Changes
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitmergeinfo | 2 +
.../src/main/resources/archetype-resources/pom.xml | 43 +++++++++++++++-------
.../src/main/resources/archetype-resources/pom.xml | 36 +++++++++++++-----
.../src/main/resources/archetype-resources/pom.xml | 36 +++++++++++++-----
pom.xml | 2 +-
5 files changed, 86 insertions(+), 33 deletions(-)
(cxf) 01/03: CXF-9188: Update Maven Archetypes and 'JAX-RS: Maven Plugins' guide (#2779)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit b3cbe2ba6deae421b6f6ff133abcf0b7b1f104e0
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Thu Dec 11 17:46:41 2025 -0500
CXF-9188: Update Maven Archetypes and 'JAX-RS: Maven Plugins' guide (#2779)
(cherry picked from commit 97219ffe0e4557331e76381ff5c0f5cb8db06f81)
(cherry picked from commit 4e8a068a1a93debf650da03c2accdcb109f4a737)
---
.../src/main/resources/archetype-resources/pom.xml | 43 +++++++++++++++-------
.../src/main/resources/archetype-resources/pom.xml | 36 +++++++++++++-----
.../src/main/resources/archetype-resources/pom.xml | 36 +++++++++++++-----
3 files changed, 83 insertions(+), 32 deletions(-)
diff --git a/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/pom.xml b/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/pom.xml
index adde535fe1..fb0f825e32 100644
--- a/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/pom.xml
+++ b/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/pom.xml
@@ -44,9 +44,21 @@
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat7-maven-plugin</artifactId>
- <version>2.0</version>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-maven3-plugin</artifactId>
+ <version>1.10.25</version>
+ <configuration>
+ <container>
+ <containerId>tomcat9x</containerId>
+ </container>
+ <deployables>
+ <deployable>
+ <properties>
+ <context>/jaxrs-service</context>
+ </properties>
+ </deployable>
+ </deployables>
+ </configuration>
<executions>
<execution>
<id>default-cli</id>
@@ -54,9 +66,11 @@
<goal>run</goal>
</goals>
<configuration>
- <port>13000</port>
- <path>/jaxrs-service</path>
- <useSeparateTomcatClassLoader>true</useSeparateTomcatClassLoader>
+ <configuration>
+ <portNames>
+ <portName>13000</portName>
+ </portNames>
+ </configuration>
</configuration>
</execution>
</executions>
@@ -102,26 +116,27 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat7-maven-plugin</artifactId>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-maven3-plugin</artifactId>
<executions>
<execution>
<id>start-tomcat</id>
<goals>
- <goal>run-war</goal>
+ <goal>start</goal>
</goals>
<phase>pre-integration-test</phase>
<configuration>
- <port>${test.server.port}</port>
- <path>/jaxrs-service</path>
- <fork>true</fork>
- <useSeparateTomcatClassLoader>true</useSeparateTomcatClassLoader>
+ <configuration>
+ <properties>
+ <cargo.servlet.port>${test.server.port}</cargo.servlet.port>
+ </properties>
+ </configuration>
</configuration>
</execution>
<execution>
<id>stop-tomcat</id>
<goals>
- <goal>shutdown</goal>
+ <goal>stop</goal>
</goals>
<phase>post-integration-test</phase>
<configuration>
diff --git a/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/pom.xml b/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/pom.xml
index f58a666bf5..9da428800e 100644
--- a/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/pom.xml
+++ b/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/pom.xml
@@ -34,6 +34,11 @@
<artifactId>cxf-rt-transports-http</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${cxf.spring.version}</version>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
@@ -51,27 +56,40 @@
<pluginManagement>
<plugins>
<plugin>
- <!-- mvn clean install tomcat:run-war to deploy
+ <!-- mvn clean install cargo:run to deploy
Look for "Running war on http://xxx" and
"Setting the server's publish address to be /yyy"
in console output; WSDL browser address will be
concatenation of the two: http://xxx/yyy?wsdl
-->
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat7-maven-plugin</artifactId>
- <version>2.0</version>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-maven3-plugin</artifactId>
+ <version>1.10.25</version>
+ <configuration>
+ <container>
+ <containerId>tomcat9x</containerId>
+ </container>
+ <deployables>
+ <deployable>
+ <properties>
+ <context>/webservice</context>
+ </properties>
+ </deployable>
+ </deployables>
+ </configuration>
<executions>
<execution>
<id>start-tomcat</id>
<goals>
- <goal>run-war</goal>
+ <goal>run</goal>
</goals>
<phase>pre-integration-test</phase>
<configuration>
- <port>${test.server.port}</port>
- <path>/webservice</path>
- <fork>true</fork>
- <useSeparateTomcatClassLoader>true</useSeparateTomcatClassLoader>
+ <configuration>
+ <properties>
+ <cargo.servlet.port>${test.server.port}</cargo.servlet.port>
+ </properties>
+ </configuration>
</configuration>
</execution>
</executions>
diff --git a/maven-plugins/archetypes/cxf-jaxws-wsdlfirst/src/main/resources/archetype-resources/pom.xml b/maven-plugins/archetypes/cxf-jaxws-wsdlfirst/src/main/resources/archetype-resources/pom.xml
index b19e77e767..cf3d0d3ca8 100644
--- a/maven-plugins/archetypes/cxf-jaxws-wsdlfirst/src/main/resources/archetype-resources/pom.xml
+++ b/maven-plugins/archetypes/cxf-jaxws-wsdlfirst/src/main/resources/archetype-resources/pom.xml
@@ -34,6 +34,11 @@
<artifactId>cxf-rt-transports-http</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${cxf.spring.version}</version>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
@@ -78,27 +83,40 @@
<pluginManagement>
<plugins>
<plugin>
- <!-- mvn clean install tomcat7:run to deploy
+ <!-- mvn clean install cargo:run to deploy
Look for "Running war on http://xxx" and
"Setting the server's publish address to be /yyy"
in console output; WSDL browser address will be
concatenation of the two: http://xxx/yyy?wsdl
-->
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat7-maven-plugin</artifactId>
- <version>2.0</version>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-maven3-plugin</artifactId>
+ <version>1.10.25</version>
+ <configuration>
+ <container>
+ <containerId>tomcat9x</containerId>
+ </container>
+ <deployables>
+ <deployable>
+ <properties>
+ <context>/webservice</context>
+ </properties>
+ </deployable>
+ </deployables>
+ </configuration>
<executions>
<execution>
<id>start-tomcat</id>
<goals>
- <goal>run-war</goal>
+ <goal>run</goal>
</goals>
<phase>pre-integration-test</phase>
<configuration>
- <port>${test.server.port}</port>
- <path>/webservice</path>
- <fork>true</fork>
- <useSeparateTomcatClassLoader>true</useSeparateTomcatClassLoader>
+ <configuration>
+ <properties>
+ <cargo.servlet.port>${test.server.port}</cargo.servlet.port>
+ </properties>
+ </configuration>
</configuration>
</execution>
</executions>
(cxf) 02/03: Bump org.sonarsource.scanner.maven:sonar-maven-plugin (#2780)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 739ccf806f0916c4cc6d16fb1bc3fd261c616193
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Thu Dec 11 19:13:21 2025 -0500
Bump org.sonarsource.scanner.maven:sonar-maven-plugin (#2780)
Bumps [org.sonarsource.scanner.maven:sonar-maven-plugin](https://github.com/SonarSource/sonar-scanner-maven) from 5.4.0.6343 to 5.5.0.6356.
- [Release notes](https://github.com/SonarSource/sonar-scanner-maven/releases)
- [Commits](https://github.com/SonarSource/sonar-scanner-maven/compare/5.4.0.6343...5.5.0.6356)
---
updated-dependencies:
- dependency-name: org.sonarsource.scanner.maven:sonar-maven-plugin
dependency-version: 5.5.0.6356
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <su...@github.com>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
(cherry picked from commit 9191637b808eeaf5749324c5c2cc8f07aa2fcc76)
(cherry picked from commit 3ab97de4aef21f32ad67bccd900822413fd8799f)
(cherry picked from commit 8a689dc6928942767a1b94c098be5811fd5c9ac3)
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 5dc8d5b0ee..c603b16b38 100644
--- a/pom.xml
+++ b/pom.xml
@@ -433,7 +433,7 @@
<plugin>
<groupId>org.sonarsource.scanner.maven</groupId>
<artifactId>sonar-maven-plugin</artifactId>
- <version>5.4.0.6343</version>
+ <version>5.5.0.6356</version>
</plugin>
</plugins>
</build>
(cxf) 03/03: Recording .gitmergeinfo Changes
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 4aa0e562580989db9463fbf0fe453f8c5e95d425
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Thu Dec 11 20:44:08 2025 -0500
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 0e35c2fe87..8df7a11dce 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -376,6 +376,7 @@ B ea8b32093020842261e395ebaa7cb458faa7bd07
B eb8b1c5f0c3f42edbd50a715736e3105f138ee27
B ec1ffc66d13a7cde72ef74b0a98b3c1eca0636dd
B ecf51859f9e594870b1939eda675f1a4a81a68ac
+B ed0e868894edba60d3776c337ac7f591384b5c78
B ee9d57f0b1f53d24681fd3ebb5b4cb492ee8d180
B eee70693019e46e52c8128482ea04676365716df
B ef0e6abcb0fcba5319ed57a4e64c50c28c02fca5
@@ -712,6 +713,7 @@ M 3414297730d61914ec574eeae51f0c49a630d74b
M 344203f9dcd4cd1f2ff4b2d102e284658c5c4fcc
M 34552752819b0bad272fcb67537c8df1b4c1ba3c
M 345eefc777ee248e50c3e6cc6dd1b18b881a13cc
+M 349c2d0b066890b9ada1465dbc06b9811a26490f
M 350a543f15fd82e0a81d05fc43654c52abc91766
M 3510be0065382444daf8eaf728fdf0240fd03a9b
M 351602353853a6702946ba7f332afd2c97f9012c