You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2018/08/13 15:31:34 UTC
[cxf] branch 3.2.x-fixes updated (0e41a16 -> 4f8f5dc)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from 0e41a16 [maven-release-plugin] prepare for next development iteration
new 54d21ea Removing duplicate dependencies
new 0628bf1 Updating Netty versions
new 6832c2e Standardizing on a version of Tomcat in the parent pom
new 5181cf2 Updating Xerces
new c10cd4b Updating Karaf
new 4f8f5dc Recording .gitmergeinfo Changes
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 | 2 ++
parent/pom.xml | 11 ++++++-----
rt/rs/microprofile-client/pom.xml | 5 -----
systests/cdi/pom.xml | 1 -
systests/microprofile/client/async/pom.xml | 5 -----
systests/rs-sse/rs-sse-tomcat/pom.xml | 1 -
6 files changed, 8 insertions(+), 17 deletions(-)
[cxf] 02/06: Updating Netty versions
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 0628bf1851a2dc1c599ef9d63a6b19bf61bcca78
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Aug 13 13:41:50 2018 +0100
Updating Netty versions
(cherry picked from commit 31494b2417798ce2309edd9bfa2b4914b0133512)
---
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 09d8705..444c372 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -136,8 +136,8 @@
<cxf.maven.core.version>3.0.5</cxf.maven.core.version>
<cxf.msv.version>2013.6.1</cxf.msv.version>
<cxf.neethi.version>3.1.1</cxf.neethi.version>
- <cxf.netty.version>4.0.43.Final</cxf.netty.version>
- <cxf.netty3.version>3.9.2.Final</cxf.netty3.version>
+ <cxf.netty.version>4.0.56.Final</cxf.netty.version>
+ <cxf.netty3.version>3.10.6.Final</cxf.netty3.version>
<cxf.netty.version.range>[4,5)</cxf.netty.version.range>
<cxf.oauth.bundle.version>20100527_1</cxf.oauth.bundle.version>
<cxf.oauth.version>20100527</cxf.oauth.version>
[cxf] 06/06: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 4f8f5dcf91713d62ea99282ff04c30457e58dbc7
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Aug 13 15:43:39 2018 +0100
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 9071199..1f48c99 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -2,12 +2,14 @@ origin/master
B 25e88017b49bde5a53bce8dab3ecc93aab6dd040
B 4104641a4b731c72d66b1dace3d9ed4290226694
B 468cf8f3cfe9ef8285cd2ae66caddf666b7aaf13
+B 9db243c1aa44732996514200b490eb63683540b4
B bb098089d18825ddc850fa82f4acee45e2b6ee7a
B da5b01b32a59867b48e2b35a9281b3625f58d514
B e9261069513b1947e16bf485182c328c07160e1c
B fc656dc1311963f5fc833856984b36b7ccd26042
M 0b920d7275800e651b2c48c982b1977249516ddf
M 3904a477e70fe6385777120bfe4820ff9a7713f3
+M 4f8ae843f56e3ef84af43ae90f507e196726f0bf
M 504a1b7827bc76f3c5106b901b44e54513db17aa
M 886a055d49d844e445721e4752c7a6360cbe8b9a
M eaa14b96ea5275ff9ee27cf937cd498ca3dcd47f
[cxf] 05/06: Updating Karaf
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit c10cd4b60fbba0b429a4a2c239336bb75e6cd1fa
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Aug 13 14:56:07 2018 +0100
Updating Karaf
(cherry picked from commit 9bbe9b8118909f55db394046731c1a83119497b0)
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 4afa9fb..45bde8a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -196,7 +196,7 @@
<cxf.aries.parser.version>1.3.1</cxf.aries.parser.version>
<cxf.aries.version.range>[1.0,2)</cxf.aries.version.range>
<cxf.osgi.version>5.0.0</cxf.osgi.version>
- <cxf.karaf.version>4.1.2</cxf.karaf.version>
+ <cxf.karaf.version>4.1.6</cxf.karaf.version>
<cxf.pax.logging.version>1.6.0</cxf.pax.logging.version>
<cxf.pax.exam.version>4.12.0</cxf.pax.exam.version>
<cxf.felix.configadmin.version>1.2.4</cxf.felix.configadmin.version>
[cxf] 01/06: Removing duplicate dependencies
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 54d21eafe79925311ac6257dc41fbe82fb5ed037
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Aug 13 11:54:49 2018 +0100
Removing duplicate dependencies
(cherry picked from commit 268350fa56ea293ff150b256882077325e436eb1)
---
rt/rs/microprofile-client/pom.xml | 5 -----
systests/microprofile/client/async/pom.xml | 5 -----
2 files changed, 10 deletions(-)
diff --git a/rt/rs/microprofile-client/pom.xml b/rt/rs/microprofile-client/pom.xml
index dbb98a8..359b492 100644
--- a/rt/rs/microprofile-client/pom.xml
+++ b/rt/rs/microprofile-client/pom.xml
@@ -71,11 +71,6 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxrs</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-local</artifactId>
<version>${project.version}</version>
<scope>test</scope>
diff --git a/systests/microprofile/client/async/pom.xml b/systests/microprofile/client/async/pom.xml
index d42a8e1..aecc5d3 100644
--- a/systests/microprofile/client/async/pom.xml
+++ b/systests/microprofile/client/async/pom.xml
@@ -53,11 +53,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-rs-mp-client</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>${cxf.commons.logging.version}</version>
[cxf] 03/06: Standardizing on a version of Tomcat in the parent pom
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 6832c2e021a35355254c818c725ca97ebca612bf
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Aug 13 14:55:32 2018 +0100
Standardizing on a version of Tomcat in the parent pom
(cherry picked from commit 4f8ae843f56e3ef84af43ae90f507e196726f0bf)
---
parent/pom.xml | 1 +
systests/cdi/pom.xml | 1 -
systests/rs-sse/rs-sse-tomcat/pom.xml | 1 -
3 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 444c372..f03efae 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -165,6 +165,7 @@
<cxf.swagger2.version>1.5.17</cxf.swagger2.version><!-- updating to 1.5.18 will cause systest failures -->
<cxf.swagger.v3.version>2.0.0</cxf.swagger.v3.version>
<cxf.swagger.ui.version>3.17.6</cxf.swagger.ui.version>
+ <cxf.tomcat.version>8.0.53</cxf.tomcat.version>
<cxf.velocity.version>2.0</cxf.velocity.version>
<cxf.woodstox.core.version>5.1.0</cxf.woodstox.core.version>
<cxf.woodstox.stax2-api.version>4.1</cxf.woodstox.stax2-api.version>
diff --git a/systests/cdi/pom.xml b/systests/cdi/pom.xml
index 87fa2cb..02a2d41 100644
--- a/systests/cdi/pom.xml
+++ b/systests/cdi/pom.xml
@@ -34,7 +34,6 @@
<properties>
<cxf.el.api.version>3.0-b02</cxf.el.api.version>
<cxf.glassfish.el.version>3.0-b01</cxf.glassfish.el.version>
- <cxf.tomcat.version>8.0.32</cxf.tomcat.version>
<cxf.openwebbeans.version>1.7.4</cxf.openwebbeans.version>
</properties>
<modules>
diff --git a/systests/rs-sse/rs-sse-tomcat/pom.xml b/systests/rs-sse/rs-sse-tomcat/pom.xml
index 99629fb..af45651 100644
--- a/systests/rs-sse/rs-sse-tomcat/pom.xml
+++ b/systests/rs-sse/rs-sse-tomcat/pom.xml
@@ -30,7 +30,6 @@
<description>Apache CXF SSE Integration System Tests Tomcat</description>
<url>http://cxf.apache.org</url>
<properties>
- <cxf.tomcat.version>8.0.32</cxf.tomcat.version>
<cxf.module.name>org.apache.cxf.systests.rs.sse.tomcat</cxf.module.name>
</properties>
<dependencies>
[cxf] 04/06: Updating Xerces
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 5181cf22e73b5f73a119cdb7dd08335db534d97f
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Aug 13 14:55:54 2018 +0100
Updating Xerces
(cherry picked from commit ef2301702553e33cce206467b0b7c7b052762474)
---
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index f03efae..4afa9fb 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -172,7 +172,7 @@
<cxf.wsdl4j.version>1.6.3</cxf.wsdl4j.version>
<cxf.wss4j.version>2.2.2</cxf.wss4j.version>
<cxf.xbean.version>3.5</cxf.xbean.version>
- <cxf.xerces.version>2.11.0</cxf.xerces.version>
+ <cxf.xerces.version>2.12.0</cxf.xerces.version>
<cxf.xmlschema.version>2.2.3</cxf.xmlschema.version>
<cxf.xpp3.bundle.version>1.1.4c_6</cxf.xpp3.bundle.version>
<cxf.validation.api.version>1.1.0.Final</cxf.validation.api.version>
@@ -214,7 +214,7 @@
<cxf.xmlsec.bundle.version>2.1.2</cxf.xmlsec.bundle.version>
<cxf.rhino.bundle.version>1.7R2_3</cxf.rhino.bundle.version>
<cxf.xmlresolver.bundle.version>1.2_5</cxf.xmlresolver.bundle.version>
- <cxf.xerces.bundle.version>2.11.0_1</cxf.xerces.bundle.version>
+ <cxf.xerces.bundle.version>2.12.0_1</cxf.xerces.bundle.version>
<cxf.bcel.bundle.version>5.2_4</cxf.bcel.bundle.version>
<cxf.xalan.version>2.7.2</cxf.xalan.version>
<cxf.xalan.bundle.version>2.7.2_3</cxf.xalan.bundle.version>