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 2024/01/14 01:48:34 UTC

(cxf) branch 3.5.x-fixes updated (ab71f5281a -> b604509419)

This is an automated email from the ASF dual-hosted git repository.

reta pushed a change to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git


    from ab71f5281a Update Project Reactor to 3.4.35
     new 01a30250d0 Bump org.apache.rat:apache-rat-plugin from 0.15 to 0.16 (#1630)
     new c5bcb00f8a Bump org.apache.maven.plugins:maven-surefire-plugin from 3.2.3 to 3.2.5 (#1631)
     new f2d2ea5255 Bump org.apache.maven.plugins:maven-surefire-report-plugin (#1635)
     new 8830234ec2 Bump cxf.opentelemetry.version from 1.34.0 to 1.34.1 (#1643)
     new 63117efc17 Bump org.apache.maven.plugins:maven-plugin-plugin from 3.10.2 to 3.11.0 (#1642)
     new 8915511f00 Add <goalPrefix> to java2swagger-plugin
     new b604509419 Recording .gitmergeinfo Changes

The 7 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                                 |  4 ++++
 distribution/src/main/release/samples/pom.xml |  2 +-
 maven-plugins/codegen-plugin/pom.xml          |  1 +
 maven-plugins/corba/pom.xml                   | 11 +++++++++++
 maven-plugins/java2swagger-plugin/pom.xml     | 13 ++++++++++++-
 maven-plugins/java2wadl-plugin/pom.xml        | 12 ++++++++++++
 maven-plugins/java2ws-plugin/pom.xml          | 11 +++++++++++
 maven-plugins/wadl2java-plugin/pom.xml        |  1 +
 maven-plugins/wsdl-validator-plugin/pom.xml   | 12 ++++++++++++
 parent/pom.xml                                |  2 +-
 pom.xml                                       |  8 ++++----
 11 files changed, 70 insertions(+), 7 deletions(-)


(cxf) 07/07: 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.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit b604509419cdb7b84e5e5f5a3194c9035108045d
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sat Jan 13 20:45:39 2024 -0500

    Recording .gitmergeinfo Changes
---
 .gitmergeinfo | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 4c92190747..775aed4b2b 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -192,6 +192,7 @@ B 798e171a429c118eaa6c5d0a744b5fb1f1afc654
 B 79a0f55fd7d26b27414199c7e653ed913a63e6d5
 B 79ee9824ee30b1b710d7385efc3cec736b4a5c54
 B 7b5a863ab755bf143bc08efbbaf01c39413d3b6d
+B 7da7779aca89bdb5a4f39fad8c849d1f5f3a3d89
 B 7dc38b76fe61fce5fe5a2808a10198d8b36fccc3
 B 7e1d56938064d2b6939446cd040f28436002fdc9
 B 7f1bef03152c188aa68357b5c399290f5d2b2dd0
@@ -295,6 +296,7 @@ B af49d9674ab595a3241083cece8fb42c4a17a4df
 B af5a03b4812ea5797fb9b9c45a3107abc0297f76
 B afd0b5ea960d1b910e72b0d66b879357a6ee6328
 B afdde046d98bcfe3b1864d2789339b835feaf3c4
+B b0aaa6eb8409fdba8e56e340fdf4dd5401410e8c
 B b176e8e4a5a6bb6097c4e399ee0fa843f81e4b32
 B b2ec57436a90b0d094f9c8700340368d0a096c80
 B b30f428e74d86a182e8101b0de555cfa2f57d826
@@ -429,6 +431,7 @@ M 058bacfe750631f987469b0e1141db158dbd97b4
 M 069f602cb56f5164d8e926f5a0dd2a11b3caf004
 M 06f5c910b61d4ad3428dc48bed95d39585bd0379
 M 07bb39ca0f5e3979a0a5cca220002c8469fe8d7a
+M 07ffe8c52e7883716749312e00a8d9870d384075
 M 0887354d429d4826d12fa74e3cadde868ee8ae44
 M 096e96e0da4ef08c0d81ff859224540045fe5caf
 M 09cdb2f16ffaf56fa76d3bee5624cc8d0c53711b
@@ -830,6 +833,7 @@ M e2f56083cb79b8b6dc4aa099d795222c8164428a
 M e35f359699a87e41bc9287d761a82a042d342dc3
 M e4bd3c2822a46c42d9751c4cdb6ed5b713a77d6f
 M e5106ca398aee0860d8fe69f0df11692e5c3ad2b
+M e54a4073dc7796738d2ef9a622b66d0ed8183bd4
 M e59e123ada4bdf42cfc7eac8fdb3f88607f97a25
 M e5d991d95eeffcdbd2cbff01233c14bbef11a5e6
 M e60d84d2ad4a4e95be19eb5d326dcae1133eefb3


(cxf) 06/07: Add to java2swagger-plugin

Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 8915511f00927c750451c9cac348d355335c194e
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sat Jan 13 13:45:19 2024 -0500

    Add <goalPrefix> to java2swagger-plugin
    
    (cherry picked from commit f9f4bf146c6424d9f3704ef34be58e7bdd593402)
---
 maven-plugins/java2swagger-plugin/pom.xml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/maven-plugins/java2swagger-plugin/pom.xml b/maven-plugins/java2swagger-plugin/pom.xml
index d10d5b33c4..3d1a81ad29 100644
--- a/maven-plugins/java2swagger-plugin/pom.xml
+++ b/maven-plugins/java2swagger-plugin/pom.xml
@@ -141,7 +141,18 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
-    
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-plugin-plugin</artifactId>
+                <configuration>
+                    <goalPrefix>cxf-java2swagger</goalPrefix>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
     <profiles>
         <profile>


(cxf) 01/07: Bump org.apache.rat:apache-rat-plugin from 0.15 to 0.16 (#1630)

Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 01a30250d0b213052abe82c99596a2810fdb4ba2
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Tue Jan 9 10:00:48 2024 -0500

    Bump org.apache.rat:apache-rat-plugin from 0.15 to 0.16 (#1630)
    
    Bumps org.apache.rat:apache-rat-plugin from 0.15 to 0.16.
    
    ---
    updated-dependencies:
    - dependency-name: org.apache.rat:apache-rat-plugin
      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 89f122199a1a096eb07c54c8f7efcfb598314b1d)
    (cherry picked from commit 5e00b3770725885e44558ffdc7bf941ca65d59b9)
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 9b49dc03d3..09eae8fa85 100644
--- a/pom.xml
+++ b/pom.xml
@@ -573,7 +573,7 @@
                 <plugin>
                     <groupId>org.apache.rat</groupId>
                     <artifactId>apache-rat-plugin</artifactId>
-                    <version>0.15</version>
+                    <version>0.16</version>
                     <configuration>
                         <numUnapprovedLicenses>350</numUnapprovedLicenses>
                         <excludeSubProjects>false</excludeSubProjects>


(cxf) 02/07: Bump org.apache.maven.plugins:maven-surefire-plugin from 3.2.3 to 3.2.5 (#1631)

Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit c5bcb00f8a1be6805268db7117d2c2c282c7c48f
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Wed Jan 10 12:41:52 2024 -0500

    Bump org.apache.maven.plugins:maven-surefire-plugin from 3.2.3 to 3.2.5 (#1631)
    
    Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.2.3 to 3.2.5.
    - [Release notes](https://github.com/apache/maven-surefire/releases)
    - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.2.3...surefire-3.2.5)
    
    ---
    updated-dependencies:
    - dependency-name: org.apache.maven.plugins:maven-surefire-plugin
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <su...@github.com>
    Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
    (cherry picked from commit 083e5364d20bddb490ac3cc511cf75cc9e5d9c05)
    (cherry picked from commit e41770b6c997b9972b82b1df0d2e170b5a08e009)
---
 distribution/src/main/release/samples/pom.xml | 2 +-
 pom.xml                                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index add9c2e011..a4939aa573 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -222,7 +222,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>3.2.3</version>
+                    <version>3.2.5</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
diff --git a/pom.xml b/pom.xml
index 09eae8fa85..85e3f86a69 100644
--- a/pom.xml
+++ b/pom.xml
@@ -476,7 +476,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>3.2.3</version>
+                    <version>3.2.5</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>


(cxf) 05/07: Bump org.apache.maven.plugins:maven-plugin-plugin from 3.10.2 to 3.11.0 (#1642)

Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 63117efc17a1cb77840474b3d88808702ca3840b
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Sat Jan 13 12:00:42 2024 -0500

    Bump org.apache.maven.plugins:maven-plugin-plugin from 3.10.2 to 3.11.0 (#1642)
    
    Bumps [org.apache.maven.plugins:maven-plugin-plugin](https://github.com/apache/maven-plugin-tools) from 3.10.2 to 3.11.0.
    - [Release notes](https://github.com/apache/maven-plugin-tools/releases)
    - [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.10.2...maven-plugin-tools-3.11.0)
    
    ---
    updated-dependencies:
    - dependency-name: org.apache.maven.plugins:maven-plugin-plugin
      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 9f9e997406adccda28e1bf7d341db58eb70b7e4c)
    (cherry picked from commit e54a4073dc7796738d2ef9a622b66d0ed8183bd4)
---
 maven-plugins/codegen-plugin/pom.xml        |  1 +
 maven-plugins/corba/pom.xml                 | 11 +++++++++++
 maven-plugins/java2wadl-plugin/pom.xml      | 12 ++++++++++++
 maven-plugins/java2ws-plugin/pom.xml        | 11 +++++++++++
 maven-plugins/wadl2java-plugin/pom.xml      |  1 +
 maven-plugins/wsdl-validator-plugin/pom.xml | 12 ++++++++++++
 pom.xml                                     |  2 +-
 7 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/maven-plugins/codegen-plugin/pom.xml b/maven-plugins/codegen-plugin/pom.xml
index 1292a77f3e..2cd5b96b88 100644
--- a/maven-plugins/codegen-plugin/pom.xml
+++ b/maven-plugins/codegen-plugin/pom.xml
@@ -134,6 +134,7 @@
                 <configuration>
                     <!-- see https://issues.apache.org/jira/browse/MNG-5346 -->
                     <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
+                    <goalPrefix>cxf-codegen</goalPrefix>
                 </configuration>
                 <executions>
                     <execution>
diff --git a/maven-plugins/corba/pom.xml b/maven-plugins/corba/pom.xml
index a3640ba066..0b5cf9a4b5 100644
--- a/maven-plugins/corba/pom.xml
+++ b/maven-plugins/corba/pom.xml
@@ -72,4 +72,15 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-plugin-plugin</artifactId>
+                <configuration>
+                    <goalPrefix>cxf-corbatools</goalPrefix>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/maven-plugins/java2wadl-plugin/pom.xml b/maven-plugins/java2wadl-plugin/pom.xml
index 20369e8db4..feff8463fc 100644
--- a/maven-plugins/java2wadl-plugin/pom.xml
+++ b/maven-plugins/java2wadl-plugin/pom.xml
@@ -131,6 +131,18 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-plugin-plugin</artifactId>
+                <configuration>
+                    <goalPrefix>cxf-java2wadl</goalPrefix>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <profiles>
         <profile>
             <id>pre-java9</id>
diff --git a/maven-plugins/java2ws-plugin/pom.xml b/maven-plugins/java2ws-plugin/pom.xml
index 78da6a4206..41d1b851b3 100644
--- a/maven-plugins/java2ws-plugin/pom.xml
+++ b/maven-plugins/java2ws-plugin/pom.xml
@@ -80,4 +80,15 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-plugin-plugin</artifactId>
+                <configuration>
+                    <goalPrefix>cxf-java2ws</goalPrefix>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/maven-plugins/wadl2java-plugin/pom.xml b/maven-plugins/wadl2java-plugin/pom.xml
index 44fbe3784b..ac9fd45798 100644
--- a/maven-plugins/wadl2java-plugin/pom.xml
+++ b/maven-plugins/wadl2java-plugin/pom.xml
@@ -113,6 +113,7 @@
                 <configuration>
                     <!-- see http://jira.codehaus.org/browse/MNG-5346 -->
                     <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
+                    <goalPrefix>cxf-wadl2java</goalPrefix>
                 </configuration>
                 <executions>
                     <execution>
diff --git a/maven-plugins/wsdl-validator-plugin/pom.xml b/maven-plugins/wsdl-validator-plugin/pom.xml
index d79770a86b..457f01d571 100644
--- a/maven-plugins/wsdl-validator-plugin/pom.xml
+++ b/maven-plugins/wsdl-validator-plugin/pom.xml
@@ -59,4 +59,16 @@
             <version>${cxf.plexus-utils.version}</version>
         </dependency>
     </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-plugin-plugin</artifactId>
+                <configuration>
+                    <goalPrefix>cxf-wsdl-validator</goalPrefix>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/pom.xml b/pom.xml
index 88c7af31af..70718b0ed3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -556,7 +556,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-plugin-plugin</artifactId>
-                    <version>3.10.2</version>
+                    <version>3.11.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>


(cxf) 04/07: Bump cxf.opentelemetry.version from 1.34.0 to 1.34.1 (#1643)

Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 8830234ec2089c5d82e7d59da780a5bf4ad50e9b
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Fri Jan 12 10:50:01 2024 -0500

    Bump cxf.opentelemetry.version from 1.34.0 to 1.34.1 (#1643)
    
    Bumps `cxf.opentelemetry.version` from 1.34.0 to 1.34.1.
    
    Updates `io.opentelemetry:opentelemetry-bom` from 1.34.0 to 1.34.1
    - [Release notes](https://github.com/open-telemetry/opentelemetry-java/releases)
    - [Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md)
    - [Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.34.0...v1.34.1)
    
    Updates `io.opentelemetry:opentelemetry-opentracing-shim` from 1.34.0 to 1.34.1
    - [Release notes](https://github.com/open-telemetry/opentelemetry-java/releases)
    - [Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md)
    - [Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.34.0...v1.34.1)
    
    ---
    updated-dependencies:
    - dependency-name: io.opentelemetry:opentelemetry-bom
      dependency-type: direct:production
      update-type: version-update:semver-patch
    - dependency-name: io.opentelemetry:opentelemetry-opentracing-shim
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <su...@github.com>
    Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
    (cherry picked from commit 4c10d723d462dac06d1743ef2c73828260e84a8d)
    
    # Conflicts:
    #       parent/pom.xml
    (cherry picked from commit da40c28ed81756bbdb7e8d0fb5ec091c0c0d2f71)
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 26187e91e0..d0414eb3b2 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -185,7 +185,7 @@
         <cxf.openjpa.version>3.2.2</cxf.openjpa.version>
         <cxf.opensaml.osgi.version.range>[3.1,4)</cxf.opensaml.osgi.version.range>
         <cxf.opensaml.osgi.version>3.4.6_3</cxf.opensaml.osgi.version>
-        <cxf.opentelemetry.version>1.34.0</cxf.opentelemetry.version>
+        <cxf.opentelemetry.version>1.34.1</cxf.opentelemetry.version>
         <cxf.opentelemetry.semconv.version>1.23.1-alpha</cxf.opentelemetry.semconv.version>
         <cxf.opentracing.version>0.33.0</cxf.opentracing.version>
         <cxf.openwebbeans.version>2.0.27</cxf.openwebbeans.version>


(cxf) 03/07: Bump org.apache.maven.plugins:maven-surefire-report-plugin (#1635)

Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit f2d2ea525534b2df74e7550b90ef99da9e3d5e37
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Thu Jan 11 08:09:25 2024 -0500

    Bump org.apache.maven.plugins:maven-surefire-report-plugin (#1635)
    
    Bumps [org.apache.maven.plugins:maven-surefire-report-plugin](https://github.com/apache/maven-surefire) from 3.2.3 to 3.2.5.
    - [Release notes](https://github.com/apache/maven-surefire/releases)
    - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.2.3...surefire-3.2.5)
    
    ---
    updated-dependencies:
    - dependency-name: org.apache.maven.plugins:maven-surefire-report-plugin
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <su...@github.com>
    Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
    (cherry picked from commit c14b124eb58810c4836f462b5d5ecd6bca118abb)
    (cherry picked from commit 9750131b5a45b4aedc79288575639b5cd47c06da)
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 85e3f86a69..88c7af31af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -546,7 +546,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-report-plugin</artifactId>
-                    <version>3.2.3</version>
+                    <version>3.2.5</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>