[ARIES-458] Replace ${version} with ${project.version}

git-svn-id: https://svn.apache.org/repos/asf/aries/trunk@1742076 13f79535-47bb-0310-9956-ffa450edef68
apache · May 3, 2016 · 5c9f172 · 5c9f172
1 parent 478f002
commit 5c9f172
Show file tree

Hide file tree

Showing 12 changed files with 56 additions and 56 deletions.
diff --git a/...ader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini b/...ader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini
@@ -58,7 +58,7 @@ org.apache.aries.proxy-${ariesProxyVersion}.jar@start,\
 org.apache.aries.transaction.blueprint-${ariesTransactionBlueprintVersion}.jar@start,\
 org.apache.aries.transaction.manager-${ariesTransactionManagerVersion}.jar@start,\
 org.apache.aries.transaction.wrappers-${ariesTransactionWrappersVersion}.jar@start,\
-org.apache.aries.samples.ariestrader.derby.ds-${version}.jar@start
+org.apache.aries.samples.ariestrader.derby.ds-${project.version}.jar@start
 eclipse.ignoreApp=true
 org.ops4j.pax.logging.DefaultServiceLog.level=DEBUG
 org.osgi.framework.system.packages=\

diff --git a/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini b/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini
@@ -57,7 +57,7 @@ org.apache.aries.jpa.container.context-${ariesJpaContainerContextVersion}.jar@st
 org.apache.aries.transaction.blueprint-${ariesTransactionBlueprintVersion}.jar@start,\
 org.apache.aries.transaction.manager-${ariesTransactionManagerVersion}.jar@start,\
 org.apache.servicemix.bundles.serp-${servicemixBundlesSerpVersion}.jar@start,\
-org.apache.aries.samples.blog.datasource-${version}.jar@start,\
+org.apache.aries.samples.blog.datasource-${project.version}.jar@start,\
 org.apache.aries.transaction.wrappers-${ariesTransactionWrappersVersion}.jar@start
 eclipse.ignoreApp=true
 org.ops4j.pax.logging.DefaultServiceLog.level=INFO

diff --git a/sandbox/samples/bank/pom.xml b/sandbox/samples/bank/pom.xml
@@ -35,47 +35,47 @@
             <dependency>
                 <groupId>org.apache.aries.samples.bank</groupId>
                 <artifactId>bank-api</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.aries.samples.bank</groupId>
                 <artifactId>bank-biz</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.aries.samples.bank</groupId>
                 <artifactId>bank-web</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.aries.samples.bank</groupId>
                 <artifactId>bank-checkingAccount</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.aries.samples.bank</groupId>
                 <artifactId>bank-checkingAccountBindings</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.aries.samples.bank</groupId>
                 <artifactId>bank-creditCheck</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.aries.samples.bank</groupId>
                 <artifactId>bank-creditCheckBindings</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.aries.samples.bank</groupId>
                 <artifactId>bank-lineOfCreditAccount</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.aries.samples.bank</groupId>
                 <artifactId>bank-lineOfCreditAccountBindings</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

diff --git a/...x/samples/dgoat/dgoat-assembly/src/main/filtered-resources/clientConfigTuscany/config.ini b/...x/samples/dgoat/dgoat-assembly/src/main/filtered-resources/clientConfigTuscany/config.ini
@@ -155,12 +155,12 @@ org.apache.aries.application.runtime-${ariesApplicationVersion}.jar@start,\
 #    tuscany/modules/wstx-asl-3.2.4@:start,\
     tuscany/modules/jdom-1.0@:start,\
     tuscany/modules/wstx-asl-3.2.6@:start,\
-org.apache.aries.samples.dgoat.api-${version}@start,\
-org.apache.aries.samples.dgoat.web-${version}.jar@start,\
-org.apache.aries.samples.dgoat.dummy-${version}.jar@start,\
-org.apache.aries.samples.dgoat.dummy2-${version}.jar@start,\
-org.apache.aries.samples.dgoat.bundlecontextmodel-${version}.jar@start,\
-org.apache.aries.samples.dgoat.info.enhancer-${version}.jar@start
+org.apache.aries.samples.dgoat.api-${project.version}@start,\
+org.apache.aries.samples.dgoat.web-${project.version}.jar@start,\
+org.apache.aries.samples.dgoat.dummy-${project.version}.jar@start,\
+org.apache.aries.samples.dgoat.dummy2-${project.version}.jar@start,\
+org.apache.aries.samples.dgoat.bundlecontextmodel-${project.version}.jar@start,\
+org.apache.aries.samples.dgoat.info.enhancer-${project.version}.jar@start
 eclipse.ignoreApp=true
 org.ops4j.pax.logging.DefaultServiceLog.level=DEBUG
 org.osgi.framework.system.packages=javax.accessibility,\

