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 2023/01/25 01:55:36 UTC

[cxf] branch 3.4.x-fixes updated (1ca42e3e10 -> 6ccd4cd7a9)

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

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


    from 1ca42e3e10 Recording .gitmergeinfo Changes
     new 452516f5a7 Fix msv-core dependency exclusions after 2022.7 update
     new 66126f9a73 Fix msv-core dependency exclusions for JDK-8 and JDK-9+
     new 5dc2687ee5 Recording .gitmergeinfo Changes
     new 563d14ca6b Bump maven-antrun-plugin from 3.0.0 to 3.1.0 (#1079)
     new 5a2f5385a1 Bump exec-maven-plugin from 1.6.0 to 3.1.0 (#1080)
     new 6ccd4cd7a9 Bump geronimo-config-impl from 1.0 to 1.2.3 (#1082)

The 6 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                                 |  3 +++
 distribution/src/main/release/samples/pom.xml |  2 +-
 parent/pom.xml                                | 19 +++++++++++++++++++
 pom.xml                                       |  2 +-
 systests/microprofile/pom.xml                 |  2 +-
 5 files changed, 25 insertions(+), 3 deletions(-)


[cxf] 01/06: Fix msv-core dependency exclusions after 2022.7 update

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

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

commit 452516f5a78dcbf09bb515505e598313613f8f68
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sat Jan 21 21:19:29 2023 -0500

    Fix msv-core dependency exclusions after 2022.7 update
    
    (cherry picked from commit fb3918beb61b1c62c7bcbb5564e98c7fa628e5a1)
    (cherry picked from commit d068b9012c778f53fa7603e348adce69fcf4548b)
    (cherry picked from commit e1d78e4755ba77d6859354602e53233d5f000a26)
---
 parent/pom.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/parent/pom.xml b/parent/pom.xml
index d6b80d6533..0672b8af11 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1930,6 +1930,10 @@
                         <groupId>net.java.dev.msv</groupId>
                         <artifactId>msv-testharness</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>xml-apis</groupId>
+                        <artifactId>xml-apis</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>


[cxf] 05/06: Bump exec-maven-plugin from 1.6.0 to 3.1.0 (#1080)

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

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

commit 5a2f5385a18e32c31181952cbbd8245cf3117407
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Mon Jan 23 09:10:47 2023 -0500

    Bump exec-maven-plugin from 1.6.0 to 3.1.0 (#1080)
    
    Bumps [exec-maven-plugin](https://github.com/mojohaus/exec-maven-plugin) from 1.6.0 to 3.1.0.
    - [Release notes](https://github.com/mojohaus/exec-maven-plugin/releases)
    - [Commits](https://github.com/mojohaus/exec-maven-plugin/compare/exec-maven-plugin-1.6.0...exec-maven-plugin-3.1.0)
    
    ---
    updated-dependencies:
    - dependency-name: org.codehaus.mojo:exec-maven-plugin
      dependency-type: direct:production
      update-type: version-update:semver-major
    ...
    
    Signed-off-by: dependabot[bot] <su...@github.com>
    
    Signed-off-by: dependabot[bot] <su...@github.com>
    Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
---
 distribution/src/main/release/samples/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index 40e41aa2d3..ccf76be1d4 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -201,7 +201,7 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>exec-maven-plugin</artifactId>
-                    <version>1.6.0</version>
+                    <version>3.1.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.felix</groupId>


[cxf] 02/06: Fix msv-core dependency exclusions for JDK-8 and JDK-9+

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

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

commit 66126f9a73ab320268b4e49be41ada64d0c22c26
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Tue Jan 24 13:02:06 2023 -0500

    Fix msv-core dependency exclusions for JDK-8 and JDK-9+
    
    (cherry picked from commit e910371280fda20f82b1d13a1ed257ed79a9c751)
    
    # Conflicts:
    #       parent/pom.xml
---
 parent/pom.xml | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 0672b8af11..7f65fb45ad 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1930,10 +1930,6 @@
                         <groupId>net.java.dev.msv</groupId>
                         <artifactId>msv-testharness</artifactId>
                     </exclusion>
-                    <exclusion>
-                        <groupId>xml-apis</groupId>
-                        <artifactId>xml-apis</artifactId>
-                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
@@ -2414,6 +2410,25 @@
                     <scope>test</scope>
                 </dependency>
             </dependencies>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>net.java.dev.msv</groupId>
+                        <artifactId>msv-core</artifactId>
+                        <version>${cxf.msv.version}</version>
+                        <exclusions>
+                            <exclusion>
+                                <groupId>net.java.dev.msv</groupId>
+                                <artifactId>msv-testharness</artifactId>
+                            </exclusion>
+                            <exclusion>
+                                <groupId>xml-apis</groupId>
+                                <artifactId>xml-apis</artifactId>
+                            </exclusion>
+                        </exclusions>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
         </profile>
         <profile>
             <id>jdk13</id>


[cxf] 04/06: Bump maven-antrun-plugin from 3.0.0 to 3.1.0 (#1079)

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

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

commit 563d14ca6b74dabc0a3fd18bad268714be525a9f
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Mon Jan 23 09:11:21 2023 -0500

    Bump maven-antrun-plugin from 3.0.0 to 3.1.0 (#1079)
    
    Bumps [maven-antrun-plugin](https://github.com/apache/maven-antrun-plugin) from 3.0.0 to 3.1.0.
    - [Release notes](https://github.com/apache/maven-antrun-plugin/releases)
    - [Commits](https://github.com/apache/maven-antrun-plugin/compare/maven-antrun-plugin-3.0.0...maven-antrun-plugin-3.1.0)
    
    ---
    updated-dependencies:
    - dependency-name: org.apache.maven.plugins:maven-antrun-plugin
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <su...@github.com>
    
    Signed-off-by: dependabot[bot] <su...@github.com>
    Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a508149f53..d6e99f5c40 100644
--- a/pom.xml
+++ b/pom.xml
@@ -513,7 +513,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-antrun-plugin</artifactId>
-                    <version>3.0.0</version>
+                    <version>3.1.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>


[cxf] 06/06: Bump geronimo-config-impl from 1.0 to 1.2.3 (#1082)

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

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

commit 6ccd4cd7a9630b523138867ba27af0626f4a10ec
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Tue Jan 24 17:11:04 2023 -0500

    Bump geronimo-config-impl from 1.0 to 1.2.3 (#1082)
    
    Bumps geronimo-config-impl from 1.0 to 1.2.3.
    
    ---
    updated-dependencies:
    - dependency-name: org.apache.geronimo.config:geronimo-config-impl
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <su...@github.com>
    
    Signed-off-by: dependabot[bot] <su...@github.com>
    Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
---
 systests/microprofile/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/systests/microprofile/pom.xml b/systests/microprofile/pom.xml
index 71ee54f584..67179a2ac7 100644
--- a/systests/microprofile/pom.xml
+++ b/systests/microprofile/pom.xml
@@ -32,7 +32,7 @@
     <description>Apache CXF System Tests - MicroProfile TCKs</description>
     <url>https://cxf.apache.org</url>
     <properties>
-        <cxf.geronimo.config.version>1.0</cxf.geronimo.config.version>
+        <cxf.geronimo.config.version>1.2.3</cxf.geronimo.config.version>
         <cxf.wiremock.params>--port=8765</cxf.wiremock.params>
     </properties>
     <dependencyManagement>


[cxf] 03/06: 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.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 5dc2687ee5190fb03c2f8494521ebaf182d4ed9d
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Tue Jan 24 19:56:51 2023 -0500

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

diff --git a/.gitmergeinfo b/.gitmergeinfo
index bb638c8382..2b80caf435 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -69,6 +69,7 @@ B 40ba580e4f3ba5a2f68f3ae75982cf4d0c0885d7
 B 4119762989d4976bfbe51e78a763304c83ecafa0
 B 41588ea20522cf067cee08dca66b890cd802b5f9
 B 435e40acd26321899aeae7a5b447ef1920fa2bd8
+B 455bed8b26f8a417249e7567a90b38d3c5bd2a13
 B 46366e20613d4b17628d0309c5caa8e3af715391
 B 471c07c234dfbd113f02efe4c24fcd6fcd765860
 B 47a5b631ee8fee22c9a3e592666626f9d2123d3b
@@ -435,6 +436,7 @@ M 6efe3604373ddd1e1e8068b33e2059e2d1077410
 M 700cf3929763d551d9fac6c570c2560039c6238c
 M 70c7d6a1e3f23522609d58b72b61c52e3cbc919a
 M 718f9470928b87700dbe56c98a7d2f15782884d5
+M 720a57a0b5881abeef87b04e552b8a8d568214db
 M 721f611b26d589f16f1abc7e46703de13cd2cc92
 M 7262f64061fcd0cb3e47f49e99e448698a490693
 M 72abe7416755fcba5943a64299d5e687661cb4c1
@@ -626,6 +628,7 @@ M e671095fbb2576e6e5a01d860951c3aa84968c80
 M e706671c28d72d4ba00685934e474bb064a8d40e
 M e758de3e60501bd33ca1b9ef3df685128d4a443a
 M e775237e6dcb16b647d102bcbb3908d3e9fce1de
+M e910371280fda20f82b1d13a1ed257ed79a9c751
 M ea7ea0c32683af9973f9897049f024c50ec6afa3
 M eb40a0f66ccf711175bba0656df309e059b855b2
 M eb4bab9983a287bf9dc0574d22077cc783bc88ac