You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2016/10/13 16:06:41 UTC
[2/3] cxf git commit: CXF-7090 - BOM added wss4j entries. This closes
#180
CXF-7090 - BOM added wss4j entries. This closes #180
# Conflicts:
# parent/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a7c9bdd8
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a7c9bdd8
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a7c9bdd8
Branch: refs/heads/3.1.x-fixes
Commit: a7c9bdd8c8bb2a95cbed2990c5fca4e9886e8b08
Parents: 75d35ef
Author: Paolo Antinori <pa...@redhat.com>
Authored: Thu Oct 13 17:10:24 2016 +0200
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Oct 13 17:06:08 2016 +0100
----------------------------------------------------------------------
distribution/javadoc/pom.xml | 4 ----
parent/pom.xml | 28 ++++++++++++++++++++++++++++
rt/rs/security/xml/pom.xml | 1 -
rt/security-saml/pom.xml | 1 -
rt/ws/rm/pom.xml | 1 -
rt/ws/security/pom.xml | 4 ----
services/xkms/xkms-client/pom.xml | 1 -
services/xkms/xkms-common/pom.xml | 1 -
8 files changed, 28 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/a7c9bdd8/distribution/javadoc/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/javadoc/pom.xml b/distribution/javadoc/pom.xml
index 6d6a92a..ce620d3 100644
--- a/distribution/javadoc/pom.xml
+++ b/distribution/javadoc/pom.xml
@@ -209,22 +209,18 @@
<dependency>
<groupId>org.apache.wss4j</groupId>
<artifactId>wss4j-ws-security-dom</artifactId>
- <version>${cxf.wss4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.wss4j</groupId>
<artifactId>wss4j-policy</artifactId>
- <version>${cxf.wss4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.wss4j</groupId>
<artifactId>wss4j-ws-security-stax</artifactId>
- <version>${cxf.wss4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.wss4j</groupId>
<artifactId>wss4j-ws-security-policy-stax</artifactId>
- <version>${cxf.wss4j.version}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
http://git-wip-us.apache.org/repos/asf/cxf/blob/a7c9bdd8/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 98a0243..8d9377a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1895,6 +1895,34 @@
<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>
+ <version>${cxf.wss4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wss4j</groupId>
+ <artifactId>wss4j-policy</artifactId>
+ <version>${cxf.wss4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wss4j</groupId>
+ <artifactId>wss4j-ws-security-stax</artifactId>
+ <version>${cxf.wss4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wss4j</groupId>
+ <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>
http://git-wip-us.apache.org/repos/asf/cxf/blob/a7c9bdd8/rt/rs/security/xml/pom.xml
----------------------------------------------------------------------
diff --git a/rt/rs/security/xml/pom.xml b/rt/rs/security/xml/pom.xml
index 054e77f..47aeefc 100644
--- a/rt/rs/security/xml/pom.xml
+++ b/rt/rs/security/xml/pom.xml
@@ -59,7 +59,6 @@
<dependency>
<groupId>org.apache.wss4j</groupId>
<artifactId>wss4j-ws-security-dom</artifactId>
- <version>${cxf.wss4j.version}</version>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/cxf/blob/a7c9bdd8/rt/security-saml/pom.xml
----------------------------------------------------------------------
diff --git a/rt/security-saml/pom.xml b/rt/security-saml/pom.xml
index 1039336..ab4df5f 100644
--- a/rt/security-saml/pom.xml
+++ b/rt/security-saml/pom.xml
@@ -44,7 +44,6 @@
<dependency>
<groupId>org.apache.wss4j</groupId>
<artifactId>wss4j-ws-security-dom</artifactId>
- <version>${cxf.wss4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
http://git-wip-us.apache.org/repos/asf/cxf/blob/a7c9bdd8/rt/ws/rm/pom.xml
----------------------------------------------------------------------
diff --git a/rt/ws/rm/pom.xml b/rt/ws/rm/pom.xml
index 099ffdc..93e8c69 100644
--- a/rt/ws/rm/pom.xml
+++ b/rt/ws/rm/pom.xml
@@ -97,7 +97,6 @@
<dependency>
<groupId>org.apache.wss4j</groupId>
<artifactId>wss4j-policy</artifactId>
- <version>${cxf.wss4j.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/cxf/blob/a7c9bdd8/rt/ws/security/pom.xml
----------------------------------------------------------------------
diff --git a/rt/ws/security/pom.xml b/rt/ws/security/pom.xml
index d481c85..51d54b2 100644
--- a/rt/ws/security/pom.xml
+++ b/rt/ws/security/pom.xml
@@ -92,22 +92,18 @@
<dependency>
<groupId>org.apache.wss4j</groupId>
<artifactId>wss4j-ws-security-dom</artifactId>
- <version>${cxf.wss4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.wss4j</groupId>
<artifactId>wss4j-policy</artifactId>
- <version>${cxf.wss4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.wss4j</groupId>
<artifactId>wss4j-ws-security-stax</artifactId>
- <version>${cxf.wss4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.wss4j</groupId>
<artifactId>wss4j-ws-security-policy-stax</artifactId>
- <version>${cxf.wss4j.version}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
http://git-wip-us.apache.org/repos/asf/cxf/blob/a7c9bdd8/services/xkms/xkms-client/pom.xml
----------------------------------------------------------------------
diff --git a/services/xkms/xkms-client/pom.xml b/services/xkms/xkms-client/pom.xml
index 90b6370..fea0911 100644
--- a/services/xkms/xkms-client/pom.xml
+++ b/services/xkms/xkms-client/pom.xml
@@ -99,7 +99,6 @@
<dependency>
<groupId>org.apache.wss4j</groupId>
<artifactId>wss4j-ws-security-dom</artifactId>
- <version>${cxf.wss4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
http://git-wip-us.apache.org/repos/asf/cxf/blob/a7c9bdd8/services/xkms/xkms-common/pom.xml
----------------------------------------------------------------------
diff --git a/services/xkms/xkms-common/pom.xml b/services/xkms/xkms-common/pom.xml
index 7094f69..53ed445 100644
--- a/services/xkms/xkms-common/pom.xml
+++ b/services/xkms/xkms-common/pom.xml
@@ -45,7 +45,6 @@
<dependency>
<groupId>org.apache.wss4j</groupId>
<artifactId>wss4j-ws-security-dom</artifactId>
- <version>${cxf.wss4j.version}</version>
</dependency>
</dependencies>
<build>