Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
alien11689 wants to merge 1 commit into from
Closed

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...ader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=\
Expand Down
2 changes: 1 addition & 1 deletion samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 9 additions & 9 deletions sandbox/samples/bank/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
12 changes: 6 additions & 6 deletions ...x/samples/dgoat/dgoat-assembly/src/main/filtered-resources/clientConfigTuscany/config.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,\
Expand Down
14 changes: 7 additions & 7 deletions ...x/samples/dgoat/dgoat-assembly/src/main/filtered-resources/serverConfigTuscany/config.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,\
Expand Down
12 changes: 6 additions & 6 deletions sandbox/samples/dgoat/dgoat-eba/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
20 changes: 10 additions & 10 deletions sandbox/samples/dgoat/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 4 additions & 4 deletions sandbox/samples/transaction-sample/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
10 changes: 5 additions & 5 deletions sandbox/samples/words-sample/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion .../samples/words-sample/words-assembly/src/main/filtered-resources/configuration/config.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion subsystem/subsystem-example/subsystem-helloIsolationRef/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
10 changes: 5 additions & 5 deletions tutorials/blueprint/tutorial-assembly/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down