diff --git a/...x/samples/dgoat/dgoat-assembly/src/main/filtered-resources/serverConfigTuscany/config.ini b/...x/samples/dgoat/dgoat-assembly/src/main/filtered-resources/serverConfigTuscany/config.ini
@@ -155,13 +155,13 @@ org.apache.aries.application.runtime-${ariesApplicationVersion}.jar@start,\
 #    tuscany/modules/wstx-asl-3.2.4@:start,\
     tuscany/modules/jdom-1.0@:start,\
     tuscany/modules/wstx-asl-3.2.6@:start,\
-org.apache.aries.samples.dgoat.api-${version}@start,\
-# org.apache.aries.samples.dgoat.web-${version}.jar@start,\
-org.apache.aries.samples.dgoat.dummy-${version}.jar@start,\
-org.apache.aries.samples.dgoat.dummy2-${version}.jar@start,\
-org.apache.aries.samples.dgoat.bundlecontextmodel-${version}.jar@start,\
-org.apache.aries.samples.dgoat.serverBindings-${version}.jar@start,\
-org.apache.aries.samples.dgoat.info.enhancer-${version}.jar@start
+org.apache.aries.samples.dgoat.api-${project.version}@start,\
+# org.apache.aries.samples.dgoat.web-${project.version}.jar@start,\
+org.apache.aries.samples.dgoat.dummy-${project.version}.jar@start,\
+org.apache.aries.samples.dgoat.dummy2-${project.version}.jar@start,\
+org.apache.aries.samples.dgoat.bundlecontextmodel-${project.version}.jar@start,\
+org.apache.aries.samples.dgoat.serverBindings-${project.version}.jar@start,\
+org.apache.aries.samples.dgoat.info.enhancer-${project.version}.jar@start
 eclipse.ignoreApp=true
 org.ops4j.pax.logging.DefaultServiceLog.level=DEBUG
 org.osgi.framework.system.packages=javax.accessibility,\

diff --git a/sandbox/samples/dgoat/dgoat-eba/pom.xml b/sandbox/samples/dgoat/dgoat-eba/pom.xml
@@ -41,32 +41,32 @@ under the License.
         <dependency>
             <groupId>org.apache.aries.samples.dgoat</groupId>
             <artifactId>org.apache.aries.samples.dgoat.api</artifactId>
-			<version>${version}</version>
+			<version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.samples.dgoat</groupId>
             <artifactId>org.apache.aries.samples.dgoat.web</artifactId>
-			<version>${version}</version>
+			<version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.samples.dgoat</groupId>
             <artifactId>org.apache.aries.samples.dgoat.bundlecontextmodel</artifactId>
-			<version>${version}</version>
+			<version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.samples.dgoat</groupId>
             <artifactId>org.apache.aries.samples.dgoat.dummy</artifactId>
-			<version>${version}</version>
+			<version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.samples.dgoat</groupId>
             <artifactId>org.apache.aries.samples.dgoat.dummy2</artifactId>
-			<version>${version}</version>
+			<version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.samples.dgoat</groupId>
             <artifactId>org.apache.aries.samples.dgoat.info.enhancer</artifactId>
-			<version>${version}</version>
+			<version>${project.version}</version>
         </dependency>
     </dependencies>
 

