Author: veithen
Date: Sat Apr 2 14:17:39 2011
New Revision: 1088033
URL: http://svn.apache.org/viewvc?rev=1088033&view=rev
Log:
Merged r1083686 to the 1.5 branch.
Modified:
axis/axis2/java/rampart/branches/1_5_x/ (props changed)
axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-tests/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust/pom.xml
axis/axis2/java/rampart/branches/1_5_x/pom.xml
Propchange: axis/axis2/java/rampart/branches/1_5_x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 2 14:17:39 2011
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk:1072187
+/axis/axis2/java/rampart/trunk:1072187,1083686
Modified: axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml?rev=1088033&r1=1088032&r2=1088033&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml Sat Apr
2 14:17:39 2011
@@ -94,29 +94,29 @@
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<type>mar</type>
</dependency>
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rahas</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<type>mar</type>
</dependency>
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-core</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-policy</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-trust</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>bouncycastle</groupId>
Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml?rev=1088033&r1=1088032&r2=1088033&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml Sat Apr
2 14:17:39 2011
@@ -60,12 +60,12 @@
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-policy</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-trust</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
@@ -74,6 +74,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
+ <version>2.0-beta-5</version>
<configuration>
<templateDirectory>${basedir}</templateDirectory>
<menu ref="parent" />
Modified:
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml?rev=1088033&r1=1088032&r2=1088033&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml
Sat Apr 2 14:17:39 2011
@@ -541,17 +541,17 @@
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-policy</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-trust</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-core</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
@@ -591,6 +591,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
+ <version>2.0-beta-5</version>
<configuration>
<templateDirectory>${basedir}</templateDirectory>
<menu ref="parent" />
Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml?rev=1088033&r1=1088032&r2=1088033&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml Sat Apr
2 14:17:39 2011
@@ -82,7 +82,7 @@
<configuration>
<artifacts>
<artifact>
-
<file>target/${pom.artifactId}-${pom.version}.mar</file>
+
<file>target/${project.artifactId}-${project.version}.mar</file>
<type>jar</type>
</artifact>
</artifacts>
@@ -97,12 +97,12 @@
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-policy</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-trust</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/pom.xml?rev=1088033&r1=1088032&r2=1088033&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/pom.xml
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/pom.xml Sat
Apr 2 14:17:39 2011
@@ -61,6 +61,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
+ <version>2.0-beta-5</version>
<configuration>
<templateDirectory>${basedir}</templateDirectory>
<menu ref="parent" />
Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-tests/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-tests/pom.xml?rev=1088033&r1=1088032&r2=1088033&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-tests/pom.xml
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-tests/pom.xml Sat
Apr 2 14:17:39 2011
@@ -62,17 +62,17 @@
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-policy</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-trust</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-core</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
@@ -81,6 +81,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
+ <version>2.0-beta-5</version>
<configuration>
<templateDirectory>${basedir}</templateDirectory>
<menu ref="parent" />
Modified:
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml?rev=1088033&r1=1088032&r2=1088033&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml
Sat Apr 2 14:17:39 2011
@@ -75,12 +75,12 @@
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-policy</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-trust</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
</project>
Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust/pom.xml?rev=1088033&r1=1088032&r2=1088033&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust/pom.xml
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust/pom.xml Sat
Apr 2 14:17:39 2011
@@ -60,7 +60,7 @@
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-policy</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
@@ -69,6 +69,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
+ <version>2.0-beta-5</version>
<configuration>
<templateDirectory>${basedir}</templateDirectory>
<menu ref="parent" />
Modified: axis/axis2/java/rampart/branches/1_5_x/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/pom.xml?rev=1088033&r1=1088032&r2=1088033&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_5_x/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_5_x/pom.xml Sat Apr 2 14:17:39 2011
@@ -406,9 +406,9 @@
<properties>
- <rampart.version>${pom.version}</rampart.version>
- <rampart.mar.version>${pom.version}</rampart.mar.version>
- <rahas.mar.version>${pom.version}</rahas.mar.version>
+ <rampart.version>${project.version}</rampart.version>
+ <rampart.mar.version>${project.version}</rampart.mar.version>
+ <rahas.mar.version>${project.version}</rahas.mar.version>
<axis2.version>1.5.4</axis2.version>
<axiom.version>1.2.10</axiom.version>
@@ -424,7 +424,7 @@
<log4j.version>1.2.15</log4j.version>
<!-- distribution properties -->
- <dist.dir>rampart-${pom.version}</dist.dir>
+ <dist.dir>rampart-${project.version}</dist.dir>
<failIfNoTests>false</failIfNoTests>
</properties>
