[cxf] branch 3.3.x-fixes updated (01cc632 -> 326c3e2)

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

[cxf] branch 3.3.x-fixes updated (01cc632 -> 326c3e2)

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 01cc632  CXF-8282: Set read timeout using netty client. Closing the context when HTTP response is fully read
     new 1b2ceb3  Recording .gitmergeinfo Changes
     new 326c3e2  Updating Tomcat to 8.5.55

The 2 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                                                   | 1 +
 distribution/src/main/release/samples/java_first_jaxws/pom.xml  | 3 ---
 distribution/src/main/release/samples/jax_rs/sse_tomcat/pom.xml | 4 ----
 distribution/src/main/release/samples/pom.xml                   | 1 +
 parent/pom.xml                                                  | 2 +-
 5 files changed, 3 insertions(+), 8 deletions(-)

Reply | Threaded
Open this post in threaded view
|

[cxf] 01/02: Recording .gitmergeinfo Changes

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 1b2ceb30d16b60ca2de959d742667396950f198a
Author: Colm O hEigeartaigh <[hidden email]>
AuthorDate: Thu May 21 08:04:15 2020 +0100

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

diff --git a/.gitmergeinfo b/.gitmergeinfo
index e240a05..6511a41 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -223,6 +223,7 @@ B f1fa1e7826b5f26fdf8f157914e69adfe9eb5bd5
 B f201f1e7d218f2bb26424628b09a0bb384bce28f
 B f2208f20249b6598134e2b0885d87ab75817f2e2
 B f2da164e0733a14f967f3726166855d3a91eece8
+B f342fba01d88d60e9f7419c7811bd86074b249a8
 B f4f227be9a1c4f31817a62fad7fff382d3089621
 B f54062eb331fcf35d9f3a840f532417fccbb2673
 B f68556e5b8f2fb54a6e42c48068bfc3a85996720

Reply | Threaded
Open this post in threaded view
|

[cxf] 02/02: Updating Tomcat to 8.5.55

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 326c3e24e21a289f3e4733c0c89749c89eed97cf
Author: Colm O hEigeartaigh <[hidden email]>
AuthorDate: Thu May 21 09:42:58 2020 +0100

    Updating Tomcat to 8.5.55
---
 distribution/src/main/release/samples/java_first_jaxws/pom.xml  | 3 ---
 distribution/src/main/release/samples/jax_rs/sse_tomcat/pom.xml | 4 ----
 distribution/src/main/release/samples/pom.xml                   | 1 +
 parent/pom.xml                                                  | 2 +-
 4 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/distribution/src/main/release/samples/java_first_jaxws/pom.xml b/distribution/src/main/release/samples/java_first_jaxws/pom.xml
index 678749e..304b9bd 100644
--- a/distribution/src/main/release/samples/java_first_jaxws/pom.xml
+++ b/distribution/src/main/release/samples/java_first_jaxws/pom.xml
@@ -28,9 +28,6 @@
         <artifactId>cxf-samples</artifactId>
         <version>3.3.7-SNAPSHOT</version>
     </parent>
-    <properties>
-        <cxf.tomcat.version>8.5.47</cxf.tomcat.version>
-    </properties>
     <build>
         <plugins>
             <plugin>
diff --git a/distribution/src/main/release/samples/jax_rs/sse_tomcat/pom.xml b/distribution/src/main/release/samples/jax_rs/sse_tomcat/pom.xml
index 77221ea..c1f050c 100644
--- a/distribution/src/main/release/samples/jax_rs/sse_tomcat/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/sse_tomcat/pom.xml
@@ -11,10 +11,6 @@
         <relativePath>../..</relativePath>
     </parent>
 
-    <properties>
-        <cxf.tomcat.version>8.5.47</cxf.tomcat.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index a315596..78fdb90 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -36,6 +36,7 @@
         <cxf.httpcomponents.client.version>4.5.8</cxf.httpcomponents.client.version>
         <cxf.swagger.ui.version>3.24.3</cxf.swagger.ui.version>
         <cxf.tika.version>1.24.1</cxf.tika.version>
+        <cxf.tomcat.version>8.5.55</cxf.tomcat.version>
     </properties>
     <dependencies>
         <dependency>
diff --git a/parent/pom.xml b/parent/pom.xml
index fca53e4..84a5edd 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -203,7 +203,7 @@
         <cxf.swagger2.version>1.5.24</cxf.swagger2.version>
         <cxf.swagger2.guava.version>27.0-jre</cxf.swagger2.guava.version>
         <cxf.tika.version>1.24.1</cxf.tika.version>
-        <cxf.tomcat.version>8.5.54</cxf.tomcat.version>
+        <cxf.tomcat.version>8.5.55</cxf.tomcat.version>
         <cxf.tomitribe.http.signature.version>1.3</cxf.tomitribe.http.signature.version>
         <cxf.undertow.osgi.version>[1.4,3.0)</cxf.undertow.osgi.version>
         <cxf.undertow.version>2.0.30.Final</cxf.undertow.version>