[cxf] branch 3.3.x-fixes updated (f820e8e -> 7e36a71)

classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

[cxf] branch 3.3.x-fixes updated (f820e8e -> 7e36a71)

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

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


    from f820e8e  Recording .gitmergeinfo Changes
     new fe37ad2  Update to maven-checkstyle-plugin 3.1.1
     new 78d29a1  Updating Jettison to 1.4.1
     new 7e36a71  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 ++
 parent/pom.xml | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

Reply | Threaded
Open this post in threaded view
|

[cxf] 01/03: Update to maven-checkstyle-plugin 3.1.1

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

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

commit fe37ad2e31d4b7dfab34e31da596c1ab88f8f24d
Author: Alexey Markevich <[hidden email]>
AuthorDate: Fri Mar 13 16:56:40 2020 +0300

    Update to maven-checkstyle-plugin 3.1.1
   
    (cherry picked from commit 9c37b6c321f06621334076cc61b5b31b237f634d)
   
    # Conflicts:
    # parent/pom.xml
---
 parent/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index b6a9a57..ee5134a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -371,7 +371,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-checkstyle-plugin</artifactId>
-                    <version>3.1.0</version>
+                    <version>3.1.1</version>
                     <dependencies>
                         <dependency>
                             <groupId>org.apache.cxf.build-utils</groupId>
@@ -381,7 +381,7 @@
                         <dependency>
                             <groupId>com.puppycrawl.tools</groupId>
                             <artifactId>checkstyle</artifactId>
-                            <version>8.26</version>
+                            <version>8.30</version>
                         </dependency>
                     </dependencies>
                     <configuration>

Reply | Threaded
Open this post in threaded view
|

[cxf] 02/03: Updating Jettison to 1.4.1

coheigea
Administrator
In reply to this post by coheigea
This is an automated email from the ASF dual-hosted git repository.

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

commit 78d29a1ab8817109b644b9679202b4ca0a00b954
Author: Colm O hEigeartaigh <[hidden email]>
AuthorDate: Thu Mar 19 06:36:54 2020 +0000

    Updating Jettison to 1.4.1
   
    (cherry picked from commit 1e3817e3f7d51d093bff81d2520fb7cef82f0df8)
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index ee5134a..be5cf8d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -144,7 +144,7 @@
         <cxf.jboss.weld.version>2.4.8.Final</cxf.jboss.weld.version>
         <cxf.jcache.version>1.1.1</cxf.jcache.version>
         <cxf.jdom.version>1.0</cxf.jdom.version>
-        <cxf.jettison.version>1.4.0</cxf.jettison.version>
+        <cxf.jettison.version>1.4.1</cxf.jettison.version>
         <cxf.jetty.osgi.version>[9.2,10)</cxf.jetty.osgi.version>
         <cxf.jetty.version>${cxf.jetty9.version}</cxf.jetty.version>
         <cxf.jexl.version>2.1.1</cxf.jexl.version>

Reply | Threaded
Open this post in threaded view
|

[cxf] 03/03: Recording .gitmergeinfo Changes

coheigea
Administrator
In reply to this post by coheigea
This is an automated email from the ASF dual-hosted git repository.

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

commit 7e36a7158121573f9b42bd95212b70998db91474
Author: Colm O hEigeartaigh <[hidden email]>
AuthorDate: Thu Mar 19 08:28:57 2020 +0000

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

diff --git a/.gitmergeinfo b/.gitmergeinfo
index d38101f..7f9655a 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -162,6 +162,7 @@ M 160f50ed9bd9391b61417716b3a67653c9e81a98
 M 169be66c11851d723e4a8d93f752e0b3dff1fa60
 M 16d285838dc2209ca84af21723478f199403c2b7
 M 180578d01f361d77ce7f42dd760fa8d5f245ce7e
+M 1e3817e3f7d51d093bff81d2520fb7cef82f0df8
 M 224fa741d6753053c6f47d361f8cc7e93fd34ed9
 M 2275d49772676ac72bc14ebbc3173719cd72e635
 M 29f9d03b69ee071d3b83e4f0509a6b6e01b96564
@@ -193,6 +194,7 @@ M 7ef814556d727c147d6f625cbb1170edfd24a752
 M 92a00fc05e2437d2d0cf98099060ba4e1f6dac99
 M 95c3c37092751b1d00b6f2c26642f18ebcbba878
 M 972a2755ca85ba86f473b0ce46f23bf6193ced62
+M 9c37b6c321f06621334076cc61b5b31b237f634d
 M 9c462e9bd614d529f0a2fd86490243ea1c858651
 M a4fc3a0462f09dd6c6c920385b67e621d7e36399
 M a61ca44ab50c1a3fc20fbaafe89b372809e0f49b