Return-Path: 
 <commits-return-39309-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org>
X-Original-To: apmail-cxf-commits-archive@www.apache.org
Delivered-To: apmail-cxf-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 3C62118826
	for <apmail-cxf-commits-archive@www.apache.org>;
 Thu, 26 Nov 2015 15:34:49 +0000 (UTC)
Received: (qmail 48889 invoked by uid 500); 26 Nov 2015 15:34:49 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 48751 invoked by uid 500); 26 Nov 2015 15:34:49 -0000
Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cxf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cxf.apache.org>
List-Post: <mailto:commits@cxf.apache.org>
List-Id: <commits.cxf.apache.org>
Reply-To: dev@cxf.apache.org
Delivered-To: mailing list commits@cxf.apache.org
Received: (qmail 48622 invoked by uid 99); 26 Nov 2015 15:34:48 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Nov 2015 15:34:48 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id C971AE2C42; Thu, 26 Nov 2015 15:34:48 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: coheigea@apache.org
To: commits@cxf.apache.org
Date: Thu, 26 Nov 2015 15:34:50 -0000
Message-Id: <68111d67c80c4705b4246c2b131f961e@git.apache.org>
In-Reply-To: <21a7476119c6484fba975b95fd0556e7@git.apache.org>
References: <21a7476119c6484fba975b95fd0556e7@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [3/3] cxf git commit: Fixing merge

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 <coheigea@apache.org>
Authored: Thu Nov 26 15:34:40 2015 +0000
Committer: Colm O hEigeartaigh <coheigea@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);