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 1f09a96ed320ff9064e3d8cd8f430f627d69f694
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Thu Jul 3 18:49:08 2025 -0400

    Bump org.apache.maven.plugins:maven-enforcer-plugin from 3.5.0 to 3.6.0 
(#2499)
    
    Bumps 
[org.apache.maven.plugins:maven-enforcer-plugin](https://github.com/apache/maven-enforcer)
 from 3.5.0 to 3.6.0.
    - [Release notes](https://github.com/apache/maven-enforcer/releases)
    - 
[Commits](https://github.com/apache/maven-enforcer/compare/enforcer-3.5.0...enforcer-3.6.0)
    
    ---
    updated-dependencies:
    - dependency-name: org.apache.maven.plugins:maven-enforcer-plugin
      dependency-version: 3.6.0
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <[email protected]>
    Co-authored-by: dependabot[bot] 
<49699333+dependabot[bot]@users.noreply.github.com>
    (cherry picked from commit 22c6265d4306187569b30c5b19682b37fe7d5c5c)
    (cherry picked from commit 6405712673c2127f8d2139e26e118ec52dd93401)
    
    # Conflicts:
    #       distribution/src/main/release/samples/pom.xml
---
 distribution/src/main/release/samples/pom.xml | 1 +
 pom.xml                                       | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/distribution/src/main/release/samples/pom.xml 
b/distribution/src/main/release/samples/pom.xml
index a1d0345b06..6531523e53 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -227,6 +227,7 @@
                     <version>3.5.3</version>
                 </plugin>
                 <plugin>
+<<<<<<< HEAD
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-assembly-plugin</artifactId>
                     <version>3.5.0</version>
diff --git a/pom.xml b/pom.xml
index a6a17cef95..c42687ffeb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -645,7 +645,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-enforcer-plugin</artifactId>
-                    <version>3.5.0</version>
+                    <version>3.6.0</version>
                     <configuration>
                         <rules>
                             <requireJavaVersion>

Reply via email to