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 merge
Date Thu, 13 Oct 2016 16:06:42 GMT
Fixing merge


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

Branch: refs/heads/3.1.x-fixes
Commit: bca4630627ab979a5c688677614646d985c6d7db
Parents: 09d4966
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Thu Oct 13 17:06:30 2016 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Thu Oct 13 17:06:30 2016 +0100

----------------------------------------------------------------------
 parent/pom.xml | 8 --------
 1 file changed, 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/bca46306/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 8d9377a..b680cdc 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1895,13 +1895,6 @@
                 <artifactId>htrace-core4</artifactId>
                 <version>${cxf.htrace.version}</version>
             </dependency>
-<<<<<<< HEAD
-=======
-            <dependency>
-                <groupId>org.qi4j.library</groupId>
-                <artifactId>org.qi4j.library.circuitbreaker</artifactId>
-                <version>${cxf.zest.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.wss4j</groupId>
                 <artifactId>wss4j-ws-security-dom</artifactId>
@@ -1922,7 +1915,6 @@
                 <artifactId>wss4j-ws-security-policy-stax</artifactId>
                 <version>${cxf.wss4j.version}</version>
             </dependency>
->>>>>>> 19d8da7... CXF-7090 - BOM added wss4j entries. This closes #180
         </dependencies>
     </dependencyManagement>
     <profiles>


Mime
View raw message