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/07 18:55:19 UTC
[1/4] git commit: Revert "CXF-5565 update to opensaml 2.6.1 with
thanks to Jon"
Repository: cxf
Updated Branches:
refs/heads/2.6.x-fixes 3569c2254 -> 2a5237b38
Revert "CXF-5565 update to opensaml 2.6.1 with thanks to Jon"
This reverts commit adf55fd78c61c485accbb5f31274d68dc6b1361e.
Conflicts:
parent/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/0e61c85c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0e61c85c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0e61c85c
Branch: refs/heads/2.6.x-fixes
Commit: 0e61c85cf844d56042567d49b5db1e5c73059e11
Parents: 3569c22
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Oct 7 12:41:12 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Oct 7 12:41:12 2014 -0400
----------------------------------------------------------------------
parent/pom.xml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/0e61c85c/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 127ce56..08ad8fc 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -130,8 +130,10 @@
<cxf.msv.version>2011.1</cxf.msv.version>
<cxf.neethi.version>3.0.3</cxf.neethi.version>
<cxf.oauth.bundle.version>20100527_1</cxf.oauth.bundle.version>
- <cxf.opensaml.version>2.6.1</cxf.opensaml.version>
- <cxf.opensaml.osgi.version>2.6.1_1</cxf.opensaml.osgi.version>
+ <cxf.opensaml.version>2.5.1</cxf.opensaml.version>
+ <cxf.opensamlws.version>1.4.2-1</cxf.opensamlws.version>
+ <cxf.opensaml.osgi.version>2.5.1_2</cxf.opensaml.osgi.version>
+ <cxf.opensaml.xmltooling.version>1.3.2-1</cxf.opensaml.xmltooling.version>
<cxf.rhino.version>1.7R2</cxf.rhino.version>
<cxf.saaj-api.version>1.3.4</cxf.saaj-api.version>
<cxf.servlet-api.group>org.apache.geronimo.specs</cxf.servlet-api.group>
[3/4] git commit: SYstest/uncat compile on Java5
Posted by dk...@apache.org.
SYstest/uncat compile on Java5
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5353b61f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5353b61f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5353b61f
Branch: refs/heads/2.6.x-fixes
Commit: 5353b61f59a09361813c99e25cc0c115035c8774
Parents: 2d762c3
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Oct 7 12:45:16 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Oct 7 12:45:16 2014 -0400
----------------------------------------------------------------------
.../test/java/org/apache/cxf/systest/schemaimport/SayHiImpl.java | 2 --
.../test/java/org/apache/cxf/systest/schemaimport/ServiceImpl.java | 1 -
2 files changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/5353b61f/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/SayHiImpl.java
----------------------------------------------------------------------
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/SayHiImpl.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/SayHiImpl.java
index cb2e548..5ed5dee 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/SayHiImpl.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/SayHiImpl.java
@@ -33,7 +33,6 @@ import javax.xml.ws.ResponseWrapper;
endpointInterface = "org.apache.cxf.systest.schemaimport.SayHi")
public class SayHiImpl implements SayHi {
- @Override
@WebResult(name = "return", targetNamespace = "")
@RequestWrapper(localName = "sayHiArray",
targetNamespace = "http://apache.org/sayHi2",
@@ -48,7 +47,6 @@ public class SayHiImpl implements SayHi {
return list;
}
- @Override
@WebResult(name = "return", targetNamespace = "http://apache.org/sayHi1")
@RequestWrapper(localName = "sayHi",
targetNamespace = "http://apache.org/sayHi1",
http://git-wip-us.apache.org/repos/asf/cxf/blob/5353b61f/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/ServiceImpl.java
----------------------------------------------------------------------
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/ServiceImpl.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/ServiceImpl.java
index ec60988..744d493 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/ServiceImpl.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/ServiceImpl.java
@@ -25,7 +25,6 @@ serviceName = "service_v1",
endpointInterface = "org.apache.cxf.systest.schemaimport.ServiceV1Port")
public class ServiceImpl implements ServiceV1Port {
- @Override
public ResponseType testRequest(RequestType request) {
System.out.println(request.getRequest().getSomeMeasure());
ResponseType responseType = new ResponseType();
[2/4] git commit: Revert "CXF-5565 updated to opensaml 2.6.1"
Posted by dk...@apache.org.
Revert "CXF-5565 updated to opensaml 2.6.1"
This reverts commit ceb6b86d6e9c2f81bef7fe96856229c9d4e860fd.
Conflicts:
parent/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/2d762c3a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2d762c3a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2d762c3a
Branch: refs/heads/2.6.x-fixes
Commit: 2d762c3a76001a08698fa3ed9efe26c8edab1751
Parents: 0e61c85
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Oct 7 12:44:50 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Oct 7 12:44:50 2014 -0400
----------------------------------------------------------------------
rt/ws/security/pom.xml | 91 ---------------------------------------------
1 file changed, 91 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/2d762c3a/rt/ws/security/pom.xml
----------------------------------------------------------------------
diff --git a/rt/ws/security/pom.xml b/rt/ws/security/pom.xml
index 690289c..adbcd05 100644
--- a/rt/ws/security/pom.xml
+++ b/rt/ws/security/pom.xml
@@ -102,97 +102,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.opensaml</groupId>
- <artifactId>opensaml</artifactId>
- <version>${cxf.opensaml.version}</version>
- <exclusions>
- <exclusion>
- <groupId>velocity</groupId>
- <artifactId>velocity</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.owasp.esapi</groupId>
- <artifactId>esapi</artifactId>
- </exclusion>
- <!--exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>jul-to-slf4j</artifactId>
- </exclusion-->
- <exclusion>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-ext-jdk15</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15</artifactId>
- </exclusion>
- <exclusion>
- <groupId>ca.juliusdavies</groupId>
- <artifactId>not-yet-commons-ssl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>net.jcip</groupId>
- <artifactId>jcip-annotations</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xml-resolver</groupId>
- <artifactId>xml-resolver</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.xerces</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.xerces</groupId>
- <artifactId>serializer</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
[4/4] git commit: Revert back to jackson that supports java5
Posted by dk...@apache.org.
Revert back to jackson that supports java5
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/2a5237b3
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2a5237b3
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2a5237b3
Branch: refs/heads/2.6.x-fixes
Commit: 2a5237b383fe4229adb274133116ff7857f0c835
Parents: 5353b61
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Oct 7 12:54:14 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Oct 7 12:54:14 2014 -0400
----------------------------------------------------------------------
systests/jaxrs/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5237b3/systests/jaxrs/pom.xml
----------------------------------------------------------------------
diff --git a/systests/jaxrs/pom.xml b/systests/jaxrs/pom.xml
index cc0611e..a8215a1 100644
--- a/systests/jaxrs/pom.xml
+++ b/systests/jaxrs/pom.xml
@@ -328,7 +328,7 @@
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
- <version>2.4.1</version>
+ <version>2.1.5</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>