cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [3/3] cxf git commit: Fixing backmerge
Date Thu, 16 Apr 2015 13:12:28 GMT
Fixing backmerge


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

Branch: refs/heads/3.0.x-fixes
Commit: 3ed21351911324398bd86120d24cb7e2a7b75bc3
Parents: 610f52c
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Thu Apr 16 14:12:17 2015 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Thu Apr 16 14:12:17 2015 +0100

----------------------------------------------------------------------
 systests/rs-security/pom.xml | 8 --------
 1 file changed, 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/3ed21351/systests/rs-security/pom.xml
----------------------------------------------------------------------
diff --git a/systests/rs-security/pom.xml b/systests/rs-security/pom.xml
index 3f90915..e1d3b38 100644
--- a/systests/rs-security/pom.xml
+++ b/systests/rs-security/pom.xml
@@ -77,19 +77,11 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-<<<<<<< HEAD
-=======
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-security-sso-saml</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-rs-security-oauth2-jose</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
->>>>>>> da35252... Adding a SAML SSO Metadata test
          <groupId>org.bouncycastle</groupId>
          <artifactId>bcprov-ext-jdk15on</artifactId>
          <version>${cxf.bcprov.version}</version>


Mime
View raw message