From commits-return-8522-apmail-aries-commits-archive=aries.apache.org@aries.apache.org Tue May 3 09:41:12 2016 Return-Path: X-Original-To: apmail-aries-commits-archive@www.apache.org Delivered-To: apmail-aries-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1C5FD193D2 for ; Tue, 3 May 2016 09:41:12 +0000 (UTC) Received: (qmail 59020 invoked by uid 500); 3 May 2016 09:41:11 -0000 Delivered-To: apmail-aries-commits-archive@aries.apache.org Received: (qmail 58957 invoked by uid 500); 3 May 2016 09:41:11 -0000 Mailing-List: contact commits-help@aries.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@aries.apache.org Delivered-To: mailing list commits@aries.apache.org Received: (qmail 58946 invoked by uid 99); 3 May 2016 09:41:11 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 May 2016 09:41:11 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 68C7618014A for ; Tue, 3 May 2016 09:41:11 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.799 X-Spam-Level: * X-Spam-Status: No, score=1.799 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.001] autolearn=disabled Received: from mx2-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id rMmn_Sd3n88a for ; Tue, 3 May 2016 09:41:07 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx2-lw-eu.apache.org (ASF Mail Server at mx2-lw-eu.apache.org) with ESMTP id 183995F298 for ; Tue, 3 May 2016 09:41:07 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 03E7DE009C for ; Tue, 3 May 2016 09:41:05 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 104B03A039C for ; Tue, 3 May 2016 09:41:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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... Date: Tue, 03 May 2016 09:41:04 -0000 To: commits@aries.apache.org From: cschneider@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160503094105.104B03A039C@svn01-us-west.apache.org> 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 @@ 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} 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. 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} 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 @@ 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} 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 @@ 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} 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 @@ 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} 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 @@ org.apache.aries.subsystem org.apache.aries.subsystem.example.helloIsolation - ${version} + ${project.version} provided 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 @@ 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}