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 14:43:15 UTC
[cxf] branch master updated (c7eee85 -> 9bbe9b8)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from c7eee85 Merge pull request #433 from rgra/patch-1
new 268350f Removing duplicate dependencies
new 9db243c CXF-7809 - Adding owasp dependency plugin checks
new 31494b2 Updating Netty versions
new 4f8ae84 Standardizing on a version of Tomcat in the parent pom
new ef23017 Updating Xerces
new 9bbe9b8 Updating Karaf
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:
parent/pom.xml | 11 ++++++-----
pom.xml | 30 ++++++++++++++++++++++++++++++
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, 36 insertions(+), 17 deletions(-)
[cxf] 02/06: CXF-7809 - Adding owasp dependency plugin checks
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 9db243c1aa44732996514200b490eb63683540b4
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Aug 13 12:34:36 2018 +0100
CXF-7809 - Adding owasp dependency plugin checks
---
pom.xml | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/pom.xml b/pom.xml
index de103ca..7c97707 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,6 +45,7 @@
<cxf.jdk.version>1.8</cxf.jdk.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<site.deploy.url>scp://people.apache.org/www/cxf.apache.org/maven-site</site.deploy.url>
+ <maven-owasp-plugin-version>3.3.1</maven-owasp-plugin-version>
</properties>
<distributionManagement>
<repository>
@@ -406,6 +407,17 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>dependencycheck</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.owasp</groupId>
+ <artifactId>dependency-check-maven</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
<build>
<defaultGoal>install</defaultGoal>
@@ -674,6 +686,19 @@
</rules>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.owasp</groupId>
+ <artifactId>dependency-check-maven</artifactId>
+ <version>${maven-owasp-plugin-version}</version>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -719,6 +744,11 @@
</reportSet>
</reportSets>
</plugin>
+ <plugin>
+ <groupId>org.owasp</groupId>
+ <artifactId>dependency-check-maven</artifactId>
+ <version>${maven-owasp-plugin-version}</version>
+ </plugin>
</plugins>
</reporting>
</project>
[cxf] 06/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 master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 9bbe9b8118909f55db394046731c1a83119497b0
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Aug 13 14:56:07 2018 +0100
Updating Karaf
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index caedeee..b935f12 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -198,7 +198,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] 03/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 master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 31494b2417798ce2309edd9bfa2b4914b0133512
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Aug 13 13:41:50 2018 +0100
Updating Netty versions
---
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 014823e..139c3f9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -138,8 +138,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] 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 master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 268350fa56ea293ff150b256882077325e436eb1
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Aug 13 11:54:49 2018 +0100
Removing duplicate dependencies
---
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 8024367..964266f 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 0433018..1263fb1 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] 05/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 master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit ef2301702553e33cce206467b0b7c7b052762474
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Aug 13 14:55:54 2018 +0100
Updating Xerces
---
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 1c8abaa..caedeee 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -174,7 +174,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>
@@ -216,7 +216,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>
[cxf] 04/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 master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 4f8ae843f56e3ef84af43ae90f507e196726f0bf
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
---
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 139c3f9..1c8abaa 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -167,6 +167,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 b391996..0ff34e5 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>
<dependencyManagement>
diff --git a/systests/rs-sse/rs-sse-tomcat/pom.xml b/systests/rs-sse/rs-sse-tomcat/pom.xml
index 5b12600..731c37e 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>