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


The following commit(s) were added to refs/heads/3.6.x-fixes by this push:
     new 3f1f055bc5 Bump cxf.maven.core.version from 3.6.3 to 3.9.1 (#1194)
3f1f055bc5 is described below

commit 3f1f055bc59754cde7f94bd38c8c366bff3b3974
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Sun Apr 16 12:47:01 2023 -0400

    Bump cxf.maven.core.version from 3.6.3 to 3.9.1 (#1194)
    
    Bumps `cxf.maven.core.version` from 3.6.3 to 3.9.1.
    
    Updates `maven-compat` from 3.6.3 to 3.9.1
    - [Release notes](https://github.com/apache/maven/releases)
    - 
[Commits](https://github.com/apache/maven/compare/maven-3.6.3...maven-3.9.1)
    
    Updates `maven-plugin-api` from 3.6.3 to 3.9.1
    - [Release notes](https://github.com/apache/maven/releases)
    - 
[Commits](https://github.com/apache/maven/compare/maven-3.6.3...maven-3.9.1)
    
    Updates `maven-artifact` from 3.6.3 to 3.9.1
    - [Release notes](https://github.com/apache/maven/releases)
    - 
[Commits](https://github.com/apache/maven/compare/maven-3.6.3...maven-3.9.1)
    
    Updates `maven-core` from 3.6.3 to 3.9.1
    - [Release notes](https://github.com/apache/maven/releases)
    - 
[Commits](https://github.com/apache/maven/compare/maven-3.6.3...maven-3.9.1)
    
    Updates `maven-settings` from 3.6.3 to 3.9.1
    - [Release notes](https://github.com/apache/maven/releases)
    - 
[Commits](https://github.com/apache/maven/compare/maven-3.6.3...maven-3.9.1)
    
    ---
    updated-dependencies:
    - dependency-name: org.apache.maven:maven-compat
      dependency-type: direct:production
      update-type: version-update:semver-minor
    - dependency-name: org.apache.maven:maven-plugin-api
      dependency-type: direct:production
      update-type: version-update:semver-minor
    - dependency-name: org.apache.maven:maven-artifact
      dependency-type: direct:production
      update-type: version-update:semver-minor
    - dependency-name: org.apache.maven:maven-core
      dependency-type: direct:production
      update-type: version-update:semver-minor
    - dependency-name: org.apache.maven:maven-settings
      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>
---
 maven-plugins/corba/pom.xml            |  2 +-
 maven-plugins/java2wadl-plugin/pom.xml |  5 +++++
 parent/pom.xml                         | 12 +++++++++++-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/maven-plugins/corba/pom.xml b/maven-plugins/corba/pom.xml
index 6967a41bc6..3840b8b497 100644
--- a/maven-plugins/corba/pom.xml
+++ b/maven-plugins/corba/pom.xml
@@ -58,7 +58,7 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-plugin-api</artifactId>
-            <scope>compile</scope>
+            <scope>provided</scope>
             <exclusions>
                 <exclusion>
                     <groupId>junit</groupId>
diff --git a/maven-plugins/java2wadl-plugin/pom.xml 
b/maven-plugins/java2wadl-plugin/pom.xml
index a3525ca6f0..539e8f2623 100644
--- a/maven-plugins/java2wadl-plugin/pom.xml
+++ b/maven-plugins/java2wadl-plugin/pom.xml
@@ -57,6 +57,7 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-compat</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
@@ -104,6 +105,10 @@
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
             <exclusions>
+                <exclusion>
+                    <groupId>org.apache.maven</groupId>
+                    <artifactId>maven-model</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>org.apache.maven</groupId>
                     <artifactId>maven-project</artifactId>
diff --git a/parent/pom.xml b/parent/pom.xml
index 4bb060beca..db22f9b79b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -167,7 +167,7 @@
         <cxf.littleproxy.version>1.1.2</cxf.littleproxy.version>
         <cxf.logback.classic.version>1.2.10</cxf.logback.classic.version>
         <cxf.lucene.version>9.5.0</cxf.lucene.version>
-        <cxf.maven.core.version>3.6.3</cxf.maven.core.version>
+        <cxf.maven.core.version>3.9.1</cxf.maven.core.version>
         <cxf.micrometer.version>1.9.10</cxf.micrometer.version>
         <cxf.microprofile.config.version>2.0</cxf.microprofile.config.version>
         
<cxf.microprofile.rest.client.version>2.0</cxf.microprofile.rest.client.version>
@@ -865,6 +865,10 @@
                         <groupId>javax.enterprise</groupId>
                         <artifactId>cdi-api</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>javax.annotation</groupId>
+                        <artifactId>javax.annotation-api</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
@@ -983,6 +987,12 @@
                 <artifactId>maven-core</artifactId>
                 <scope>provided</scope>
                 <version>${cxf.maven.core.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>javax.annotation</groupId>
+                        <artifactId>javax.annotation-api</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.apache.maven</groupId>

Reply via email to