From 42cbeed1a02ac4135d9638dcd9aacd5addc5c08b Mon Sep 17 00:00:00 2001 From: Dominik Adam Przybysz Date: Sat, 5 Mar 2016 23:10:36 +0100 Subject: [PATCH] [ARIES-458] Replace ${version} with ${project.version} --- .../configuration/config.ini | 2 +- .../configuration/config.ini | 2 +- sandbox/samples/bank/pom.xml | 18 ++++++++--------- .../clientConfigTuscany/config.ini | 12 +++++------ .../serverConfigTuscany/config.ini | 14 ++++++------- sandbox/samples/dgoat/dgoat-eba/pom.xml | 12 +++++------ sandbox/samples/dgoat/pom.xml | 20 +++++++++---------- sandbox/samples/transaction-sample/pom.xml | 8 ++++---- sandbox/samples/words-sample/pom.xml | 10 +++++----- .../configuration/config.ini | 2 +- .../subsystem-helloIsolationRef/pom.xml | 2 +- tutorials/blueprint/tutorial-assembly/pom.xml | 10 +++++----- 12 files changed, 56 insertions(+), 56 deletions(-) diff --git a/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini b/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini index c333827a1b..d9f683ecd2 100644 --- a/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini +++ b/samples/ariestrader/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 index d8cd4966eb..ef0d144b73 100644 --- 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 index bf544c9ee7..5c0d26d5f4 100644 --- a/sandbox/samples/bank/pom.xml +++ b/sandbox/samples/bank/pom.xml @@ -35,47 +35,47 @@ org.apache.aries.samples.bank bank-api - ${version} + ${project.version} org.apache.aries.samples.bank bank-biz - ${version} + ${project.version} org.apache.aries.samples.bank bank-web - ${version} + ${project.version} org.apache.aries.samples.bank bank-checkingAccount - ${version} + ${project.version} org.apache.aries.samples.bank bank-checkingAccountBindings - ${version} + ${project.version} org.apache.aries.samples.bank bank-creditCheck - ${version} + ${project.version} org.apache.aries.samples.bank bank-creditCheckBindings - ${version} + ${project.version} org.apache.aries.samples.bank bank-lineOfCreditAccount - ${version} + ${project.version} org.apache.aries.samples.bank bank-lineOfCreditAccountBindings - ${version} + ${project.version} diff --git a/sandbox/samples/dgoat/dgoat-assembly/src/main/filtered-resources/clientConfigTuscany/config.ini b/sandbox/samples/dgoat/dgoat-assembly/src/main/filtered-resources/clientConfigTuscany/config.ini index 93cb722376..f819237376 100644 --- a/sandbox/samples/dgoat/dgoat-assembly/src/main/filtered-resources/clientConfigTuscany/config.ini +++ b/sandbox/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/sandbox/samples/dgoat/dgoat-assembly/src/main/filtered-resources/serverConfigTuscany/config.ini b/sandbox/samples/dgoat/dgoat-assembly/src/main/filtered-resources/serverConfigTuscany/config.ini index 55ecd66c59..08dc76fd70 100644 --- a/sandbox/samples/dgoat/dgoat-assembly/src/main/filtered-resources/serverConfigTuscany/config.ini +++ b/sandbox/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 index 188e5a7147..031b757cac 100644 --- a/sandbox/samples/dgoat/dgoat-eba/pom.xml +++ b/sandbox/samples/dgoat/dgoat-eba/pom.xml @@ -41,32 +41,32 @@ under the License. org.apache.aries.samples.dgoat org.apache.aries.samples.dgoat.api - ${version} + ${project.version} org.apache.aries.samples.dgoat org.apache.aries.samples.dgoat.web - ${version} + ${project.version} org.apache.aries.samples.dgoat org.apache.aries.samples.dgoat.bundlecontextmodel - ${version} + ${project.version} org.apache.aries.samples.dgoat org.apache.aries.samples.dgoat.dummy - ${version} + ${project.version} org.apache.aries.samples.dgoat org.apache.aries.samples.dgoat.dummy2 - ${version} + ${project.version} org.apache.aries.samples.dgoat org.apache.aries.samples.dgoat.info.enhancer - ${version} + ${project.version} diff --git a/sandbox/samples/dgoat/pom.xml b/sandbox/samples/dgoat/pom.xml index 14f1d6573c..d2c3db9cee 100644 --- a/sandbox/samples/dgoat/pom.xml +++ b/sandbox/samples/dgoat/pom.xml @@ -34,52 +34,52 @@ org.apache.aries.samples.dgoat org.apache.aries.samples.dgoat.api - ${version} + ${project.version} org.apache.aries.samples.dgoat org.apache.aries.samples.dgoat.web - ${version} + ${project.version} org.apache.aries.samples.dgoat org.apache.aries.samples.dgoat.assembly - ${version} + ${project.version} org.apache.aries.samples.dgoat org.apache.aries.samples.dgoat.dummy - ${version} + ${project.version} org.apache.aries.samples.dgoat org.apache.aries.samples.dgoat.dummy2 - ${version} + ${project.version} org.apache.aries.samples.dgoat org.apache.aries.samples.dgoat.bundlecontextmodel - ${version} + ${project.version} ${pom.groupId} org.apache.aries.samples.dgoat.info.enhancer - ${version} + ${project.version} org.apache.aries.samples.dgoat.cxf-api cxf-api - ${version} + ${project.version} org.apache.aries.samples.dgoat.cxf-client cxf-client - ${version} + ${project.version} org.apache.aries.samples.dgoat.cxf-server cxf-server - ${version} + ${project.version} diff --git a/sandbox/samples/transaction-sample/pom.xml b/sandbox/samples/transaction-sample/pom.xml index e98e47734d..e8e10d8c94 100644 --- a/sandbox/samples/transaction-sample/pom.xml +++ b/sandbox/samples/transaction-sample/pom.xml @@ -34,22 +34,22 @@ org.apache.aries.samples osgi-jdbc-api - ${version} + ${project.version} org.apache.aries.samples osgi-jdbc-derby - ${version} + ${project.version} org.apache.aries.samples transaction-assembly - ${version} + ${project.version} org.apache.aries.samples transaction-sample-web - ${version} + ${project.version} diff --git a/sandbox/samples/words-sample/pom.xml b/sandbox/samples/words-sample/pom.xml index d989217298..f0e7bfedfa 100644 --- a/sandbox/samples/words-sample/pom.xml +++ b/sandbox/samples/words-sample/pom.xml @@ -40,27 +40,27 @@ words words-api - ${version} + ${project.version} words words-assembly - ${version} + ${project.version} words words-datasource - ${version} + ${project.version} words words-jpa - ${version} + ${project.version} words words-web - ${version} + ${project.version} diff --git a/sandbox/samples/words-sample/words-assembly/src/main/filtered-resources/configuration/config.ini b/sandbox/samples/words-sample/words-assembly/src/main/filtered-resources/configuration/config.ini index ce07acc220..4349aad515 100644 --- a/sandbox/samples/words-sample/words-assembly/src/main/filtered-resources/configuration/config.ini +++ b/sandbox/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 index 8e198655db..8ffe80b5fd 100644 --- a/subsystem/subsystem-example/subsystem-helloIsolationRef/pom.xml +++ b/subsystem/subsystem-example/subsystem-helloIsolationRef/pom.xml @@ -62,7 +62,7 @@ org.apache.aries.subsystem org.apache.aries.subsystem.example.helloIsolation - ${version} + ${project.version} provided diff --git a/tutorials/blueprint/tutorial-assembly/pom.xml b/tutorials/blueprint/tutorial-assembly/pom.xml index 04ac53a028..b278d31a53 100644 --- a/tutorials/blueprint/tutorial-assembly/pom.xml +++ b/tutorials/blueprint/tutorial-assembly/pom.xml @@ -82,31 +82,31 @@ org.apache.aries.tutorials.blueprint org.apache.aries.tutorials.blueprint.greeter.api - ${version} + ${project.version} org.apache.aries.tutorials.blueprint org.apache.aries.tutorials.blueprint.greeter.client.blueprint - ${version} + ${project.version} org.apache.aries.tutorials.blueprint org.apache.aries.tutorials.blueprint.greeter.client.osgi - ${version} + ${project.version} org.apache.aries.tutorials.blueprint org.apache.aries.tutorials.blueprint.greeter.server.blueprint - ${version} + ${project.version} org.apache.aries.tutorials.blueprint org.apache.aries.tutorials.blueprint.greeter.server.osgi - ${version} + ${project.version}