diff --git a/sandbox/samples/dgoat/pom.xml b/sandbox/samples/dgoat/pom.xml
@@ -34,52 +34,52 @@
             <dependency>
                 <groupId>org.apache.aries.samples.dgoat</groupId>
                 <artifactId>org.apache.aries.samples.dgoat.api</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.aries.samples.dgoat</groupId>
                 <artifactId>org.apache.aries.samples.dgoat.web</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.aries.samples.dgoat</groupId>
                 <artifactId>org.apache.aries.samples.dgoat.assembly</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.aries.samples.dgoat</groupId>
                 <artifactId>org.apache.aries.samples.dgoat.dummy</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.aries.samples.dgoat</groupId>
                 <artifactId>org.apache.aries.samples.dgoat.dummy2</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.aries.samples.dgoat</groupId>
                 <artifactId>org.apache.aries.samples.dgoat.bundlecontextmodel</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${pom.groupId}</groupId>
                 <artifactId>org.apache.aries.samples.dgoat.info.enhancer</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.aries.samples.dgoat.cxf-api</groupId>
                 <artifactId>cxf-api</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.aries.samples.dgoat.cxf-client</groupId>
                 <artifactId>cxf-client</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.aries.samples.dgoat.cxf-server</groupId>
                 <artifactId>cxf-server</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

diff --git a/sandbox/samples/transaction-sample/pom.xml b/sandbox/samples/transaction-sample/pom.xml
@@ -34,22 +34,22 @@
             <dependency>
                 <groupId>org.apache.aries.samples</groupId>
                 <artifactId>osgi-jdbc-api</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.aries.samples</groupId>
                 <artifactId>osgi-jdbc-derby</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.aries.samples</groupId>
                 <artifactId>transaction-assembly</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.aries.samples</groupId>
                 <artifactId>transaction-sample-web</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

diff --git a/sandbox/samples/words-sample/pom.xml b/sandbox/samples/words-sample/pom.xml
@@ -40,27 +40,27 @@
             <dependency>
                 <groupId>words</groupId>
                 <artifactId>words-api</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>words</groupId>
                 <artifactId>words-assembly</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>words</groupId>
                 <artifactId>words-datasource</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>words</groupId>
                 <artifactId>words-jpa</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>words</groupId>
                 <artifactId>words-web</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

diff --git a/.../samples/words-sample/words-assembly/src/main/filtered-resources/configuration/config.ini b/.../samples/words-sample/words-assembly/src/main/filtered-resources/configuration/config.ini
@@ -52,7 +52,7 @@ org.apache.aries.jpa.container.context-${ariesJpaVersion}.jar@start,\
 org.apache.aries.transaction.blueprint-${ariesTransactionVersion}.jar@start,\
 org.apache.aries.transaction.manager-${ariesTransactionVersion}.jar@start,\
 org.apache.servicemix.bundles.serp-1.13.1_2.jar@start,\
-words-datasource-${version}.jar@start,\
+words-datasource-${project.version}.jar@start,\
 org.apache.aries.transaction.wrappers-${ariesTransactionVersion}.jar@start
 eclipse.ignoreApp=true
 org.ops4j.pax.logging.DefaultServiceLog.level=DEBUG

diff --git a/subsystem/subsystem-example/subsystem-helloIsolationRef/pom.xml b/subsystem/subsystem-example/subsystem-helloIsolationRef/pom.xml
@@ -62,7 +62,7 @@
         <dependency>
             <groupId>org.apache.aries.subsystem</groupId>
             <artifactId>org.apache.aries.subsystem.example.helloIsolation</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/tutorials/blueprint/tutorial-assembly/pom.xml b/tutorials/blueprint/tutorial-assembly/pom.xml
@@ -82,31 +82,31 @@
 		<dependency>
 			<groupId>org.apache.aries.tutorials.blueprint</groupId>
 			<artifactId>org.apache.aries.tutorials.blueprint.greeter.api</artifactId>
-                        <version>${version}</version>
+                        <version>${project.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.aries.tutorials.blueprint</groupId>
 			<artifactId>org.apache.aries.tutorials.blueprint.greeter.client.blueprint</artifactId>
-                        <version>${version}</version>
+                        <version>${project.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.aries.tutorials.blueprint</groupId>
 			<artifactId>org.apache.aries.tutorials.blueprint.greeter.client.osgi</artifactId>
-                        <version>${version}</version>
+                        <version>${project.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.aries.tutorials.blueprint</groupId>
 			<artifactId>org.apache.aries.tutorials.blueprint.greeter.server.blueprint</artifactId>
-                        <version>${version}</version>
+                        <version>${project.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.aries.tutorials.blueprint</groupId>
 			<artifactId>org.apache.aries.tutorials.blueprint.greeter.server.osgi</artifactId>
-                        <version>${version}</version>
+                        <version>${project.version}</version>
 		</dependency>
 
 	</dependencies>