Fixing merge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/9637e209 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9637e209 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9637e209 Branch: refs/heads/3.0.x-fixes Commit: 9637e209b9ed5df399b39fe3fc800b1b071d9353 Parents: 35a3985 Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Thu Nov 26 15:34:40 2015 +0000 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Thu Nov 26 15:34:40 2015 +0000 ---------------------------------------------------------------------- .../org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/9637e209/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java ---------------------------------------------------------------------- diff --git a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java index 3ced836..80b8437 100644 --- a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java +++ b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java @@ -166,7 +166,7 @@ public class JMSWSSecurityTest extends AbstractBusClientServerTestBase { ConditionsBean conditions = new ConditionsBean(); conditions.setTokenPeriodMinutes(5); - List<String> audiences = new ArrayList<>(); + List<String> audiences = new ArrayList<String>(); audiences.add("jms:jndi:dynamicQueues/test.jmstransport.text.bad"); AudienceRestrictionBean audienceRestrictionBean = new AudienceRestrictionBean(); audienceRestrictionBean.setAudienceURIs(audiences); @@ -208,7 +208,7 @@ public class JMSWSSecurityTest extends AbstractBusClientServerTestBase { ConditionsBean conditions = new ConditionsBean(); conditions.setTokenPeriodMinutes(5); - List<String> audiences = new ArrayList<>(); + List<String> audiences = new ArrayList<String>(); audiences.add("{http://cxf.apache.org/hello_world_jms}HelloWorldService";); AudienceRestrictionBean audienceRestrictionBean = new AudienceRestrictionBean(); audienceRestrictionBean.setAudienceURIs(audiences); @@ -246,7 +246,7 @@ public class JMSWSSecurityTest extends AbstractBusClientServerTestBase { ConditionsBean conditions = new ConditionsBean(); conditions.setTokenPeriodMinutes(5); - List<String> audiences = new ArrayList<>(); + List<String> audiences = new ArrayList<String>(); audiences.add("{http://cxf.apache.org/hello_world_jms}BadHelloWorldService";); AudienceRestrictionBean audienceRestrictionBean = new AudienceRestrictionBean(); audienceRestrictionBean.setAudienceURIs(audiences);
