You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2014/07/28 00:04:31 UTC
svn commit: r1613850 - in /axis/axis2/java/rampart/branches/1_6: ./
modules/rampart-core/pom.xml modules/rampart-integration/pom.xml
modules/rampart-policy/pom.xml modules/rampart-tests/pom.xml
modules/rampart-trust/pom.xml pom.xml
Author: veithen
Date: Sun Jul 27 22:04:31 2014
New Revision: 1613850
URL: http://svn.apache.org/r1613850
Log:
Merged r1613845 to the 1.6 branch.
Modified:
axis/axis2/java/rampart/branches/1_6/ (props changed)
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/pom.xml
axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml
axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/pom.xml
axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/pom.xml
axis/axis2/java/rampart/branches/1_6/modules/rampart-trust/pom.xml
axis/axis2/java/rampart/branches/1_6/pom.xml
Propchange: axis/axis2/java/rampart/branches/1_6/
------------------------------------------------------------------------------
Merged /axis/axis2/java/rampart/trunk:r1455337
Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-core/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-core/pom.xml?rev=1613850&r1=1613849&r2=1613850&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-core/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-core/pom.xml Sun Jul 27 22:04:31 2014
@@ -64,6 +64,36 @@
<dependencies>
<dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-kernel</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-mtompolicy</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>mex</artifactId>
+ <classifier>impl</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.security</groupId>
+ <artifactId>wss4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bcprov-jdk15</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.opensaml</groupId>
+ <artifactId>opensaml</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-policy</artifactId>
<version>${project.version}</version>
@@ -78,5 +108,10 @@
<artifactId>axiom-dom</artifactId>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml?rev=1613850&r1=1613849&r2=1613850&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml Sun Jul 27 22:04:31 2014
@@ -804,8 +804,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/pom.xml?rev=1613850&r1=1613849&r2=1613850&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/pom.xml Sun Jul 27 22:04:31 2014
@@ -62,4 +62,14 @@
</plugins>
</build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-kernel</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-api</artifactId>
+ </dependency>
+ </dependencies>
</project>
Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/pom.xml?rev=1613850&r1=1613849&r2=1613850&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/pom.xml Sun Jul 27 22:04:31 2014
@@ -88,5 +88,10 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-trust/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-trust/pom.xml?rev=1613850&r1=1613849&r2=1613850&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-trust/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-trust/pom.xml Sun Jul 27 22:04:31 2014
@@ -87,6 +87,28 @@
<artifactId>axiom-dom</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.ws.security</groupId>
+ <artifactId>wss4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bcprov-jdk15</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.opensaml</groupId>
+ <artifactId>opensaml</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
Modified: axis/axis2/java/rampart/branches/1_6/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/pom.xml?rev=1613850&r1=1613849&r2=1613850&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/pom.xml Sun Jul 27 22:04:31 2014
@@ -222,84 +222,26 @@
</plugins>
</reporting>
- <dependencies>
-
- <!-- Axis2 and Axiom Dependencies -->
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-kernel</artifactId>
- <version>${axis2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>mex</artifactId>
- <version>${axis2.version}</version>
- <classifier>impl</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-mtompolicy</artifactId>
- <version>${axis2.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>addressing</artifactId>
- <type>mar</type>
- <version>${axis2.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <!-- Other Rampart Dependencies -->
- <dependency>
- <groupId>org.apache.ws.security</groupId>
- <artifactId>wss4j</artifactId>
- <version>${wss4j.version}</version>
- </dependency>
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <version>2.7.1</version>
- </dependency>
- <dependency>
- <groupId>org.opensaml</groupId>
- <artifactId>opensaml</artifactId>
- <version>${opensaml.version}</version>
- <exclusions>
- <!-- Don't allow OpenSAML to impose a particular logging implementation -->
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.3</version>
- </dependency>
- <dependency>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk15</artifactId>
- <version>${bcprov.jdk15.version}</version>
- </dependency>
-
- <!-- Junit Dependency -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
<dependencyManagement>
<dependencies>
+ <!-- Axis2 dependencies -->
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-kernel</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-mtompolicy</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>mex</artifactId>
+ <version>${axis2.version}</version>
+ <classifier>impl</classifier>
+ </dependency>
+
<!-- Since Rampart depends on DOOM, but axiom-dom is not a transitive
dependency, we need to manage the Axiom version. -->
<dependency>
@@ -323,6 +265,39 @@
<version>${axiom.version}</version>
</dependency>
+ <!-- Other Rampart Dependencies -->
+ <dependency>
+ <groupId>org.apache.ws.security</groupId>
+ <artifactId>wss4j</artifactId>
+ <version>${wss4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bcprov-jdk15</artifactId>
+ <version>${bcprov.jdk15.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>2.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.opensaml</groupId>
+ <artifactId>opensaml</artifactId>
+ <version>${opensaml.version}</version>
+ <exclusions>
+ <!-- Don't allow OpenSAML to impose a particular logging implementation -->
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>log4j-over-slf4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
@@ -364,6 +339,11 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -449,8 +429,6 @@
<bcprov.jdk15.version>140</bcprov.jdk15.version>
- <junit.version>3.8.2</junit.version>
-
<!-- distribution properties -->
<dist.dir>rampart-${project.version}</dist.dir>
<failIfNoTests>false</failIfNoTests>