Author: veithen
Date: Sun Dec 5 11:02:14 2010
New Revision: 1042313
URL: http://svn.apache.org/viewvc?rev=1042313&view=rev
Log:
Use ${project.version} to refer to the Sandesha2 version (as recommended by
Maven 3), and eliminated usage of ${sandesha2.version}, ${pom.version},
${version} and harcoded version.
Modified:
axis/axis2/java/sandesha/trunk/modules/client/pom.xml
axis/axis2/java/sandesha/trunk/modules/distribution/pom.xml
axis/axis2/java/sandesha/trunk/modules/interop/pom.xml
axis/axis2/java/sandesha/trunk/modules/mar/pom.xml
axis/axis2/java/sandesha/trunk/modules/persistence/pom.xml
axis/axis2/java/sandesha/trunk/modules/policy/pom.xml
axis/axis2/java/sandesha/trunk/modules/rampart-integration/pom.xml
axis/axis2/java/sandesha/trunk/modules/samples/pom.xml
axis/axis2/java/sandesha/trunk/modules/tests/pom.xml
axis/axis2/java/sandesha/trunk/pom.xml
Modified: axis/axis2/java/sandesha/trunk/modules/client/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/client/pom.xml?rev=1042313&r1=1042312&r2=1042313&view=diff
==============================================================================
--- axis/axis2/java/sandesha/trunk/modules/client/pom.xml (original)
+++ axis/axis2/java/sandesha/trunk/modules/client/pom.xml Sun Dec 5 11:02:14
2010
@@ -57,7 +57,7 @@
<artifactItem>
<groupId>org.apache.sandesha2</groupId>
<artifactId>sandesha2-core</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<type>jar</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/classes/</outputDirectory>
@@ -75,7 +75,7 @@
<dependency>
<groupId>org.apache.sandesha2</groupId>
<artifactId>sandesha2-core</artifactId>
- <version>SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
Modified: axis/axis2/java/sandesha/trunk/modules/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/distribution/pom.xml?rev=1042313&r1=1042312&r2=1042313&view=diff
==============================================================================
--- axis/axis2/java/sandesha/trunk/modules/distribution/pom.xml (original)
+++ axis/axis2/java/sandesha/trunk/modules/distribution/pom.xml Sun Dec 5
11:02:14 2010
@@ -51,7 +51,7 @@
<artifactItem>
<groupId>org.apache.sandesha2</groupId>
<artifactId>sandesha2-core</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<classifier>sources</classifier>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/sources/</outputDirectory>
@@ -59,7 +59,7 @@
<artifactItem>
<groupId>org.apache.sandesha2</groupId>
<artifactId>sandesha2-interop</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<classifier>sources</classifier>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/sources/</outputDirectory>
@@ -67,7 +67,7 @@
<artifactItem>
<groupId>org.apache.sandesha2</groupId>
<artifactId>sandesha2-rampart-integration</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<classifier>sources</classifier>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/sources/</outputDirectory>
@@ -127,7 +127,7 @@
<descriptor>src/main/assembly/src.xml</descriptor>
<descriptor>src/main/assembly/doc.xml</descriptor>
</descriptors>
- <finalName>sandesha2-${version}</finalName>
+ <finalName>sandesha2-${project.version}</finalName>
</configuration>
</execution>
</executions>
Modified: axis/axis2/java/sandesha/trunk/modules/interop/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/interop/pom.xml?rev=1042313&r1=1042312&r2=1042313&view=diff
==============================================================================
--- axis/axis2/java/sandesha/trunk/modules/interop/pom.xml (original)
+++ axis/axis2/java/sandesha/trunk/modules/interop/pom.xml Sun Dec 5 11:02:14
2010
@@ -106,7 +106,7 @@
<dependency>
<groupId>org.apache.sandesha2</groupId>
<artifactId>sandesha2-core</artifactId>
- <version>SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
Modified: axis/axis2/java/sandesha/trunk/modules/mar/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/mar/pom.xml?rev=1042313&r1=1042312&r2=1042313&view=diff
==============================================================================
--- axis/axis2/java/sandesha/trunk/modules/mar/pom.xml (original)
+++ axis/axis2/java/sandesha/trunk/modules/mar/pom.xml Sun Dec 5 11:02:14 2010
@@ -58,7 +58,7 @@
<artifactItem>
<groupId>org.apache.sandesha2</groupId>
<artifactId>sandesha2-core</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/classes/</outputDirectory>
@@ -97,7 +97,7 @@
<dependency>
<groupId>org.apache.sandesha2</groupId>
<artifactId>sandesha2-core</artifactId>
- <version>SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
Modified: axis/axis2/java/sandesha/trunk/modules/persistence/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/persistence/pom.xml?rev=1042313&r1=1042312&r2=1042313&view=diff
==============================================================================
--- axis/axis2/java/sandesha/trunk/modules/persistence/pom.xml (original)
+++ axis/axis2/java/sandesha/trunk/modules/persistence/pom.xml Sun Dec 5
11:02:14 2010
@@ -43,7 +43,7 @@
<configuration>
<tasks>
<ant antfile="test.build.xml"
inheritAll="true" target="prepare">
- <property name="sandesha2.version"
value="${sandesha2.version}"/>
+ <property name="sandesha2.version"
value="${project.version}"/>
<property name="build.dir"
value="${project.build.directory}"/>
<property name="local.repo"
value="${settings.localRepository}"/>
<property name="addressing.version"
value="${axis2.version}"/>
@@ -85,17 +85,17 @@
<dependency>
<groupId>org.apache.sandesha2</groupId>
<artifactId>sandesha2-core</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.sandesha2</groupId>
<artifactId>sandesha2-policy</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.sandesha2</groupId>
<artifactId>sandesha2-samples</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
Modified: axis/axis2/java/sandesha/trunk/modules/policy/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/policy/pom.xml?rev=1042313&r1=1042312&r2=1042313&view=diff
==============================================================================
--- axis/axis2/java/sandesha/trunk/modules/policy/pom.xml (original)
+++ axis/axis2/java/sandesha/trunk/modules/policy/pom.xml Sun Dec 5 11:02:14
2010
@@ -58,7 +58,7 @@
<artifactItem>
<groupId>org.apache.sandesha2</groupId>
<artifactId>sandesha2-core</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/classes/</outputDirectory>
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.apache.sandesha2</groupId>
<artifactId>sandesha2-core</artifactId>
- <version>SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
Modified: axis/axis2/java/sandesha/trunk/modules/rampart-integration/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/rampart-integration/pom.xml?rev=1042313&r1=1042312&r2=1042313&view=diff
==============================================================================
--- axis/axis2/java/sandesha/trunk/modules/rampart-integration/pom.xml
(original)
+++ axis/axis2/java/sandesha/trunk/modules/rampart-integration/pom.xml Sun Dec
5 11:02:14 2010
@@ -63,7 +63,7 @@
<dependency>
<groupId>org.apache.sandesha2</groupId>
<artifactId>sandesha2-core</artifactId>
- <version>SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<!-- Rampart -->
Modified: axis/axis2/java/sandesha/trunk/modules/samples/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/samples/pom.xml?rev=1042313&r1=1042312&r2=1042313&view=diff
==============================================================================
--- axis/axis2/java/sandesha/trunk/modules/samples/pom.xml (original)
+++ axis/axis2/java/sandesha/trunk/modules/samples/pom.xml Sun Dec 5 11:02:14
2010
@@ -77,12 +77,12 @@
<dependency>
<groupId>org.apache.sandesha2</groupId>
<artifactId>sandesha2-core</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.sandesha2</groupId>
<artifactId>sandesha2-policy</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
Modified: axis/axis2/java/sandesha/trunk/modules/tests/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/tests/pom.xml?rev=1042313&r1=1042312&r2=1042313&view=diff
==============================================================================
--- axis/axis2/java/sandesha/trunk/modules/tests/pom.xml (original)
+++ axis/axis2/java/sandesha/trunk/modules/tests/pom.xml Sun Dec 5 11:02:14
2010
@@ -62,7 +62,7 @@
<artifactItem>
<groupId>org.apache.sandesha2</groupId>
<artifactId>sandesha2</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<type>mar</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/copiedmars</outputDirectory>
@@ -119,7 +119,7 @@
<configuration>
<tasks>
<ant antfile="tests.build.xml"
inheritAll="true" target="repo:create">
- <property name="sandesha2.version"
value="${sandesha2.version}"/>
+ <property name="sandesha2.version"
value="${project.version}"/>
<property name="build.dir"
value="${project.build.directory}"/>
<property name="local.repo"
value="${settings.localRepository}"/>
<property name="addressing.version"
value="${axis2.version}"/>
@@ -161,17 +161,17 @@
<dependency>
<groupId>org.apache.sandesha2</groupId>
<artifactId>sandesha2-core</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.sandesha2</groupId>
<artifactId>sandesha2-policy</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.sandesha2</groupId>
<artifactId>sandesha2-samples</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.rampart</groupId>
Modified: axis/axis2/java/sandesha/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/pom.xml?rev=1042313&r1=1042312&r2=1042313&view=diff
==============================================================================
--- axis/axis2/java/sandesha/trunk/pom.xml (original)
+++ axis/axis2/java/sandesha/trunk/pom.xml Sun Dec 5 11:02:14 2010
@@ -302,7 +302,6 @@
</modules>
<properties>
- <sandesha2.version>SNAPSHOT</sandesha2.version>
<axis2.version>SNAPSHOT</axis2.version>
<rampart.version>SNAPSHOT</rampart.version>
<axiom.version>1.2.11-SNAPSHOT</axiom.version>
