You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by cs...@apache.org on 2016/05/03 11:41:04 UTC
svn commit: r1742076 - in /aries/trunk:
samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/
samples/blog/blog-assembly/src/main/filtered-resources/configuration/
sandbox/samples/bank/ sandbox/samples/dgoat/ sa...
Author: cschneider
Date: Tue May 3 09:41:03 2016
New Revision: 1742076
URL: http://svn.apache.org/viewvc?rev=1742076&view=rev
Log:
[ARIES-458] Replace ${version} with ${project.version}
Modified:
aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini
aries/trunk/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini
aries/trunk/sandbox/samples/bank/pom.xml
aries/trunk/sandbox/samples/dgoat/dgoat-assembly/src/main/filtered-resources/clientConfigTuscany/config.ini
aries/trunk/sandbox/samples/dgoat/dgoat-assembly/src/main/filtered-resources/serverConfigTuscany/config.ini
aries/trunk/sandbox/samples/dgoat/dgoat-eba/pom.xml
aries/trunk/sandbox/samples/dgoat/pom.xml
aries/trunk/sandbox/samples/transaction-sample/pom.xml
aries/trunk/sandbox/samples/words-sample/pom.xml
aries/trunk/sandbox/samples/words-sample/words-assembly/src/main/filtered-resources/configuration/config.ini
aries/trunk/subsystem/subsystem-example/subsystem-helloIsolationRef/pom.xml
aries/trunk/tutorials/blueprint/tutorial-assembly/pom.xml
Modified: aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini
URL: http://svn.apache.org/viewvc/aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini?rev=1742076&r1=1742075&r2=1742076&view=diff
==============================================================================
--- aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini (original)
+++ aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini Tue May 3 09:41:03 2016
@@ -58,7 +58,7 @@ org.apache.aries.proxy-${ariesProxyVersi
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=\
Modified: aries/trunk/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini?rev=1742076&r1=1742075&r2=1742076&view=diff
==============================================================================
--- aries/trunk/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini (original)
+++ aries/trunk/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini Tue May 3 09:41:03 2016
@@ -57,7 +57,7 @@ org.apache.aries.jpa.container.context-$
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
Modified: aries/trunk/sandbox/samples/bank/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/sandbox/samples/bank/pom.xml?rev=1742076&r1=1742075&r2=1742076&view=diff
==============================================================================
--- aries/trunk/sandbox/samples/bank/pom.xml (original)
+++ aries/trunk/sandbox/samples/bank/pom.xml Tue May 3 09:41:03 2016
@@ -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>
Modified: aries/trunk/sandbox/samples/dgoat/dgoat-assembly/src/main/filtered-resources/clientConfigTuscany/config.ini
URL: http://svn.apache.org/viewvc/aries/trunk/sandbox/samples/dgoat/dgoat-assembly/src/main/filtered-resources/clientConfigTuscany/config.ini?rev=1742076&r1=1742075&r2=1742076&view=diff
==============================================================================
--- aries/trunk/sandbox/samples/dgoat/dgoat-assembly/src/main/filtered-resources/clientConfigTuscany/config.ini (original)
+++ aries/trunk/sandbox/samples/dgoat/dgoat-assembly/src/main/filtered-resources/clientConfigTuscany/config.ini Tue May 3 09:41:03 2016
@@ -155,12 +155,12 @@ org.apache.aries.application.runtime-${a
# 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,\
Modified: aries/trunk/sandbox/samples/dgoat/dgoat-assembly/src/main/filtered-resources/serverConfigTuscany/config.ini
URL: http://svn.apache.org/viewvc/aries/trunk/sandbox/samples/dgoat/dgoat-assembly/src/main/filtered-resources/serverConfigTuscany/config.ini?rev=1742076&r1=1742075&r2=1742076&view=diff
==============================================================================
--- aries/trunk/sandbox/samples/dgoat/dgoat-assembly/src/main/filtered-resources/serverConfigTuscany/config.ini (original)
+++ aries/trunk/sandbox/samples/dgoat/dgoat-assembly/src/main/filtered-resources/serverConfigTuscany/config.ini Tue May 3 09:41:03 2016
@@ -155,13 +155,13 @@ org.apache.aries.application.runtime-${a
# 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,\
Modified: aries/trunk/sandbox/samples/dgoat/dgoat-eba/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/sandbox/samples/dgoat/dgoat-eba/pom.xml?rev=1742076&r1=1742075&r2=1742076&view=diff
==============================================================================
--- aries/trunk/sandbox/samples/dgoat/dgoat-eba/pom.xml (original)
+++ aries/trunk/sandbox/samples/dgoat/dgoat-eba/pom.xml Tue May 3 09:41:03 2016
@@ -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>
Modified: aries/trunk/sandbox/samples/dgoat/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/sandbox/samples/dgoat/pom.xml?rev=1742076&r1=1742075&r2=1742076&view=diff
==============================================================================
--- aries/trunk/sandbox/samples/dgoat/pom.xml (original)
+++ aries/trunk/sandbox/samples/dgoat/pom.xml Tue May 3 09:41:03 2016
@@ -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>
Modified: aries/trunk/sandbox/samples/transaction-sample/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/sandbox/samples/transaction-sample/pom.xml?rev=1742076&r1=1742075&r2=1742076&view=diff
==============================================================================
--- aries/trunk/sandbox/samples/transaction-sample/pom.xml (original)
+++ aries/trunk/sandbox/samples/transaction-sample/pom.xml Tue May 3 09:41:03 2016
@@ -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>
Modified: aries/trunk/sandbox/samples/words-sample/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/sandbox/samples/words-sample/pom.xml?rev=1742076&r1=1742075&r2=1742076&view=diff
==============================================================================
--- aries/trunk/sandbox/samples/words-sample/pom.xml (original)
+++ aries/trunk/sandbox/samples/words-sample/pom.xml Tue May 3 09:41:03 2016
@@ -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>
Modified: aries/trunk/sandbox/samples/words-sample/words-assembly/src/main/filtered-resources/configuration/config.ini
URL: http://svn.apache.org/viewvc/aries/trunk/sandbox/samples/words-sample/words-assembly/src/main/filtered-resources/configuration/config.ini?rev=1742076&r1=1742075&r2=1742076&view=diff
==============================================================================
--- aries/trunk/sandbox/samples/words-sample/words-assembly/src/main/filtered-resources/configuration/config.ini (original)
+++ aries/trunk/sandbox/samples/words-sample/words-assembly/src/main/filtered-resources/configuration/config.ini Tue May 3 09:41:03 2016
@@ -52,7 +52,7 @@ org.apache.aries.jpa.container.context-$
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
Modified: aries/trunk/subsystem/subsystem-example/subsystem-helloIsolationRef/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-example/subsystem-helloIsolationRef/pom.xml?rev=1742076&r1=1742075&r2=1742076&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-example/subsystem-helloIsolationRef/pom.xml (original)
+++ aries/trunk/subsystem/subsystem-example/subsystem-helloIsolationRef/pom.xml Tue May 3 09:41:03 2016
@@ -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>
Modified: aries/trunk/tutorials/blueprint/tutorial-assembly/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/tutorials/blueprint/tutorial-assembly/pom.xml?rev=1742076&r1=1742075&r2=1742076&view=diff
==============================================================================
--- aries/trunk/tutorials/blueprint/tutorial-assembly/pom.xml (original)
+++ aries/trunk/tutorials/blueprint/tutorial-assembly/pom.xml Tue May 3 09:41:03 2016
@@ -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>