cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject cxf git commit: Fixing 3.1.x build failure
Date Tue, 19 Jul 2016 13:57:42 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes da47bede9 -> 1da129395


Fixing 3.1.x build failure


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/1da12939
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1da12939
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1da12939

Branch: refs/heads/3.1.x-fixes
Commit: 1da1293953e95d756406d8eab9c99a2de459c1ab
Parents: da47bed
Author: Sergey Beryozkin <sberyozkin@gmail.com>
Authored: Tue Jul 19 16:57:18 2016 +0300
Committer: Sergey Beryozkin <sberyozkin@gmail.com>
Committed: Tue Jul 19 16:57:18 2016 +0300

----------------------------------------------------------------------
 .../java/org/apache/cxf/rs/security/jose/jwe/JweHeaders.java     | 2 +-
 .../java/org/apache/cxf/rs/security/jose/jws/JwsHeaders.java     | 2 +-
 .../org/apache/cxf/rs/security/jose/jwe/JweJsonConsumerTest.java | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/1da12939/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweHeaders.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweHeaders.java
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweHeaders.java
index 34266f6..c5f564b 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweHeaders.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweHeaders.java
@@ -50,7 +50,7 @@ public class JweHeaders extends JoseHeaders {
         super(values);
     }
     public JweHeaders(String kid) {
-        this(Collections.singletonMap(JoseConstants.HEADER_KEY_ID, kid));
+        this(Collections.<String, Object>singletonMap(JoseConstants.HEADER_KEY_ID,
kid));
     }
     public JweHeaders(KeyAlgorithm keyEncAlgo, ContentAlgorithm ctEncAlgo) {
         this(keyEncAlgo, ctEncAlgo, false);

http://git-wip-us.apache.org/repos/asf/cxf/blob/1da12939/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsHeaders.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsHeaders.java
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsHeaders.java
index 322c95b..82eed57 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsHeaders.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsHeaders.java
@@ -44,7 +44,7 @@ public class JwsHeaders extends JoseHeaders {
         super(values);
     }
     public JwsHeaders(String kid) {
-        this(Collections.singletonMap(JoseConstants.HEADER_KEY_ID, kid));
+        this(Collections.<String, Object>singletonMap(JoseConstants.HEADER_KEY_ID,
kid));
     }
     public JwsHeaders(SignatureAlgorithm sigAlgo) {
         init(sigAlgo);

http://git-wip-us.apache.org/repos/asf/cxf/blob/1da12939/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumerTest.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumerTest.java
b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumerTest.java
index 38c610d..f8c3026 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumerTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumerTest.java
@@ -143,13 +143,13 @@ public class JweJsonConsumerTest extends Assert {
         // Recipient 1
         JweDecryptionProvider jwe1 = JweUtils.createJweDecryptionProvider(wrapperKey1, keyAlgo,
ctAlgo);
         JweDecryptionOutput out1 = consumer.decryptWith(jwe1,
-                                                        Collections.singletonMap("kid", "key1"));
+                                                        Collections.<String, Object>singletonMap("kid",
"key1"));
         assertEquals(text, out1.getContentText());
         // Recipient 2
         JweDecryptionProvider jwe2 = JweUtils.createJweDecryptionProvider(wrapperKey2, keyAlgo,
ctAlgo);
         
         JweDecryptionOutput out2 = consumer.decryptWith(jwe2,
-                                                        Collections.singletonMap("kid", "key2"));
+                                                        Collections.<String, Object>singletonMap("kid",
"key2"));
         assertEquals(text, out2.getContentText());
         
         // Extra AAD


Mime
View raw message