Fixing build
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ea308478 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ea308478 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ea308478 Branch: refs/heads/3.0.x-fixes Commit: ea30847823bba4a4e2764ab580f66385329a7e85 Parents: 884c771 Author: Colm O hEigeartaigh <[email protected]> Authored: Tue Oct 13 11:41:51 2015 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Tue Oct 13 11:41:51 2015 +0100 ---------------------------------------------------------------------- rt/rs/security/jose/jose-core/pom.xml | 2 +- .../main/java/org/apache/cxf/rs/security/jose/jws/JwsUtils.java | 5 +++-- rt/rs/security/jose/jose-jaxrs/pom.xml | 2 +- rt/rs/security/jose/pom.xml | 5 ----- 4 files changed, 5 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/ea308478/rt/rs/security/jose/jose-core/pom.xml ---------------------------------------------------------------------- diff --git a/rt/rs/security/jose/jose-core/pom.xml b/rt/rs/security/jose/jose-core/pom.xml index 3903acf..3888074 100644 --- a/rt/rs/security/jose/jose-core/pom.xml +++ b/rt/rs/security/jose/jose-core/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.apache.cxf</groupId> <artifactId>cxf-parent</artifactId> - <version>3.1.4-SNAPSHOT</version> + <version>3.0.7-SNAPSHOT</version> <relativePath>../../../../../parent/pom.xml</relativePath> </parent> <dependencies> http://git-wip-us.apache.org/repos/asf/cxf/blob/ea308478/rt/rs/security/jose/jose-core/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsUtils.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/jose/jose-core/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsUtils.java b/rt/rs/security/jose/jose-core/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsUtils.java index abe1f27..ffea595 100644 --- a/rt/rs/security/jose/jose-core/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsUtils.java +++ b/rt/rs/security/jose/jose-core/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsUtils.java @@ -174,12 +174,13 @@ public final class JwsUtils { public static Map<SignatureAlgorithm, List<JwsJsonSignatureEntry>> getJwsJsonSignatureMap( List<JwsJsonSignatureEntry> signatures) { - Map<SignatureAlgorithm, List<JwsJsonSignatureEntry>> map = new HashMap<>(); + Map<SignatureAlgorithm, List<JwsJsonSignatureEntry>> map = + new HashMap<SignatureAlgorithm, List<JwsJsonSignatureEntry>>(); for (JwsJsonSignatureEntry entry : signatures) { SignatureAlgorithm sigAlgorithm = entry.getUnionHeader().getSignatureAlgorithm(); List<JwsJsonSignatureEntry> entries = map.get(sigAlgorithm); if (entries == null) { - entries = new ArrayList<>(); + entries = new ArrayList<JwsJsonSignatureEntry>(); } entries.add(entry); map.put(sigAlgorithm, entries); http://git-wip-us.apache.org/repos/asf/cxf/blob/ea308478/rt/rs/security/jose/jose-jaxrs/pom.xml ---------------------------------------------------------------------- diff --git a/rt/rs/security/jose/jose-jaxrs/pom.xml b/rt/rs/security/jose/jose-jaxrs/pom.xml index b935370..1b36cbd 100644 --- a/rt/rs/security/jose/jose-jaxrs/pom.xml +++ b/rt/rs/security/jose/jose-jaxrs/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.apache.cxf</groupId> <artifactId>cxf-parent</artifactId> - <version>3.1.4-SNAPSHOT</version> + <version>3.0.7-SNAPSHOT</version> <relativePath>../../../../../parent/pom.xml</relativePath> </parent> <dependencies> http://git-wip-us.apache.org/repos/asf/cxf/blob/ea308478/rt/rs/security/jose/pom.xml ---------------------------------------------------------------------- diff --git a/rt/rs/security/jose/pom.xml b/rt/rs/security/jose/pom.xml index c94129c..7b43429 100644 --- a/rt/rs/security/jose/pom.xml +++ b/rt/rs/security/jose/pom.xml @@ -26,14 +26,9 @@ <url>http://cxf.apache.org</url> <parent> <groupId>org.apache.cxf</groupId> -<<<<<<< HEAD <artifactId>cxf-parent</artifactId> <version>3.0.7-SNAPSHOT</version> <relativePath>../../../../parent/pom.xml</relativePath> -======= - <artifactId>cxf-rt-rs-security</artifactId> - <version>3.1.4-SNAPSHOT</version> ->>>>>>> 66a8177... Splitting current jose module into jose-core + jose-jaxrs </parent> <modules> <module>jose-core</module>
