You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2014/10/30 20:28:50 UTC
[01/19] git commit: Go ahead and make Jetty9 the default for 3.1
Repository: cxf
Updated Branches:
refs/heads/master 89e879510 -> fb94440f6
Go ahead and make Jetty9 the default for 3.1
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/9896b920
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9896b920
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9896b920
Branch: refs/heads/master
Commit: 9896b920035a1d1be1aef28a1d1a5eb876445c82
Parents: 89e8795
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Oct 30 12:53:20 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Oct 30 12:53:20 2014 -0400
----------------------------------------------------------------------
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/9896b920/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 5897431..d33a0c9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -109,8 +109,8 @@
<cxf.jdom.version>1.0</cxf.jdom.version>
<cxf.jettison.version>1.3.6</cxf.jettison.version>
<cxf.jetty8.version>8.1.15.v20140411</cxf.jetty8.version>
- <cxf.jetty9.version>9.2.2.v20140723</cxf.jetty9.version>
- <cxf.jetty.version>${cxf.jetty8.version}</cxf.jetty.version>
+ <cxf.jetty9.version>9.2.3.v20140905</cxf.jetty9.version>
+ <cxf.jetty.version>${cxf.jetty9.version}</cxf.jetty.version>
<cxf.jetty.osgi.version>[8.1,10)</cxf.jetty.osgi.version>
<cxf.jibx.version>1.2.5</cxf.jibx.version>
<cxf.junit.version>4.11</cxf.junit.version>
[18/19] git commit: Fix some schema validation issues
Posted by dk...@apache.org.
Fix some schema validation issues
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7ad63033
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7ad63033
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7ad63033
Branch: refs/heads/master
Commit: 7ad63033224a910e45c71c7ee5ed1a91a3700958
Parents: 46f0d5f
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Oct 30 15:23:02 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Oct 30 15:23:02 2014 -0400
----------------------------------------------------------------------
.../samples/logbrowser/src/main/webapp/WEB-INF/web.xml | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/7ad63033/distribution/src/main/release/samples/logbrowser/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/logbrowser/src/main/webapp/WEB-INF/web.xml b/distribution/src/main/release/samples/logbrowser/src/main/webapp/WEB-INF/web.xml
index cd164ea..eaa0d99 100644
--- a/distribution/src/main/release/samples/logbrowser/src/main/webapp/WEB-INF/web.xml
+++ b/distribution/src/main/release/samples/logbrowser/src/main/webapp/WEB-INF/web.xml
@@ -17,10 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<servlet>
- <servlet-name>CustomerService</servlet-name>
<display-name>CustomerService</display-name>
+ <servlet-name>CustomerService</servlet-name>
<servlet-class>org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet</servlet-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
@@ -41,8 +44,8 @@
<load-on-startup>1</load-on-startup>
</servlet>
<servlet>
- <servlet-name>BrowserServlet</servlet-name>
<display-name>BrowserServlet</display-name>
+ <servlet-name>BrowserServlet</servlet-name>
<servlet-class>org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet</servlet-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
[11/19] git commit: Update swagger version
Posted by dk...@apache.org.
Update swagger version
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/695fe06e
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/695fe06e
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/695fe06e
Branch: refs/heads/master
Commit: 695fe06e20e9dbdbb271b4b18081fdcfc7bdc91d
Parents: 441cd2c
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Oct 30 13:55:05 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Oct 30 13:55:25 2014 -0400
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/695fe06e/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 57a4aeb..2439e10 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -139,7 +139,7 @@
<cxf.spring.osgi.version>1.2.1</cxf.spring.osgi.version>
<cxf.spring.ldap.version>1.3.1.RELEASE</cxf.spring.ldap.version>
<cxf.spring.mock>spring-test</cxf.spring.mock>
- <cxf.swagger.version>1.3.7</cxf.swagger.version>
+ <cxf.swagger.version>1.3.9</cxf.swagger.version>
<cxf.velocity.version>1.7</cxf.velocity.version>
<cxf.woodstox.core.version>4.4.1</cxf.woodstox.core.version>
<cxf.woodstox.stax2-api.version>3.1.4</cxf.woodstox.stax2-api.version>
[02/19] git commit: Update to latest spring releases for 3.1
Posted by dk...@apache.org.
Update to latest spring releases for 3.1
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/47b1a4ae
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/47b1a4ae
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/47b1a4ae
Branch: refs/heads/master
Commit: 47b1a4ae21cfc70cea3b48ebd2be72fd184f1370
Parents: 9896b92
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Oct 30 12:56:01 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Oct 30 12:56:01 2014 -0400
----------------------------------------------------------------------
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/47b1a4ae/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index d33a0c9..cb8ef87 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -134,8 +134,8 @@
<cxf.servlet-api-2.5.version>1.1.2</cxf.servlet-api-2.5.version>
<cxf.slf4j.version>1.7.7</cxf.slf4j.version>
<cxf.specs.jaxws.api.version>1.2</cxf.specs.jaxws.api.version>
- <cxf.spring.version>3.2.6.RELEASE</cxf.spring.version>
- <cxf.spring.security.version>3.1.4.RELEASE</cxf.spring.security.version>
+ <cxf.spring.version>4.1.1.RELEASE</cxf.spring.version>
+ <cxf.spring.security.version>3.2.5.RELEASE</cxf.spring.security.version>
<cxf.spring.osgi.version>1.2.1</cxf.spring.osgi.version>
<cxf.spring.ldap.version>1.3.1.RELEASE</cxf.spring.ldap.version>
<cxf.spring.mock>spring-test</cxf.spring.mock>
[07/19] git commit: ANother spring update
Posted by dk...@apache.org.
ANother spring update
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/222137cb
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/222137cb
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/222137cb
Branch: refs/heads/master
Commit: 222137cb2ee577e6582a644b7ae73bbc0a75d4d1
Parents: 14ab1ff
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Oct 30 13:04:24 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Oct 30 13:54:31 2014 -0400
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/222137cb/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 39b6415..2904955 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1215,7 +1215,7 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core-tiger</artifactId>
- <version>2.0.6.RELEASE</version>
+ <version>2.0.8.RELEASE</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
[09/19] git commit: Update mina version
Posted by dk...@apache.org.
Update mina version
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7431af23
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7431af23
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7431af23
Branch: refs/heads/master
Commit: 7431af236a19b5b5f899bad317a548a4c5c9cd49
Parents: f595ca0
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Oct 30 13:08:45 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Oct 30 13:54:32 2014 -0400
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/7431af23/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 136f091..ae699ec 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -91,7 +91,7 @@
<cxf.logback.classic.version>1.0.13</cxf.logback.classic.version>
<cxf.log4j.version>1.2.17</cxf.log4j.version>
<cxf.lucene.version>4.9.0</cxf.lucene.version>
- <cxf.mina.version>2.0.7</cxf.mina.version>
+ <cxf.mina.version>2.0.9</cxf.mina.version>
<cxf.javax.annotation-api.version>1.2</cxf.javax.annotation-api.version>
<cxf.geronimo.jms.version>1.1.1</cxf.geronimo.jms.version>
<cxf.geronimo.j2ee.management.version>1.0.1</cxf.geronimo.j2ee.management.version>
[16/19] git commit: Fix test failure with Jetty update.
Posted by dk...@apache.org.
Fix test failure with Jetty update.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6efe475a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6efe475a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6efe475a
Branch: refs/heads/master
Commit: 6efe475ad57f042ffc9547f1bb258ab4e16a3f3e
Parents: c1c75b0
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Oct 30 14:44:48 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Oct 30 14:44:48 2014 -0400
----------------------------------------------------------------------
.../org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/6efe475a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
----------------------------------------------------------------------
diff --git a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
index 7afd9e8..0046b75 100644
--- a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
+++ b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
@@ -24,7 +24,6 @@ import java.io.File;
import java.io.FileInputStream;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
-import java.net.ServerSocket;
import java.util.Arrays;
import java.util.List;
@@ -47,6 +46,7 @@ import org.apache.cxf.tools.wsdlto.WSDLToJava;
import org.apache.cxf.tools.wsdlto.frontend.jaxws.validator.UniqueBodyValidator;
import org.apache.cxf.wsdl11.WSDLRuntimeException;
import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.server.handler.ResourceHandler;
import org.junit.Test;
@@ -486,10 +486,7 @@ public class CodeGenBugTest extends AbstractCodeGenTest {
@Test
public void testHelloWorldExternalBindingFile() throws Exception {
- ServerSocket sock = new ServerSocket(0);
- int port = sock.getLocalPort();
- Server server = new Server(port);
- sock.close();
+ Server server = new Server(0);
ResourceHandler reshandler = new ResourceHandler();
reshandler.setResourceBase(getLocation("/wsdl2java_wsdl/"));
@@ -497,6 +494,7 @@ public class CodeGenBugTest extends AbstractCodeGenTest {
// 'add' it.
server.setHandler(reshandler);
server.start();
+ int port = ((ServerConnector)server.getConnectors()[0]).getLocalPort();
env.put(ToolConstants.CFG_WSDLURL, "http://localhost:"
+ port + "/hello_world.wsdl");
env.put(ToolConstants.CFG_BINDING, "http://localhost:"
[17/19] git commit: Fix javadoc generation with jetty update
Posted by dk...@apache.org.
Fix javadoc generation with jetty update
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/46f0d5ff
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/46f0d5ff
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/46f0d5ff
Branch: refs/heads/master
Commit: 46f0d5fff8a4d846831b5e9d7ac0405fe06d2ccd
Parents: 6efe475
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Oct 30 15:08:36 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Oct 30 15:08:36 2014 -0400
----------------------------------------------------------------------
distribution/javadoc/pom.xml | 5 -----
1 file changed, 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/46f0d5ff/distribution/javadoc/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/javadoc/pom.xml b/distribution/javadoc/pom.xml
index 20ae458..31492d8 100644
--- a/distribution/javadoc/pom.xml
+++ b/distribution/javadoc/pom.xml
@@ -279,11 +279,6 @@
<version>${cxf.jetty.version}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-websocket</artifactId>
- <version>${cxf.jetty.version}</version>
- </dependency>
- <dependency>
<groupId>org.atmosphere</groupId>
<artifactId>atmosphere-runtime</artifactId>
<version>${cxf.atmosphere.version}</version>
[14/19] git commit: Fix and eclipse warning
Posted by dk...@apache.org.
Fix and eclipse warning
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/035154fb
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/035154fb
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/035154fb
Branch: refs/heads/master
Commit: 035154fb466fb9c833804d1bc747804df9e9992b
Parents: c1c9562
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Oct 30 14:23:14 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Oct 30 14:23:14 2014 -0400
----------------------------------------------------------------------
.../org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/035154fb/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
index 0d5904d..5e7a182 100644
--- a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
+++ b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
@@ -349,12 +349,14 @@ public class JettyHTTPServerEngine
//need an error handler that won't leak information about the exception
//back to the client.
ErrorHandler eh = new ErrorHandler() {
+ @SuppressWarnings("deprecation")
public void handle(String target, Request baseRequest,
HttpServletRequest request, HttpServletResponse response)
throws IOException {
String msg = HttpStatus.getMessage(response.getStatus());
request.setAttribute(RequestDispatcher.ERROR_MESSAGE, msg);
if (response instanceof Response) {
+ //need to use the deprecated method to support compiling with Jetty 8
((Response)response).setStatus(response.getStatus(), msg);
}
super.handle(target, baseRequest, request, response);
[03/19] git commit: Update xalan version
Posted by dk...@apache.org.
Update xalan version
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/14ab1ffe
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/14ab1ffe
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/14ab1ffe
Branch: refs/heads/master
Commit: 14ab1ffe7ea74e55dfe808b9bcf744107c87bc18
Parents: 4d49814
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Oct 30 13:03:36 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Oct 30 13:54:30 2014 -0400
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/14ab1ffe/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 9b0fa29..39b6415 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -969,7 +969,7 @@
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
- <version>2.7.1</version>
+ <version>2.7.2</version>
<exclusions>
<exclusion>
<groupId>xml-apis</groupId>
[13/19] git commit: Only support maven 3+
Posted by dk...@apache.org.
Only support maven 3+
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c1c9562b
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c1c9562b
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c1c9562b
Branch: refs/heads/master
Commit: c1c9562bb13eeacdd9dae5a46c513e9e03625698
Parents: 695fe06
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Oct 30 13:05:31 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Oct 30 14:18:06 2014 -0400
----------------------------------------------------------------------
maven-plugins/codegen-plugin/pom.xml | 5 -
.../cxf/maven_plugin/AbstractCodegenMoho.java | 80 +++++---------
.../cxf/maven_plugin/ClassLoaderSwitcher.java | 1 +
maven-plugins/corba/pom.xml | 12 +--
.../corba/maven/plugins/WSDLToIDLPlugin.java | 2 +-
maven-plugins/java2wadl-plugin/pom.xml | 7 +-
.../javatowadl/ParseJavaDocMojo.java | 13 ++-
maven-plugins/java2ws-plugin/pom.xml | 10 +-
.../cxf/maven_plugin/ClassLoaderSwitcher.java | 1 +
maven-plugins/wadl2java-plugin/pom.xml | 5 -
.../common/ClassLoaderSwitcher.java | 1 +
.../wadlto/AbstractCodeGeneratorMojo.java | 107 ++++++-------------
.../cxf/maven_plugin/wadlto/OptionLoader.java | 1 -
maven-plugins/wsdl-validator-plugin/pom.xml | 5 -
parent/pom.xml | 19 ++--
15 files changed, 80 insertions(+), 189 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/c1c9562b/maven-plugins/codegen-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/codegen-plugin/pom.xml b/maven-plugins/codegen-plugin/pom.xml
index cacee8c..e19027f 100644
--- a/maven-plugins/codegen-plugin/pom.xml
+++ b/maven-plugins/codegen-plugin/pom.xml
@@ -56,11 +56,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>2.0.5</version>
http://git-wip-us.apache.org/repos/asf/cxf/blob/c1c9562b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
----------------------------------------------------------------------
diff --git a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
index 03c0a1c..33f7c10 100644
--- a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
+++ b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
@@ -43,19 +43,15 @@ import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.helpers.FileUtils;
import org.apache.maven.ProjectDependenciesResolver;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.InvalidRepositoryException;
-import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
import org.apache.maven.artifact.resolver.AbstractArtifactResolutionException;
-import org.apache.maven.artifact.resolver.ArtifactResolver;
+import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
+import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
import org.apache.maven.execution.MavenSession;
-import org.apache.maven.model.Repository;
import org.apache.maven.model.Resource;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.ProjectUtils;
+import org.apache.maven.repository.RepositorySystem;
import org.apache.maven.settings.Proxy;
import org.codehaus.plexus.archiver.jar.JarArchiver;
import org.codehaus.plexus.archiver.jar.Manifest;
@@ -186,22 +182,6 @@ public abstract class AbstractCodegenMoho extends AbstractMojo {
* @since 2.4
*/
private String additionalJvmArgs;
- /**
- * The local repository taken from Maven's runtime. Typically $HOME/.m2/repository.
- *
- * @parameter expression="${localRepository}"
- * @readonly
- * @required
- */
- private ArtifactRepository localRepository;
- /**
- * Artifact factory, needed to create artifacts.
- *
- * @component
- * @readonly
- * @required
- */
- private ArtifactFactory artifactFactory;
/**
* Sets the Java executable to use when fork parameter is <code>true</code>.
@@ -210,42 +190,35 @@ public abstract class AbstractCodegenMoho extends AbstractMojo {
* @since 2.4
*/
private String javaExecutable;
+
/**
- * The remote repositories used as specified in your POM.
+ * The Maven session.
*
- * @parameter expression="${project.repositories}"
+ * @parameter expression="${session}"
* @readonly
* @required
*/
- private List<Repository> repositories;
+ private MavenSession mavenSession;
/**
- * Artifact repository factory component.
- *
* @component
* @readonly
* @required
*/
- private ArtifactRepositoryFactory artifactRepositoryFactory;
+ private ProjectDependenciesResolver projectDependencyResolver;
+
/**
- * The Maven session.
- *
- * @parameter expression="${session}"
+ * @component
* @readonly
* @required
*/
- private MavenSession mavenSession;
+ private RepositorySystem repositorySystem;
+
/**
* @component
* @readonly
* @required
*/
- private ProjectDependenciesResolver projectDependencyResolver;
- /**
- * @component
- * @readonly
- * @required
- */
- private ArtifactResolver artifactResolver;
+ private MavenSession session;
public AbstractCodegenMoho() {
@@ -817,7 +790,7 @@ public abstract class AbstractCodegenMoho extends AbstractMojo {
if (wsdlA == null) {
continue;
}
- Artifact wsdlArtifact = artifactFactory.createArtifactWithClassifier(wsdlA.getGroupId(),
+ Artifact wsdlArtifact = repositorySystem.createArtifactWithClassifier(wsdlA.getGroupId(),
wsdlA.getArtifactId(),
wsdlA.getVersion(),
wsdlA.getType(),
@@ -880,7 +853,7 @@ public abstract class AbstractCodegenMoho extends AbstractMojo {
}
private Artifact resolveAttachedWsdl(Artifact artifact) {
- List<MavenProject> rProjects = mavenSession.getSortedProjects();
+ List<MavenProject> rProjects = mavenSession.getProjects();
List<Artifact> artifactList = new ArrayList<Artifact>();
for (MavenProject rProject : rProjects) {
List<Artifact> list = CastUtils.cast(rProject.getAttachedArtifacts());
@@ -892,18 +865,17 @@ public abstract class AbstractCodegenMoho extends AbstractMojo {
}
private Artifact resolveArbitraryWsdl(Artifact artifact) {
- try {
- @SuppressWarnings("rawtypes")
- List remoteRepos = ProjectUtils.buildArtifactRepositories(repositories,
- artifactRepositoryFactory,
- mavenSession.getContainer());
- artifactResolver.resolve(artifact, remoteRepos, localRepository);
- } catch (InvalidRepositoryException e) {
- getLog().info("Error build repositories for remote wsdls.", e);
- } catch (AbstractArtifactResolutionException e) {
- getLog().info("Error resolving arbitrary wsdl artifact.", e);
- }
- return artifact;
+ ArtifactResolutionRequest request = new ArtifactResolutionRequest();
+ request.setArtifact(artifact);
+ request.setResolveRoot(true).setResolveTransitively(false);
+ request.setServers(session.getRequest().getServers());
+ request.setMirrors(session.getRequest().getMirrors());
+ request.setProxies(session.getRequest().getProxies());
+ request.setLocalRepository(session.getLocalRepository());
+ request.setRemoteRepositories(session.getRequest().getRemoteRepositories());
+ ArtifactResolutionResult result = repositorySystem.resolve(request);
+
+ return result.getOriginatingArtifact();
}
private Artifact findWsdlArtifact(Artifact targetArtifact, Collection<Artifact> artifactSet) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/c1c9562b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
----------------------------------------------------------------------
diff --git a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
index b6fff97..a8a3fae 100644
--- a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
+++ b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
@@ -82,6 +82,7 @@ public class ClassLoaderSwitcher {
ret.add(new File(project.getBuild().getOutputDirectory()).toURI());
buf.append(File.pathSeparatorChar);
}
+ @SuppressWarnings("deprecation")
List<?> artifacts = useCompileClasspath ? project.getCompileArtifacts() : project.getTestArtifacts();
for (Artifact a : CastUtils.cast(artifacts, Artifact.class)) {
try {
http://git-wip-us.apache.org/repos/asf/cxf/blob/c1c9562b/maven-plugins/corba/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/corba/pom.xml b/maven-plugins/corba/pom.xml
index be947ab..bf21633 100644
--- a/maven-plugins/corba/pom.xml
+++ b/maven-plugins/corba/pom.xml
@@ -49,18 +49,12 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
+ <artifactId>maven-core</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
+ <artifactId>maven-plugin-api</artifactId>
<scope>compile</scope>
<exclusions>
<exclusion>
http://git-wip-us.apache.org/repos/asf/cxf/blob/c1c9562b/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java
----------------------------------------------------------------------
diff --git a/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java b/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java
index cad3894..efa047d 100644
--- a/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java
+++ b/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java
@@ -31,7 +31,6 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.common.classloader.ClassLoaderUtils;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.tools.corba.WSDLToIDL;
-
import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
@@ -96,6 +95,7 @@ public class WSDLToIDLPlugin extends AbstractMojo {
buf.append(File.pathSeparatorChar);
+ @SuppressWarnings("deprecation")
List<?> artifacts = useCompileClasspath ? project.getCompileArtifacts() : project.getTestArtifacts();
for (Artifact a : CastUtils.cast(artifacts, Artifact.class)) {
try {
http://git-wip-us.apache.org/repos/asf/cxf/blob/c1c9562b/maven-plugins/java2wadl-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/java2wadl-plugin/pom.xml b/maven-plugins/java2wadl-plugin/pom.xml
index 88767ed..ea02b34 100644
--- a/maven-plugins/java2wadl-plugin/pom.xml
+++ b/maven-plugins/java2wadl-plugin/pom.xml
@@ -55,17 +55,16 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- <scope>provided</scope>
+ <artifactId>maven-compat</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
+ <artifactId>maven-artifact</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
+ <artifactId>maven-plugin-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/cxf/blob/c1c9562b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java
----------------------------------------------------------------------
diff --git a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java
index a8fa254..9dd47f6 100644
--- a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java
+++ b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java
@@ -24,8 +24,6 @@ import java.util.List;
import java.util.Locale;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.plugin.MojoExecutionException;
@@ -33,9 +31,7 @@ import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugin.javadoc.AbstractJavadocMojo;
import org.apache.maven.plugin.javadoc.options.DocletArtifact;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.reporting.MavenReportException;
-
import org.apache.maven.toolchain.ToolchainManager;
import org.codehaus.plexus.archiver.manager.ArchiverManager;
@@ -61,7 +57,8 @@ public class ParseJavaDocMojo extends AbstractJavadocMojo {
/**
* @component
*/
- private ArtifactFactory mavenArtifactFactory;
+ @SuppressWarnings("deprecation")
+ private org.apache.maven.artifact.factory.ArtifactFactory mavenArtifactFactory;
/**
* @component
@@ -71,12 +68,14 @@ public class ParseJavaDocMojo extends AbstractJavadocMojo {
/**
* @component
*/
- private MavenProjectBuilder mavenProjectBuilder;
+ @SuppressWarnings("deprecation")
+ private org.apache.maven.project.MavenProjectBuilder mavenProjectBuilder;
/**
* @component
*/
- private ArtifactMetadataSource artifactMetadataSource;
+ @SuppressWarnings("deprecation")
+ private org.apache.maven.artifact.metadata.ArtifactMetadataSource artifactMetadataSource;
/**
* @component
http://git-wip-us.apache.org/repos/asf/cxf/blob/c1c9562b/maven-plugins/java2ws-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/java2ws-plugin/pom.xml b/maven-plugins/java2ws-plugin/pom.xml
index e6ced8f..73c8ede 100644
--- a/maven-plugins/java2ws-plugin/pom.xml
+++ b/maven-plugins/java2ws-plugin/pom.xml
@@ -42,18 +42,12 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
+ <artifactId>maven-artifact</artifactId>
<scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
+ <artifactId>maven-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/cxf/blob/c1c9562b/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
----------------------------------------------------------------------
diff --git a/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java b/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
index 0f8ca2c..d411616 100644
--- a/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
+++ b/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
@@ -76,6 +76,7 @@ public class ClassLoaderSwitcher {
}
buf.append(File.pathSeparatorChar);
+ @SuppressWarnings("deprecation")
List<?> artifacts = useCompileClasspath ? project.getCompileArtifacts() : project.getTestArtifacts();
for (Artifact a : CastUtils.cast(artifacts, Artifact.class)) {
try {
http://git-wip-us.apache.org/repos/asf/cxf/blob/c1c9562b/maven-plugins/wadl2java-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/wadl2java-plugin/pom.xml b/maven-plugins/wadl2java-plugin/pom.xml
index 81f3dfd..ec501f3 100644
--- a/maven-plugins/wadl2java-plugin/pom.xml
+++ b/maven-plugins/wadl2java-plugin/pom.xml
@@ -56,11 +56,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>2.0.5</version>
http://git-wip-us.apache.org/repos/asf/cxf/blob/c1c9562b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/ClassLoaderSwitcher.java
----------------------------------------------------------------------
diff --git a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/ClassLoaderSwitcher.java b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/ClassLoaderSwitcher.java
index 21b13ef..9485fbd 100644
--- a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/ClassLoaderSwitcher.java
+++ b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/ClassLoaderSwitcher.java
@@ -84,6 +84,7 @@ public class ClassLoaderSwitcher {
ret.add(new File(project.getBuild().getOutputDirectory()).toURI());
buf.append(File.pathSeparatorChar);
}
+ @SuppressWarnings("deprecation")
List<?> artifacts = useCompileClasspath ? project.getCompileArtifacts() : project.getTestArtifacts();
for (Artifact a : CastUtils.cast(artifacts, Artifact.class)) {
try {
http://git-wip-us.apache.org/repos/asf/cxf/blob/c1c9562b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java
----------------------------------------------------------------------
diff --git a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java
index 9b06164..fe5454d 100644
--- a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java
+++ b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java
@@ -41,19 +41,14 @@ import org.apache.cxf.maven_plugin.common.ForkOnceCodeGenerator;
import org.apache.cxf.tools.common.ToolContext;
import org.apache.cxf.tools.wadlto.WADLToJava;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.InvalidRepositoryException;
-import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
-import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
-import org.apache.maven.artifact.resolver.ArtifactResolutionException;
-import org.apache.maven.artifact.resolver.ArtifactResolver;
+import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
+import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Resource;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.ProjectUtils;
+import org.apache.maven.repository.RepositorySystem;
import org.codehaus.plexus.archiver.jar.JarArchiver;
import org.codehaus.plexus.archiver.jar.Manifest;
import org.codehaus.plexus.archiver.jar.Manifest.Attribute;
@@ -159,42 +154,6 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
String fork;
/**
- * The local repository taken from Maven's runtime. Typically $HOME/.m2/repository.
- *
- * @parameter expression="${localRepository}"
- * @readonly
- * @required
- */
- private ArtifactRepository localRepository;
-
- /**
- * Artifact factory, needed to create artifacts.
- *
- * @component
- * @readonly
- * @required
- */
- private ArtifactFactory artifactFactory;
-
- /**
- * The remote repositories used as specified in your POM.
- *
- * @parameter expression="${project.repositories}"
- * @readonly
- * @required
- */
- private List<?> repositories;
-
- /**
- * Artifact repository factory component.
- *
- * @component
- * @readonly
- * @required
- */
- private ArtifactRepositoryFactory artifactRepositoryFactory;
-
- /**
* The Maven session.
*
* @parameter expression="${session}"
@@ -204,13 +163,6 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
private MavenSession mavenSession;
/**
- * @component
- * @readonly
- * @required
- */
- private ArtifactResolver artifactResolver;
-
- /**
* The plugin dependencies, needed for the fork mode.
*
* @parameter expression="${plugin.artifacts}"
@@ -236,6 +188,14 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
*/
private String additionalJvmArgs;
+ /**
+ * @component
+ * @readonly
+ * @required
+ */
+ private RepositorySystem repositorySystem;
+
+
private ClassLoader resourceClassLoader;
/**
@@ -245,15 +205,14 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
* @param options
*/
- @SuppressWarnings("unchecked")
- private Artifact resolveRemoteWadlArtifact(List<?> remoteRepos, Artifact artifact)
+ private Artifact resolveRemoteWadlArtifact(Artifact artifact)
throws MojoExecutionException {
/**
* First try to find the artifact in the reactor projects of the maven session.
* So an artifact that is not yet built can be resolved
*/
- List<MavenProject> rProjects = mavenSession.getSortedProjects();
+ List<MavenProject> rProjects = mavenSession.getProjects();
for (MavenProject rProject : rProjects) {
if (artifact.getGroupId().equals(rProject.getGroupId())
&& artifact.getArtifactId().equals(rProject.getArtifactId())
@@ -267,38 +226,32 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
}
}
- /**
- * If this did not work resolve the artifact using the artifactResolver
- */
- try {
- artifactResolver.resolve(artifact, remoteRepos, localRepository);
- } catch (ArtifactResolutionException e) {
- throw new MojoExecutionException("Error downloading wadl artifact.", e);
- } catch (ArtifactNotFoundException e) {
- throw new MojoExecutionException("Resource can not be found.", e);
- }
-
- return artifact;
+ ArtifactResolutionRequest request = new ArtifactResolutionRequest();
+ request.setArtifact(artifact);
+ request.setResolveRoot(true).setResolveTransitively(false);
+ request.setServers(mavenSession.getRequest().getServers());
+ request.setMirrors(mavenSession.getRequest().getMirrors());
+ request.setProxies(mavenSession.getRequest().getProxies());
+ request.setLocalRepository(mavenSession.getLocalRepository());
+ request.setRemoteRepositories(mavenSession.getRequest().getRemoteRepositories());
+ ArtifactResolutionResult result = repositorySystem.resolve(request);
+
+ return result.getOriginatingArtifact();
}
protected void downloadRemoteDocs(List<WadlOption> effectiveOptions) throws MojoExecutionException {
- List<?> remoteRepos;
- try {
- remoteRepos = ProjectUtils.buildArtifactRepositories(repositories, artifactRepositoryFactory,
- mavenSession.getContainer());
- } catch (InvalidRepositoryException e) {
- throw new MojoExecutionException("Error build repositories for remote wadls", e);
- }
for (WadlOption option : effectiveOptions) {
DocumentArtifact wadlA = option.getWadlArtifact();
if (wadlA == null) {
return;
}
- Artifact wadlArtifact = artifactFactory.createArtifact(wadlA.getGroupId(), wadlA.getArtifactId(),
- wadlA.getVersion(),
- Artifact.SCOPE_COMPILE, wadlA.getType());
- wadlArtifact = resolveRemoteWadlArtifact(remoteRepos, wadlArtifact);
+ Artifact wadlArtifact = repositorySystem.createArtifact(wadlA.getGroupId(),
+ wadlA.getArtifactId(),
+ wadlA.getVersion(),
+ wadlA.getType());
+
+ wadlArtifact = resolveRemoteWadlArtifact(wadlArtifact);
if (wadlArtifact != null) {
String path = wadlArtifact.getFile().getAbsolutePath();
getLog().info("Resolved WADL artifact to file " + path);
http://git-wip-us.apache.org/repos/asf/cxf/blob/c1c9562b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/OptionLoader.java
----------------------------------------------------------------------
diff --git a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/OptionLoader.java b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/OptionLoader.java
index c94e7af..b789eb2 100644
--- a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/OptionLoader.java
+++ b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/OptionLoader.java
@@ -41,7 +41,6 @@ public final class OptionLoader {
private OptionLoader() {
}
- @SuppressWarnings("unchecked")
public static List<WadlOption> loadWsdlOptionsFromDependencies(MavenProject project,
Option defaultOptions, File outputDir) {
List<WadlOption> options = new ArrayList<WadlOption>();
http://git-wip-us.apache.org/repos/asf/cxf/blob/c1c9562b/maven-plugins/wsdl-validator-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/wsdl-validator-plugin/pom.xml b/maven-plugins/wsdl-validator-plugin/pom.xml
index 77a8930..12658aa 100644
--- a/maven-plugins/wsdl-validator-plugin/pom.xml
+++ b/maven-plugins/wsdl-validator-plugin/pom.xml
@@ -42,11 +42,6 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/cxf/blob/c1c9562b/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 2439e10..2c7f787 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -114,7 +114,7 @@
<cxf.jetty.osgi.version>[8.1,10)</cxf.jetty.osgi.version>
<cxf.jibx.version>1.2.5</cxf.jibx.version>
<cxf.junit.version>4.11</cxf.junit.version>
- <cxf.maven.core.version>2.2.1</cxf.maven.core.version>
+ <cxf.maven.core.version>3.0.5</cxf.maven.core.version>
<cxf.msv.version>2013.6.1</cxf.msv.version>
<cxf.neethi.version>3.0.3</cxf.neethi.version>
<cxf.netty.version>4.0.19.Final</cxf.netty.version>
@@ -697,6 +697,11 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven-compat</artifactId>
+ <version>${cxf.maven.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>${cxf.maven.core.version}</version>
<scope>provided</scope>
@@ -752,18 +757,6 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- <version>${cxf.maven.core.version}</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<scope>provided</scope>
<version>${cxf.maven.core.version}</version>
[10/19] git commit: Update xmlschema version
Posted by dk...@apache.org.
Update xmlschema version
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f595ca02
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f595ca02
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f595ca02
Branch: refs/heads/master
Commit: f595ca026d56ec5e58a38780677598d8f9d9ded5
Parents: 8ac2d47
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Oct 30 13:07:50 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Oct 30 13:54:32 2014 -0400
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/f595ca02/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index cbdd631..136f091 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -147,7 +147,7 @@
<cxf.wss4j.version>2.0.2</cxf.wss4j.version>
<cxf.xerces.version>2.11.0</cxf.xerces.version>
<cxf.xmlbeans.version>2.6.0</cxf.xmlbeans.version>
- <cxf.xmlschema.version>2.1.0</cxf.xmlschema.version>
+ <cxf.xmlschema.version>2.2.0</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>
<cxf.cdi.api.version>1.1</cxf.cdi.api.version>
[19/19] git commit: Fix samples compiling with Jetty9
Posted by dk...@apache.org.
Fix samples compiling with Jetty9
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/fb94440f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/fb94440f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/fb94440f
Branch: refs/heads/master
Commit: fb94440f6f1d5c7c572b6c0163f275c95073b8ee
Parents: 7ad6303
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Oct 30 15:26:33 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Oct 30 15:26:33 2014 -0400
----------------------------------------------------------------------
.../src/main/java/demo/spring/servlet/Server.java | 8 +-------
.../src/main/java/demo/spring/service/Server.java | 8 +-------
.../src/main/java/demo/jaxrs/servlet/Server.java | 8 +-------
.../logbrowser/src/main/java/demo/service/Server.java | 7 +------
.../src/main/java/demo/spring/service/Server.java | 8 +-------
5 files changed, 5 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/fb94440f/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/servlet/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/servlet/Server.java b/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/servlet/Server.java
index e3f0ff9..d50ee8c 100644
--- a/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/servlet/Server.java
+++ b/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/servlet/Server.java
@@ -18,11 +18,9 @@
*/
package demo.spring.servlet;
-import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.handler.DefaultHandler;
import org.eclipse.jetty.server.handler.HandlerCollection;
-import org.eclipse.jetty.server.nio.SelectChannelConnector;
import org.eclipse.jetty.webapp.WebAppContext;
public class Server {
@@ -37,11 +35,7 @@ public class Server {
* as a convenience so you do not need to configure your servlet
* container to see CXF in action!
*/
- org.eclipse.jetty.server.Server server = new org.eclipse.jetty.server.Server();
-
- SelectChannelConnector connector = new SelectChannelConnector();
- connector.setPort(9002);
- server.setConnectors(new Connector[] {connector});
+ org.eclipse.jetty.server.Server server = new org.eclipse.jetty.server.Server(9002);
WebAppContext webappcontext = new WebAppContext();
webappcontext.setContextPath("/");
http://git-wip-us.apache.org/repos/asf/cxf/blob/fb94440f/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/service/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/service/Server.java b/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/service/Server.java
index aa5c34e..d661f67 100644
--- a/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/service/Server.java
+++ b/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/service/Server.java
@@ -18,11 +18,9 @@
*/
package demo.spring.service;
-import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.handler.DefaultHandler;
import org.eclipse.jetty.server.handler.HandlerCollection;
-import org.eclipse.jetty.server.nio.SelectChannelConnector;
import org.eclipse.jetty.webapp.WebAppContext;
public class Server {
@@ -37,11 +35,7 @@ public class Server {
* as a convenience so you do not need to configure your servlet
* container to see CXF in action!
*/
- org.eclipse.jetty.server.Server server = new org.eclipse.jetty.server.Server();
-
- SelectChannelConnector connector = new SelectChannelConnector();
- connector.setPort(9002);
- server.setConnectors(new Connector[] {connector});
+ org.eclipse.jetty.server.Server server = new org.eclipse.jetty.server.Server(9002);
WebAppContext webappcontext = new WebAppContext();
webappcontext.setContextPath("/");
http://git-wip-us.apache.org/repos/asf/cxf/blob/fb94440f/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/servlet/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/servlet/Server.java b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/servlet/Server.java
index c8808f3..98eab1b 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/servlet/Server.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/servlet/Server.java
@@ -18,11 +18,9 @@
*/
package demo.jaxrs.servlet;
-import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.handler.DefaultHandler;
import org.eclipse.jetty.server.handler.HandlerCollection;
-import org.eclipse.jetty.server.nio.SelectChannelConnector;
import org.eclipse.jetty.webapp.WebAppContext;
public class Server {
@@ -37,11 +35,7 @@ public class Server {
* as a convenience so you do not need to configure your servlet
* container to see CXF in action!
*/
- org.eclipse.jetty.server.Server server = new org.eclipse.jetty.server.Server();
-
- SelectChannelConnector connector = new SelectChannelConnector();
- connector.setPort(9002);
- server.setConnectors(new Connector[] {connector});
+ org.eclipse.jetty.server.Server server = new org.eclipse.jetty.server.Server(9002);
WebAppContext webappcontext = new WebAppContext();
webappcontext.setContextPath("/");
http://git-wip-us.apache.org/repos/asf/cxf/blob/fb94440f/distribution/src/main/release/samples/logbrowser/src/main/java/demo/service/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/logbrowser/src/main/java/demo/service/Server.java b/distribution/src/main/release/samples/logbrowser/src/main/java/demo/service/Server.java
index 53aed96..e5b2fed 100644
--- a/distribution/src/main/release/samples/logbrowser/src/main/java/demo/service/Server.java
+++ b/distribution/src/main/release/samples/logbrowser/src/main/java/demo/service/Server.java
@@ -19,11 +19,9 @@
package demo.service;
-import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.handler.DefaultHandler;
import org.eclipse.jetty.server.handler.HandlerCollection;
-import org.eclipse.jetty.server.nio.SelectChannelConnector;
import org.eclipse.jetty.webapp.WebAppContext;
public class Server {
@@ -38,11 +36,8 @@ public class Server {
* as a convenience so you do not need to configure your servlet
* container to see CXF in action!
*/
- org.eclipse.jetty.server.Server server = new org.eclipse.jetty.server.Server();
+ org.eclipse.jetty.server.Server server = new org.eclipse.jetty.server.Server(9002);
- SelectChannelConnector connector = new SelectChannelConnector();
- connector.setPort(9002);
- server.setConnectors(new Connector[] {connector});
WebAppContext webappcontext = new WebAppContext();
webappcontext.setContextPath("/");
http://git-wip-us.apache.org/repos/asf/cxf/blob/fb94440f/distribution/src/main/release/samples/ruby_spring_support/src/main/java/demo/spring/service/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/ruby_spring_support/src/main/java/demo/spring/service/Server.java b/distribution/src/main/release/samples/ruby_spring_support/src/main/java/demo/spring/service/Server.java
index b17cdf9..dda52fc 100644
--- a/distribution/src/main/release/samples/ruby_spring_support/src/main/java/demo/spring/service/Server.java
+++ b/distribution/src/main/release/samples/ruby_spring_support/src/main/java/demo/spring/service/Server.java
@@ -18,11 +18,9 @@
*/
package demo.spring.service;
-import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.handler.DefaultHandler;
import org.eclipse.jetty.server.handler.HandlerCollection;
-import org.eclipse.jetty.server.nio.SelectChannelConnector;
import org.eclipse.jetty.webapp.WebAppContext;
public class Server {
@@ -37,11 +35,7 @@ public class Server {
* as a convenience so you do not need to configure your servlet
* container to see CXF in action!
*/
- org.eclipse.jetty.server.Server server = new org.eclipse.jetty.server.Server();
-
- SelectChannelConnector connector = new SelectChannelConnector();
- connector.setPort(9002);
- server.setConnectors(new Connector[] {connector});
+ org.eclipse.jetty.server.Server server = new org.eclipse.jetty.server.Server(9002);
WebAppContext webappcontext = new WebAppContext();
webappcontext.setContextPath("/");
[06/19] git commit: Update easymock
Posted by dk...@apache.org.
Update easymock
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5a72bd25
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5a72bd25
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5a72bd25
Branch: refs/heads/master
Commit: 5a72bd25e71f5e8c299aabbd56c449a0d61a5cf2
Parents: 222137c
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Oct 30 13:04:35 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Oct 30 13:54:31 2014 -0400
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/5a72bd25/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 2904955..6f1fe77 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1332,7 +1332,7 @@
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>3.1</version>
+ <version>3.2</version>
<scope>test</scope>
</dependency>
<dependency>
[15/19] git commit: Remove the keepRuntimeFolder call again
Posted by dk...@apache.org.
Remove the keepRuntimeFolder call again
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c1c75b03
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c1c75b03
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c1c75b03
Branch: refs/heads/master
Commit: c1c75b039df7bd1ca9f11ff21f16593fed0c8c16
Parents: 035154f
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Oct 30 14:33:14 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Oct 30 14:33:14 2014 -0400
----------------------------------------------------------------------
.../test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/c1c75b03/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
----------------------------------------------------------------------
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
index 6efd826..85f2b7d 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
@@ -67,7 +67,6 @@ import static org.ops4j.pax.exam.CoreOptions.when;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.features;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDistributionConfiguration;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.keepRuntimeFolder;
/**
*
@@ -137,7 +136,8 @@ public class CXFOSGiTestSupport {
.name("Apache Karaf")
.useDeployFolder(false)
.unpackDirectory(new File("target/paxexam/")),
- keepRuntimeFolder(),
+ //DO NOT COMMIT WITH THIS LINE ENABLED!!!
+ //org.ops4j.pax.exam.karaf.options.KarafDistributionOption.keepRuntimeFolder(),
features(cxfUrl, "cxf-core", "cxf-jaxws", "cxf-jaxrs"),
systemProperty("java.awt.headless").value("true"),
when(testUtils).useOptions(mavenBundle()
[05/19] git commit: Update asyncclient
Posted by dk...@apache.org.
Update asyncclient
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/85b22ef4
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/85b22ef4
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/85b22ef4
Branch: refs/heads/master
Commit: 85b22ef4cea752797419bbed049954c9e466ba05
Parents: 5a72bd2
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Oct 30 13:06:44 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Oct 30 13:54:31 2014 -0400
----------------------------------------------------------------------
parent/pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/85b22ef4/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 6f1fe77..93878f2 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -82,10 +82,10 @@
<cxf.ehcache.version>2.8.3</cxf.ehcache.version>
<cxf.fastinfoset.bundle.version>1.2.13_1</cxf.fastinfoset.bundle.version>
<cxf.hazelcast.version>1.9.4</cxf.hazelcast.version>
- <cxf.httpcomponents.asyncclient.version>4.0.1</cxf.httpcomponents.asyncclient.version>
+ <cxf.httpcomponents.asyncclient.version>4.0.2</cxf.httpcomponents.asyncclient.version>
<cxf.httpcomponents.asyncclient.version.range>[4.0,4.1)</cxf.httpcomponents.asyncclient.version.range>
- <cxf.httpcomponents.client.version>4.3.3</cxf.httpcomponents.client.version>
- <cxf.httpcomponents.core.version>4.3.2</cxf.httpcomponents.core.version>
+ <cxf.httpcomponents.client.version>4.3.5</cxf.httpcomponents.client.version>
+ <cxf.httpcomponents.core.version>4.3.3</cxf.httpcomponents.core.version>
<cxf.httpcomponents.core.version.range>[4.3,4.4.0)</cxf.httpcomponents.core.version.range>
<cxf.james.mim4j.version>0.7.2</cxf.james.mim4j.version>
<cxf.logback.classic.version>1.0.13</cxf.logback.classic.version>
[12/19] git commit: Update activemq version to latest
Posted by dk...@apache.org.
Update activemq version to latest
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/441cd2ce
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/441cd2ce
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/441cd2ce
Branch: refs/heads/master
Commit: 441cd2cecdd8a88d42e41324643f06a2fccf5a25
Parents: 7431af2
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Oct 30 13:54:48 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Oct 30 13:55:25 2014 -0400
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/441cd2ce/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index ae699ec..57a4aeb 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -67,7 +67,7 @@
<cxf.osgi.javax.xml.ws.version>[0.0,3)</cxf.osgi.javax.xml.ws.version>
<!-- please maintain alphabetical order here -->
<cxf.abdera.version>1.1.3</cxf.abdera.version>
- <cxf.activemq.version>5.9.1</cxf.activemq.version>
+ <cxf.activemq.version>5.10.0</cxf.activemq.version>
<cxf.ahc.version>1.8.5</cxf.ahc.version>
<cxf.atmosphere.version>2.2.0</cxf.atmosphere.version>
<cxf.atmosphere.version.range>[2.0,3.0)</cxf.atmosphere.version.range>
[04/19] git commit: Update commons-logging version
Posted by dk...@apache.org.
Update commons-logging version
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4d49814b
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4d49814b
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4d49814b
Branch: refs/heads/master
Commit: 4d49814ba85310599ee76e41742208383f3f6450
Parents: 47b1a4a
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Oct 30 12:58:51 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Oct 30 13:54:30 2014 -0400
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/4d49814b/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index cb8ef87..9b0fa29 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1309,7 +1309,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
+ <version>1.2</version>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
[08/19] git commit: Update msv version
Posted by dk...@apache.org.
Update msv version
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8ac2d473
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8ac2d473
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8ac2d473
Branch: refs/heads/master
Commit: 8ac2d4735a9254820ffdb5638f441c4dc051354e
Parents: 85b22ef
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Oct 30 13:07:12 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Oct 30 13:54:31 2014 -0400
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/8ac2d473/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 93878f2..cbdd631 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -115,7 +115,7 @@
<cxf.jibx.version>1.2.5</cxf.jibx.version>
<cxf.junit.version>4.11</cxf.junit.version>
<cxf.maven.core.version>2.2.1</cxf.maven.core.version>
- <cxf.msv.version>2011.1</cxf.msv.version>
+ <cxf.msv.version>2013.6.1</cxf.msv.version>
<cxf.neethi.version>3.0.3</cxf.neethi.version>
<cxf.netty.version>4.0.19.Final</cxf.netty.version>
<cxf.netty3.version>3.9.1.Final</cxf.netty3.version>