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 2019/11/06 13:08:46 UTC

[cxf] branch master updated (a9a7302 -> bef9540)

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 a9a7302  Make sure that only the client associated with a token can revoke it
     new 3e2e394  Updating Commons Text + SLF4J
     new a9375a9  Updating Spring + Spring security
     new bef9540  Remove MD5 from testcase

The 3 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                                                    | 8 ++++----
 .../java/org/apache/cxf/systest/jaxws/JaxWsDynamicClientTest.java | 8 ++++----
 .../main/java/org/apache/cxf/no_body_parts/NoBodyPartsImpl.java   | 6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)


[cxf] 03/03: Remove MD5 from testcase

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 bef95402f7281aca28cd501633c15c1856f00f80
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Nov 6 13:08:26 2019 +0000

    Remove MD5 from testcase
---
 .../java/org/apache/cxf/systest/jaxws/JaxWsDynamicClientTest.java | 8 ++++----
 .../main/java/org/apache/cxf/no_body_parts/NoBodyPartsImpl.java   | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxWsDynamicClientTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxWsDynamicClientTest.java
index d820499..b431c16 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxWsDynamicClientTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxWsDynamicClientTest.java
@@ -46,10 +46,10 @@ public class JaxWsDynamicClientTest extends AbstractBusClientServerTestBase {
     static final String PORT = TestUtil.getPortNumber(ServerNoBodyParts.class);
     static final String PORT1 = TestUtil.getPortNumber(ArrayServiceServer.class);
 
-    private String md5(byte[] bytes) {
+    private String digest(byte[] bytes) {
         MessageDigest algorithm;
         try {
-            algorithm = MessageDigest.getInstance("MD5");
+            algorithm = MessageDigest.getInstance("SHA-256");
         } catch (NoSuchAlgorithmException e) {
             throw new RuntimeException(e);
         }
@@ -85,13 +85,13 @@ public class JaxWsDynamicClientTest extends AbstractBusClientServerTestBase {
         parameters.setTargetType("tar-get");
         Object[] rparts = client.invoke("operation1", parameters, bucketOfBytes);
         Operation1Response r = (Operation1Response)rparts[0];
-        assertEquals(md5(bucketOfBytes), r.getStatus());
+        assertEquals(digest(bucketOfBytes), r.getStatus());
 
         ClientCallback callback = new ClientCallback();
         client.invoke(callback, "operation1", parameters, bucketOfBytes);
         rparts = callback.get();
         r = (Operation1Response)rparts[0];
-        assertEquals(md5(bucketOfBytes), r.getStatus());
+        assertEquals(digest(bucketOfBytes), r.getStatus());
     }
 
     @Test
diff --git a/testutils/src/main/java/org/apache/cxf/no_body_parts/NoBodyPartsImpl.java b/testutils/src/main/java/org/apache/cxf/no_body_parts/NoBodyPartsImpl.java
index 31730b3..d0b8829 100644
--- a/testutils/src/main/java/org/apache/cxf/no_body_parts/NoBodyPartsImpl.java
+++ b/testutils/src/main/java/org/apache/cxf/no_body_parts/NoBodyPartsImpl.java
@@ -36,8 +36,8 @@ import org.apache.cxf.no_body_parts.wsdl.NoBodyPartsSEI;
 @WebService(targetNamespace = "urn:org:apache:cxf:no_body_parts/wsdl")
 public class NoBodyPartsImpl implements NoBodyPartsSEI {
 
-    private String md5(byte[] bytes) throws NoSuchAlgorithmException {
-        MessageDigest algorithm = MessageDigest.getInstance("MD5");
+    private String digest(byte[] bytes) throws NoSuchAlgorithmException {
+        MessageDigest algorithm = MessageDigest.getInstance("SHA-256");
         algorithm.reset();
         algorithm.update(bytes);
         byte[] messageDigest = algorithm.digest();
@@ -53,7 +53,7 @@ public class NoBodyPartsImpl implements NoBodyPartsSEI {
     public Operation1Response operation1(Operation1 parameters, Holder<byte[]> mimeAttachment) {
         Operation1Response r = new Operation1Response();
         try {
-            r.setStatus(md5(mimeAttachment.value));
+            r.setStatus(digest(mimeAttachment.value));
         } catch (NoSuchAlgorithmException e) {
             throw new WebServiceException(e);
         }


[cxf] 02/03: Updating Spring + Spring security

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 a9375a9af000acefed9acedcc5b78ef4260c1910
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Nov 6 11:47:59 2019 +0000

    Updating Spring + Spring security
---
 parent/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 73a9735..14b0ff3 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -195,8 +195,8 @@
         <cxf.spring.ldap.version>2.3.2.RELEASE</cxf.spring.ldap.version>
         <cxf.spring.mock>spring-test</cxf.spring.mock>
         <cxf.spring.osgi.version>1.2.1</cxf.spring.osgi.version>
-        <cxf.spring.security.version>5.1.6.RELEASE</cxf.spring.security.version>
-        <cxf.spring.version>5.1.10.RELEASE</cxf.spring.version>
+        <cxf.spring.security.version>5.1.7.RELEASE</cxf.spring.security.version>
+        <cxf.spring.version>5.1.11.RELEASE</cxf.spring.version>
         <cxf.stax-ex.version>1.7.6</cxf.stax-ex.version>
         <cxf.swagger.ui.version>3.24.0</cxf.swagger.ui.version>
         <cxf.swagger.v3.version>2.0.10</cxf.swagger.v3.version>


[cxf] 01/03: Updating Commons Text + SLF4J

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 3e2e394db3edeab699a942447e03875fa5f85e1b
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Nov 6 10:52:15 2019 +0000

    Updating Commons Text + SLF4J
---
 parent/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index b2bfbdb..73a9735 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -100,7 +100,7 @@
         <cxf.commons-jcs-jcache.version>2.1</cxf.commons-jcs-jcache.version>
         <cxf.commons-lang3.version>3.9</cxf.commons-lang3.version>
         <cxf.commons-logging.version>1.2</cxf.commons-logging.version>
-        <cxf.commons-text.version>1.7</cxf.commons-text.version>
+        <cxf.commons-text.version>1.8</cxf.commons-text.version>
         <cxf.derby.version>10.14.2.0</cxf.derby.version>
         <cxf.dom4j.version>2.1.1</cxf.dom4j.version>
         <cxf.dropwizard.version>3.2.6</cxf.dropwizard.version>
@@ -188,7 +188,7 @@
         <cxf.servlet-api.artifact>javax.servlet-api</cxf.servlet-api.artifact>
         <cxf.servlet-api.group>javax.servlet</cxf.servlet-api.group>
         <cxf.servlet-api.version>3.1.0</cxf.servlet-api.version>
-        <cxf.slf4j.version>1.7.28</cxf.slf4j.version>
+        <cxf.slf4j.version>1.7.29</cxf.slf4j.version>
         <cxf.snakeyaml.version>1.24</cxf.snakeyaml.version>
         <cxf.specs.jaxws.api.version>1.2</cxf.specs.jaxws.api.version>
         <cxf.spring.boot.version>2.1.9.RELEASE</cxf.spring.boot.version>