This is an automated email from the ASF dual-hosted git repository. alien11689 pushed a commit to branch extract-dependency-versions-to-properties in repository https://gitbox.apache.org/repos/asf/aries.git
commit 2ae2a68f4d58d00a21a6a20f61067a38d1420c66 Author: Dominik Przybysz <[email protected]> AuthorDate: Sat Jan 11 20:43:17 2025 +0100 [MAINTENANCE] Extract dependency versions to properties - application --- application/application-api/pom.xml | 14 +- application/application-bundle/pom.xml | 21 ++- application/application-converters/pom.xml | 20 ++- .../application-default-local-platform/pom.xml | 10 +- .../application-deployment-management/pom.xml | 38 +++-- application/application-distro/pom.xml | 101 +++++++------ application/application-install/pom.xml | 13 +- application/application-isolated-distro/pom.xml | 116 ++++++++------- application/application-itest-interface/pom.xml | 14 +- application/application-itests/pom.xml | 165 ++++++++++++--------- application/application-management/pom.xml | 24 +-- .../application-modeller-common-test/pom.xml | 40 +++-- .../application-modeller-standalone/pom.xml | 80 +++++----- application/application-modeller/pom.xml | 41 ++--- application/application-noop-resolver/pom.xml | 10 +- application/application-obr-resolver/pom.xml | 27 ++-- .../pom.xml | 121 ++++++++------- .../application-resolve-transform-cm/pom.xml | 13 +- .../pom.xml | 25 ++-- application/application-runtime-framework/pom.xml | 33 +++-- application/application-runtime-isolated/pom.xml | 35 +++-- application/application-runtime-repository/pom.xml | 20 ++- application/application-runtime/pom.xml | 15 +- .../pom.xml | 94 +++++++----- application/application-utils/pom.xml | 28 ++-- 25 files changed, 648 insertions(+), 470 deletions(-) diff --git a/application/application-api/pom.xml b/application/application-api/pom.xml index 6fc2e43b8..fa8328db1 100644 --- a/application/application-api/pom.xml +++ b/application/application-api/pom.xml @@ -34,7 +34,7 @@ <name>Apache Aries Application API</name> <version>1.0.1-SNAPSHOT</version> <description> - Application API. + Application API. </description> <scm> @@ -53,8 +53,10 @@ org.apache.aries.application.modelling; org.apache.aries.application.modelling.utils, </aries.osgi.export.pkg> - <aries.osgi.private.pkg /> + <aries.osgi.private.pkg/> <lastReleaseVersion>1.0.0</lastReleaseVersion> + + <org.apache.aries.util.version>1.0.0</org.apache.aries.util.version> </properties> <dependencies> @@ -63,10 +65,10 @@ <artifactId>org.osgi.core</artifactId> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.apache.aries</groupId> - <artifactId>org.apache.aries.util</artifactId> - <version>1.0.0</version> + <dependency> + <groupId>org.apache.aries</groupId> + <artifactId>org.apache.aries.util</artifactId> + <version>${org.apache.aries.util.version}</version> </dependency> </dependencies> diff --git a/application/application-bundle/pom.xml b/application/application-bundle/pom.xml index e4790f51c..fbfc496a9 100644 --- a/application/application-bundle/pom.xml +++ b/application/application-bundle/pom.xml @@ -34,8 +34,8 @@ <name>Apache Aries Application Bundle</name> <version>1.0.1-SNAPSHOT</version> <description> - This bundle is a standalone bundle to support - Aries applications. + This bundle is a standalone bundle to support + Aries applications. </description> <scm> @@ -68,28 +68,33 @@ OSGI-INF* </aries.osgi.private.pkg> <lastReleaseVersion>1.0.0</lastReleaseVersion> + + <org.apache.aries.application.api.version>1.0.0</org.apache.aries.application.api.version> + <org.apache.aries.application.management.version>1.0.0</org.apache.aries.application.management.version> + <org.apache.aries.application.runtime.version>1.0.0</org.apache.aries.application.runtime.version> + <org.apache.aries.application.utils.version>1.0.0</org.apache.aries.application.utils.version> </properties> <dependencies> <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.api</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.api.version}</version> </dependency> <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.management</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.management.version}</version> </dependency> <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.runtime</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.runtime.version}</version> </dependency> <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.utils</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.utils.version}</version> </dependency> <dependency> <groupId>org.osgi</groupId> @@ -107,7 +112,7 @@ <scope>provided</scope> </dependency> </dependencies> - + <build> <plugins> <!-- Use the shade plugin with the dependency plugin to unjar the three jars (api, core and cm) @@ -132,7 +137,7 @@ </includes> </artifactSet> <filters> - <filter> + <filter> <artifact>org.apache.aries.application:org.apache.aries.application.api</artifact> <excludes> <exclude>org/**</exclude> diff --git a/application/application-converters/pom.xml b/application/application-converters/pom.xml index b1c3c67bd..8490fda67 100644 --- a/application/application-converters/pom.xml +++ b/application/application-converters/pom.xml @@ -52,6 +52,12 @@ org.apache.aries.application.converters; </aries.osgi.private.pkg> <lastReleaseVersion>1.0.0</lastReleaseVersion> + + <asm-all.version>5.0.3</asm-all.version> + <org.apache.aries.application.api.version>1.0.0</org.apache.aries.application.api.version> + <org.apache.aries.application.utils.version>1.0.0</org.apache.aries.application.utils.version> + <org.apache.aries.testsupport.unit.version>1.0.0</org.apache.aries.testsupport.unit.version> + <org.apache.aries.web.urlhandler.version>1.0.0</org.apache.aries.web.urlhandler.version> </properties> <dependencies> @@ -59,12 +65,12 @@ <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.api</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.api.version}</version> </dependency> <dependency> - <groupId>org.apache.aries.application</groupId> - <artifactId>org.apache.aries.application.utils</artifactId> - <version>1.0.0</version> + <groupId>org.apache.aries.application</groupId> + <artifactId>org.apache.aries.application.utils</artifactId> + <version>${org.apache.aries.application.utils.version}</version> </dependency> <!-- Dependency on other Aries module bundles --> @@ -72,13 +78,13 @@ <groupId>org.apache.aries.testsupport</groupId> <artifactId>org.apache.aries.testsupport.unit</artifactId> <scope>test</scope> - <version>1.0.0</version> + <version>${org.apache.aries.testsupport.unit.version}</version> </dependency> <dependency> <groupId>org.apache.aries.web</groupId> <artifactId>org.apache.aries.web.urlhandler</artifactId> <scope>provided</scope> - <version>1.0.0</version> + <version>${org.apache.aries.web.urlhandler.version}</version> </dependency> <!--External dependencies. Versions may be specified in parent --> <dependency> @@ -95,7 +101,7 @@ <groupId>org.ow2.asm</groupId> <artifactId>asm-all</artifactId> <scope>provided</scope> - <version>5.0.3</version> + <version>${asm-all.version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> diff --git a/application/application-default-local-platform/pom.xml b/application/application-default-local-platform/pom.xml index ca481528f..ca2edda32 100644 --- a/application/application-default-local-platform/pom.xml +++ b/application/application-default-local-platform/pom.xml @@ -34,7 +34,7 @@ <name>Apache Aries Application Default local platform</name> <version>1.0.1-SNAPSHOT</version> <description> - Implementation of the default local Platform Repository + Implementation of the default local Platform Repository </description> <scm> @@ -47,13 +47,15 @@ <aries.osgi.export.pkg> </aries.osgi.export.pkg> <aries.osgi.import.pkg> - org.apache.aries.application.management.spi.runtime;provide:=true, - * + org.apache.aries.application.management.spi.runtime;provide:=true, + * </aries.osgi.import.pkg> <aries.osgi.private.pkg> org.apache.aries.application.local.platform.impl </aries.osgi.private.pkg> <lastReleaseVersion>1.0.0</lastReleaseVersion> + + <org.apache.aries.application.api.version>1.0.0</org.apache.aries.application.api.version> </properties> <dependencies> @@ -65,7 +67,7 @@ <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.api</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.api.version}</version> </dependency> </dependencies> diff --git a/application/application-deployment-management/pom.xml b/application/application-deployment-management/pom.xml index 85100c3b1..c9674ff1a 100644 --- a/application/application-deployment-management/pom.xml +++ b/application/application-deployment-management/pom.xml @@ -34,7 +34,7 @@ <name>Apache Aries Application Deployment Management</name> <version>1.0.1-SNAPSHOT</version> <description> - Deployment Manager for resolving an Aries Applications. + Deployment Manager for resolving an Aries Applications. </description> <scm> @@ -44,12 +44,18 @@ </scm> <properties> - <aries.osgi.export.pkg /> + <aries.osgi.export.pkg/> <aries.osgi.import.pkg> - org.apache.aries.application.management.spi.resolve;provide:=true, - * + org.apache.aries.application.management.spi.resolve;provide:=true, + * </aries.osgi.import.pkg> <lastReleaseVersion>1.0.0</lastReleaseVersion> + + <org.apache.aries.application.api.version>1.0.0</org.apache.aries.application.api.version> + <org.apache.aries.application.modeller.version>1.0.0</org.apache.aries.application.modeller.version> + <org.apache.aries.application.utils.version>1.0.0</org.apache.aries.application.utils.version> + <org.apache.aries.testsupport.unit.version>1.0.0</org.apache.aries.testsupport.unit.version> + <org.apache.aries.util.version>1.0.0</org.apache.aries.util.version> </properties> <dependencies> @@ -59,15 +65,15 @@ property not set" error. --> <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> - <scope>provided</scope> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.aries.testsupport</groupId> <artifactId>org.apache.aries.testsupport.unit</artifactId> <scope>test</scope> - <version>1.0.0</version> + <version>${org.apache.aries.testsupport.unit.version}</version> </dependency> <dependency> <groupId>junit</groupId> @@ -77,12 +83,12 @@ <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.api</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.api.version}</version> </dependency> <dependency> - <groupId>org.apache.aries</groupId> - <artifactId>org.apache.aries.util</artifactId> - <version>1.0.0</version> + <groupId>org.apache.aries</groupId> + <artifactId>org.apache.aries.util</artifactId> + <version>${org.apache.aries.util.version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> @@ -95,14 +101,14 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.aries.application</groupId> - <artifactId>org.apache.aries.application.utils</artifactId> - <version>1.0.0</version> + <groupId>org.apache.aries.application</groupId> + <artifactId>org.apache.aries.application.utils</artifactId> + <version>${org.apache.aries.application.utils.version}</version> </dependency> <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.modeller</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.modeller.version}</version> </dependency> </dependencies> diff --git a/application/application-distro/pom.xml b/application/application-distro/pom.xml index a5c532abf..8cfd96a5b 100644 --- a/application/application-distro/pom.xml +++ b/application/application-distro/pom.xml @@ -19,18 +19,18 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.aries</groupId> - <artifactId>parent</artifactId> - <version>2.0.0</version> - <relativePath>../../parent/pom.xml</relativePath> + <groupId>org.apache.aries</groupId> + <artifactId>parent</artifactId> + <version>2.0.0</version> + <relativePath>../../parent/pom.xml</relativePath> </parent> - <groupId>org.apache.aries.application</groupId> - <artifactId>org.apache.aries.application-distro</artifactId> - <name>Application distribution</name> + <groupId>org.apache.aries.application</groupId> + <artifactId>org.apache.aries.application-distro</artifactId> + <name>Application distribution</name> <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> @@ -40,74 +40,87 @@ <url>https://gitbox.apache.org/repos/asf?p=aries.git;a=summary</url> </scm> + <properties> + <maven-assembly-plugin.version>2.2-beta-5</maven-assembly-plugin.version> + <org.apache.aries.application.api.version>1.0.0</org.apache.aries.application.api.version> + <org.apache.aries.application.default.local.platform.version>1.0.0</org.apache.aries.application.default.local.platform.version> + <org.apache.aries.application.deployment.management.version>1.0.0</org.apache.aries.application.deployment.management.version> + <org.apache.aries.application.install.version>1.0.0</org.apache.aries.application.install.version> + <org.apache.aries.application.management.version>1.0.0</org.apache.aries.application.management.version> + <org.apache.aries.application.modeller.version>1.0.0</org.apache.aries.application.modeller.version> + <org.apache.aries.application.resolver.obr.version>1.0.0</org.apache.aries.application.resolver.obr.version> + <org.apache.aries.application.runtime.version>1.0.0</org.apache.aries.application.runtime.version> + <org.apache.aries.application.utils.version>1.0.0</org.apache.aries.application.utils.version> + </properties> + <dependencies> - <dependency> + <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.runtime</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.runtime.version}</version> </dependency> - <dependency> + <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.resolver.obr</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.resolver.obr.version}</version> </dependency> - <dependency> + <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.install</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.install.version}</version> </dependency> - <dependency> + <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.api</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.api.version}</version> </dependency> - <dependency> + <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.management</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.management.version}</version> </dependency> - <dependency> + <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.utils</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.utils.version}</version> </dependency> - <dependency> + <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.modeller</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.modeller.version}</version> </dependency> - <dependency> + <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.default.local.platform</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.default.local.platform.version}</version> </dependency> - <dependency> + <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.deployment.management</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.deployment.management.version}</version> </dependency> </dependencies> <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-5</version> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>${maven-assembly-plugin.version}</version> <executions> - <execution> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptors> - <descriptor>src/main/assemblies/application-distro.xml</descriptor> - </descriptors> - </configuration> - </execution> + <execution> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>src/main/assemblies/application-distro.xml</descriptor> + </descriptors> + </configuration> + </execution> </executions> - </plugin> - </plugins> - </build> + </plugin> + </plugins> + </build> </project> diff --git a/application/application-install/pom.xml b/application/application-install/pom.xml index 666553610..bdc302587 100644 --- a/application/application-install/pom.xml +++ b/application/application-install/pom.xml @@ -45,6 +45,11 @@ <properties> <lastReleaseVersion>1.0.0</lastReleaseVersion> + + <org.apache.aries.application.api.version>1.0.0</org.apache.aries.application.api.version> + <org.apache.aries.application.utils.version>1.0.0</org.apache.aries.application.utils.version> + <org.apache.aries.testsupport.unit.version>1.0.0</org.apache.aries.testsupport.unit.version> + <org.apache.felix.fileinstall.version>3.1.4</org.apache.felix.fileinstall.version> </properties> @@ -52,12 +57,12 @@ <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.fileinstall</artifactId> - <version>3.1.4</version> + <version>${org.apache.felix.fileinstall.version}</version> </dependency> <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.api</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.api.version}</version> </dependency> <dependency> <groupId>junit</groupId> @@ -68,7 +73,7 @@ <groupId>org.apache.aries.testsupport</groupId> <artifactId>org.apache.aries.testsupport.unit</artifactId> <scope>test</scope> - <version>1.0.0</version> + <version>${org.apache.aries.testsupport.unit.version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> @@ -93,7 +98,7 @@ <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.utils</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.utils.version}</version> </dependency> </dependencies> diff --git a/application/application-isolated-distro/pom.xml b/application/application-isolated-distro/pom.xml index d8a942bf2..4097cf999 100644 --- a/application/application-isolated-distro/pom.xml +++ b/application/application-isolated-distro/pom.xml @@ -19,18 +19,18 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.aries</groupId> - <artifactId>parent</artifactId> - <version>2.0.0</version> - <relativePath>../../parent/pom.xml</relativePath> + <groupId>org.apache.aries</groupId> + <artifactId>parent</artifactId> + <version>2.0.0</version> + <relativePath>../../parent/pom.xml</relativePath> </parent> - <groupId>org.apache.aries.application</groupId> - <artifactId>org.apache.aries.application-isolated-distro</artifactId> - <name>Application distribution for isolated application support</name> + <groupId>org.apache.aries.application</groupId> + <artifactId>org.apache.aries.application-isolated-distro</artifactId> + <name>Application distribution for isolated application support</name> <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> @@ -40,89 +40,105 @@ <url>https://gitbox.apache.org/repos/asf?p=aries.git;a=summary</url> </scm> + <properties> + <maven-assembly-plugin.version>2.2-beta-5</maven-assembly-plugin.version> + <org.apache.aries.application.api.version>1.0.0</org.apache.aries.application.api.version> + <org.apache.aries.application.default.local.platform.version>1.0.0</org.apache.aries.application.default.local.platform.version> + <org.apache.aries.application.deployment.management.version>1.0.0</org.apache.aries.application.deployment.management.version> + <org.apache.aries.application.install.version>1.0.0</org.apache.aries.application.install.version> + <org.apache.aries.application.management.version>1.0.0</org.apache.aries.application.management.version> + <org.apache.aries.application.modeller.version>1.0.0</org.apache.aries.application.modeller.version> + <org.apache.aries.application.resolver.obr.version>1.0.0</org.apache.aries.application.resolver.obr.version> + <org.apache.aries.application.runtime.framework.management.version>1.0.0</org.apache.aries.application.runtime.framework.management.version> + <org.apache.aries.application.runtime.framework.version>1.0.0</org.apache.aries.application.runtime.framework.version> + <org.apache.aries.application.runtime.isolated.version>1.0.0</org.apache.aries.application.runtime.isolated.version> + <org.apache.aries.application.runtime.repository.version>1.0.0</org.apache.aries.application.runtime.repository.version> + <org.apache.aries.application.utils.version>1.0.0</org.apache.aries.application.utils.version> + </properties> + <dependencies> - <dependency> + <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.runtime.isolated</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.runtime.isolated.version}</version> </dependency> - <dependency> + <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.runtime.framework</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.runtime.framework.version}</version> </dependency> - <dependency> + <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.runtime.framework.management</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.runtime.framework.management.version}</version> </dependency> - <dependency> + <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.runtime.repository</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.runtime.repository.version}</version> </dependency> - <dependency> + <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.resolver.obr</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.resolver.obr.version}</version> </dependency> - <dependency> + <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.install</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.install.version}</version> </dependency> - <dependency> + <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.api</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.api.version}</version> </dependency> - <dependency> + <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.management</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.management.version}</version> </dependency> - <dependency> + <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.utils</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.utils.version}</version> </dependency> - <dependency> + <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.modeller</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.modeller.version}</version> </dependency> - <dependency> + <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.default.local.platform</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.default.local.platform.version}</version> </dependency> - <dependency> + <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.deployment.management</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.deployment.management.version}</version> </dependency> </dependencies> <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-5</version> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>${maven-assembly-plugin.version}</version> <executions> - <execution> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptors> - <descriptor>src/main/assemblies/application-isolated-distro.xml</descriptor> - </descriptors> - </configuration> - </execution> + <execution> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>src/main/assemblies/application-isolated-distro.xml</descriptor> + </descriptors> + </configuration> + </execution> </executions> - </plugin> - </plugins> - </build> + </plugin> + </plugins> + </build> </project> diff --git a/application/application-itest-interface/pom.xml b/application/application-itest-interface/pom.xml index e1bf8ac43..95df460d0 100644 --- a/application/application-itest-interface/pom.xml +++ b/application/application-itest-interface/pom.xml @@ -34,7 +34,7 @@ <name>Apache Aries Application itests sample application interface</name> <version>1.0.1-SNAPSHOT</version> <description> - Interface class(es) for aplication runtime itests. + Interface class(es) for aplication runtime itests. </description> <scm> @@ -43,12 +43,12 @@ <url>https://gitbox.apache.org/repos/asf?p=aries.git;a=summary</url> </scm> - <properties> + <properties> <!-- Export package versions are maintained in packageinfo files --> - <aries.osgi.export.pkg> - org.apache.aries.sample - </aries.osgi.export.pkg> - <aries.osgi.private.pkg /> - </properties> + <aries.osgi.export.pkg> + org.apache.aries.sample + </aries.osgi.export.pkg> + <aries.osgi.private.pkg/> + </properties> </project> diff --git a/application/application-itests/pom.xml b/application/application-itests/pom.xml index 0470c3a2d..145ea5b16 100644 --- a/application/application-itests/pom.xml +++ b/application/application-itests/pom.xml @@ -44,7 +44,30 @@ </scm> <properties> + <asm-all.version>5.0.3</asm-all.version> + <depends-maven-plugin.version>1.3</depends-maven-plugin.version> <exam.version>4.5.0</exam.version> + <geronimo-jta_1.1_spec.version>1.1.1</geronimo-jta_1.1_spec.version> + <org.apache.aries.application.default.local.platform.version>1.0.0</org.apache.aries.application.default.local.platform.version> + <org.apache.aries.application.management.version>1.0.0</org.apache.aries.application.management.version> + <org.apache.aries.application.resolve.transform.cm.version>1.0.0</org.apache.aries.application.resolve.transform.cm.version> + <org.apache.aries.application.resolver.noop.version>1.0.0</org.apache.aries.application.resolver.noop.version> + <org.apache.aries.application.resolver.obr.version>1.0.0</org.apache.aries.application.resolver.obr.version> + <org.apache.aries.application.runtime.framework.management.version>1.0.0</org.apache.aries.application.runtime.framework.management.version> + <org.apache.aries.application.runtime.framework.version>1.0.0</org.apache.aries.application.runtime.framework.version> + <org.apache.aries.application.runtime.isolated.version>1.0.0</org.apache.aries.application.runtime.isolated.version> + <org.apache.aries.application.runtime.itest.interfaces.version>1.0.0</org.apache.aries.application.runtime.itest.interfaces.version> + <org.apache.aries.application.runtime.repository.version>1.0.0</org.apache.aries.application.runtime.repository.version> + <org.apache.aries.application.runtime.version>1.0.0</org.apache.aries.application.runtime.version> + <org.apache.aries.application.utils.version>1.0.0</org.apache.aries.application.utils.version> + <org.apache.aries.blueprint.version>1.0.0</org.apache.aries.blueprint.version> + <org.apache.aries.proxy.version>1.0.2-SNAPSHOT</org.apache.aries.proxy.version> + <org.apache.aries.testsupport.unit.version>2.0.0-SNAPSHOT</org.apache.aries.testsupport.unit.version> + <org.apache.aries.transaction.blueprint.version>1.0.0</org.apache.aries.transaction.blueprint.version> + <org.apache.aries.util.version>1.0.0</org.apache.aries.util.version> + <org.apache.felix.bundlerepository.version>1.6.4</org.apache.felix.bundlerepository.version> + <org.apache.felix.configadmin.version>1.2.4</org.apache.felix.configadmin.version> + <org.eclipse.osgi.version>3.8.0.v20120529-1548</org.eclipse.osgi.version> <url.version>2.2.0</url.version> </properties> @@ -58,35 +81,35 @@ <dependency> <groupId>org.eclipse</groupId> <artifactId>org.eclipse.osgi</artifactId> - <version>3.8.0.v20120529-1548</version> + <version>${org.eclipse.osgi.version}</version> <scope>test</scope> </dependency> <!-- logging --> - <dependency> - <groupId>org.ops4j.pax.logging</groupId> - <artifactId>pax-logging-api</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.ops4j.pax.logging</groupId> - <artifactId>pax-logging-service</artifactId> - <scope>test</scope> - </dependency> + <dependency> + <groupId>org.ops4j.pax.logging</groupId> + <artifactId>pax-logging-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.ops4j.pax.logging</groupId> + <artifactId>pax-logging-service</artifactId> + <scope>test</scope> + </dependency> <!-- pax exam --> - <dependency> - <groupId>org.ops4j.pax.exam</groupId> - <artifactId>pax-exam</artifactId> + <dependency> + <groupId>org.ops4j.pax.exam</groupId> + <artifactId>pax-exam</artifactId> <version>${exam.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.ops4j.pax.exam</groupId> - <artifactId>pax-exam-junit4</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.ops4j.pax.exam</groupId> + <artifactId>pax-exam-junit4</artifactId> <version>${exam.version}</version> - <scope>test</scope> - </dependency> + <scope>test</scope> + </dependency> <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam-container-native</artifactId> @@ -108,7 +131,7 @@ <dependency> <groupId>org.apache.aries.testsupport</groupId> <artifactId>org.apache.aries.testsupport.unit</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>${org.apache.aries.testsupport.unit.version}</version> <scope>test</scope> </dependency> @@ -116,7 +139,7 @@ <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.configadmin</artifactId> - <version>1.2.4</version> + <version>${org.apache.felix.configadmin.version}</version> <exclusions> <exclusion> <groupId>org.apache.felix</groupId> @@ -131,124 +154,124 @@ <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.bundlerepository</artifactId> - <version>1.6.4</version> + <version>${org.apache.felix.bundlerepository.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.aries</groupId> <artifactId>org.apache.aries.util</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.util.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.aries.blueprint</groupId> <artifactId>org.apache.aries.blueprint</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.blueprint.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.aries.proxy</groupId> <artifactId>org.apache.aries.proxy</artifactId> - <version>1.0.2-SNAPSHOT</version> + <version>${org.apache.aries.proxy.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ow2.asm</groupId> <artifactId>asm-all</artifactId> - <version>5.0.3</version> + <version>${asm-all.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.utils</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.utils.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.runtime.itest.interfaces</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.runtime.itest.interfaces.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.management</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.management.version}</version> <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.aries.application</groupId> - <artifactId>org.apache.aries.application.runtime.framework</artifactId> - <version>1.0.0</version> - <scope>test</scope> + <groupId>org.apache.aries.application</groupId> + <artifactId>org.apache.aries.application.runtime.framework</artifactId> + <version>${org.apache.aries.application.runtime.framework.version}</version> + <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.aries.application</groupId> - <artifactId>org.apache.aries.application.runtime.framework.management</artifactId> - <version>1.0.0</version> - <scope>test</scope> + <groupId>org.apache.aries.application</groupId> + <artifactId>org.apache.aries.application.runtime.framework.management</artifactId> + <version>${org.apache.aries.application.runtime.framework.management.version}</version> + <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.aries.application</groupId> - <artifactId>org.apache.aries.application.runtime.repository</artifactId> - <version>1.0.0</version> - <scope>test</scope> + <groupId>org.apache.aries.application</groupId> + <artifactId>org.apache.aries.application.runtime.repository</artifactId> + <version>${org.apache.aries.application.runtime.repository.version}</version> + <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.aries.application</groupId> - <artifactId>org.apache.aries.application.runtime.isolated</artifactId> - <version>1.0.0</version> - <scope>test</scope> + <groupId>org.apache.aries.application</groupId> + <artifactId>org.apache.aries.application.runtime.isolated</artifactId> + <version>${org.apache.aries.application.runtime.isolated.version}</version> + <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.aries.application</groupId> - <artifactId>org.apache.aries.application.runtime</artifactId> - <version>1.0.0</version> - <scope>test</scope> + <groupId>org.apache.aries.application</groupId> + <artifactId>org.apache.aries.application.runtime</artifactId> + <version>${org.apache.aries.application.runtime.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.resolver.obr</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.resolver.obr.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.resolver.noop</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.resolver.noop.version}</version> <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.aries.application</groupId> - <artifactId>org.apache.aries.application.resolve.transform.cm</artifactId> - <version>1.0.0</version> - </dependency> + <groupId>org.apache.aries.application</groupId> + <artifactId>org.apache.aries.application.resolve.transform.cm</artifactId> + <version>${org.apache.aries.application.resolve.transform.cm.version}</version> + </dependency> <dependency> - <groupId>org.apache.aries.application</groupId> - <artifactId>org.apache.aries.application.default.local.platform</artifactId> - <version>1.0.0</version> - <scope>test</scope> + <groupId>org.apache.aries.application</groupId> + <artifactId>org.apache.aries.application.default.local.platform</artifactId> + <version>${org.apache.aries.application.default.local.platform.version}</version> + <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.aries.transaction</groupId> - <artifactId>org.apache.aries.transaction.blueprint</artifactId> - <version>1.0.0</version> - <scope>test</scope> + <groupId>org.apache.aries.transaction</groupId> + <artifactId>org.apache.aries.transaction.blueprint</artifactId> + <version>${org.apache.aries.transaction.blueprint.version}</version> + <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jta_1.1_spec</artifactId> - <version>1.1.1</version> - <scope>test</scope> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jta_1.1_spec</artifactId> + <version>${geronimo-jta_1.1_spec.version}</version> + <scope>test</scope> </dependency> </dependencies> <build> <plugins> - <plugin> + <plugin> <groupId>org.apache.servicemix.tooling</groupId> <artifactId>depends-maven-plugin</artifactId> - <version>1.3</version> + <version>${depends-maven-plugin.version}</version> <executions> <execution> <id>generate-depends-file</id> diff --git a/application/application-management/pom.xml b/application/application-management/pom.xml index 5e1f46ef3..3577cecc7 100644 --- a/application/application-management/pom.xml +++ b/application/application-management/pom.xml @@ -34,7 +34,7 @@ <name>Apache Aries Application Management</name> <version>1.0.1-SNAPSHOT</version> <description> - Implementation of the application management API + Implementation of the application management API </description> <scm> @@ -47,17 +47,21 @@ <aries.osgi.export.pkg> </aries.osgi.export.pkg> <aries.osgi.import.pkg> - org.apache.aries.application.management;provide:=true, - org.apache.aries.application.management.spi.repository;provide:=true, - org.apache.aries.application.management.spi.resolve;provide:=true, - * + org.apache.aries.application.management;provide:=true, + org.apache.aries.application.management.spi.repository;provide:=true, + org.apache.aries.application.management.spi.resolve;provide:=true, + * </aries.osgi.import.pkg> <aries.osgi.private.pkg> org.apache.aries.application.management.impl; - org.apache.aries.application.management.internal; - org.apache.aries.application.management.repository + org.apache.aries.application.management.internal; + org.apache.aries.application.management.repository </aries.osgi.private.pkg> <lastReleaseVersion>1.0.0</lastReleaseVersion> + + <org.apache.aries.application.deployment.management.version>1.0.0</org.apache.aries.application.deployment.management.version> + <org.apache.aries.application.utils.version>1.0.0</org.apache.aries.application.utils.version> + <org.apache.aries.testsupport.unit.version>1.0.0</org.apache.aries.testsupport.unit.version> </properties> <dependencies> @@ -69,18 +73,18 @@ <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.utils</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.utils.version}</version> </dependency> <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.deployment.management</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.deployment.management.version}</version> </dependency> <dependency> <groupId>org.apache.aries.testsupport</groupId> <artifactId>org.apache.aries.testsupport.unit</artifactId> <scope>test</scope> - <version>1.0.0</version> + <version>${org.apache.aries.testsupport.unit.version}</version> </dependency> <dependency> <groupId>org.osgi</groupId> diff --git a/application/application-modeller-common-test/pom.xml b/application/application-modeller-common-test/pom.xml index 1d26056d5..33ffc7008 100644 --- a/application/application-modeller-common-test/pom.xml +++ b/application/application-modeller-common-test/pom.xml @@ -34,7 +34,7 @@ <name>Apache Aries Application Modelling tests</name> <version>1.0.1-SNAPSHOT</version> <description> - Modelling utilities for working with Aries Applications (distribution for offline use). + Modelling utilities for working with Aries Applications (distribution for offline use). </description> <scm> @@ -43,11 +43,19 @@ <url>https://gitbox.apache.org/repos/asf?p=aries.git;a=summary</url> </scm> + <properties> + <application-modeller-standalone.version>1.0.0</application-modeller-standalone.version> + <org.apache.aries.blueprint.core.version>1.0.0</org.apache.aries.blueprint.core.version> + <org.apache.aries.testsupport.unit.version>1.0.0</org.apache.aries.testsupport.unit.version> + <org.osgi.compendium.version>4.2.0</org.osgi.compendium.version> + <org.osgi.core.version>4.2.0</org.osgi.core.version> + </properties> + <dependencies> <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>application-modeller-standalone</artifactId> - <version>1.0.0</version> + <version>${application-modeller-standalone.version}</version> </dependency> <dependency> <groupId>junit</groupId> @@ -55,16 +63,16 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> - <version>4.2.0</version> - <scope>test</scope> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + <version>${org.osgi.core.version}</version> + <scope>test</scope> </dependency> <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.compendium</artifactId> - <version>4.2.0</version> - <scope>test</scope> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.compendium</artifactId> + <version>${org.osgi.compendium.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> @@ -80,17 +88,17 @@ <groupId>org.apache.aries.testsupport</groupId> <artifactId>org.apache.aries.testsupport.unit</artifactId> <scope>test</scope> - <version>1.0.0</version> + <version>${org.apache.aries.testsupport.unit.version}</version> </dependency> <dependency> <groupId>org.apache.aries.blueprint</groupId> <artifactId>org.apache.aries.blueprint.core</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.blueprint.core.version}</version> <exclusions> - <exclusion> - <groupId>org.apache.aries.proxy</groupId> - <artifactId>org.apache.aries.proxy.api</artifactId> - </exclusion> + <exclusion> + <groupId>org.apache.aries.proxy</groupId> + <artifactId>org.apache.aries.proxy.api</artifactId> + </exclusion> </exclusions> </dependency> </dependencies> diff --git a/application/application-modeller-standalone/pom.xml b/application/application-modeller-standalone/pom.xml index 381c88e5f..9c2c88523 100644 --- a/application/application-modeller-standalone/pom.xml +++ b/application/application-modeller-standalone/pom.xml @@ -34,7 +34,7 @@ <name>Apache Aries Application Modelling Standalone</name> <version>1.0.1-SNAPSHOT</version> <description> - Modelling utilities for working with Aries Applications (distribution for offline use). + Modelling utilities for working with Aries Applications (distribution for offline use). </description> <scm> @@ -43,70 +43,80 @@ <url>https://gitbox.apache.org/repos/asf?p=aries.git;a=summary</url> </scm> + <properties> + <blueprint-parser.version>1.0.0</blueprint-parser.version> + <org.apache.aries.application.api.version>1.0.0</org.apache.aries.application.api.version> + <org.apache.aries.application.modeller.version>1.0.0</org.apache.aries.application.modeller.version> + <org.apache.aries.application.utils.version>1.0.0</org.apache.aries.application.utils.version> + <org.apache.aries.blueprint.api.version>1.0.0</org.apache.aries.blueprint.api.version> + <org.apache.aries.ejb.modeller.version>1.0.0</org.apache.aries.ejb.modeller.version> + <org.apache.aries.util.version>1.0.0</org.apache.aries.util.version> + </properties> + <dependencies> <dependency> <groupId>org.apache.aries</groupId> <artifactId>org.apache.aries.util</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.util.version}</version> </dependency> <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.api</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.api.version}</version> </dependency> <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.modeller</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.modeller.version}</version> <exclusions> - <exclusion> - <groupId>org.apache.aries.blueprint</groupId> - <artifactId>org.apache.aries.blueprint.core</artifactId> - </exclusion> + <exclusion> + <groupId>org.apache.aries.blueprint</groupId> + <artifactId>org.apache.aries.blueprint.core</artifactId> + </exclusion> </exclusions> </dependency> <dependency> - <groupId>org.apache.aries.application</groupId> - <artifactId>org.apache.aries.application.utils</artifactId> - <version>1.0.0</version> + <groupId>org.apache.aries.application</groupId> + <artifactId>org.apache.aries.application.utils</artifactId> + <version>${org.apache.aries.application.utils.version}</version> </dependency> <dependency> - <groupId>org.apache.aries.blueprint</groupId> - <artifactId>org.apache.aries.blueprint.api</artifactId> - <version>1.0.0</version> + <groupId>org.apache.aries.blueprint</groupId> + <artifactId>org.apache.aries.blueprint.api</artifactId> + <version>${org.apache.aries.blueprint.api.version}</version> </dependency> <dependency> <groupId>org.apache.aries.blueprint</groupId> <artifactId>blueprint-parser</artifactId> - <version>1.0.0</version> + <version>${blueprint-parser.version}</version> </dependency> <dependency> <groupId>org.apache.aries.ejb</groupId> <artifactId>org.apache.aries.ejb.modeller</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.ejb.modeller.version}</version> </dependency> </dependencies> <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptorRefs> - <descriptorRef>jar-with-dependencies</descriptorRef> - </descriptorRefs> - </configuration> - <executions> - <execution> - <id>jar-with-dependencies</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptorRefs> + <descriptorRef>jar-with-dependencies</descriptorRef> + </descriptorRefs> + </configuration> + <executions> + <execution> + <id>jar-with-dependencies</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> </build> </project> diff --git a/application/application-modeller/pom.xml b/application/application-modeller/pom.xml index bab4a7b28..e4fafaf3f 100644 --- a/application/application-modeller/pom.xml +++ b/application/application-modeller/pom.xml @@ -34,7 +34,7 @@ <name>Apache Aries Application Modelling</name> <version>1.0.1-SNAPSHOT</version> <description> - Modelling utilities for working with Aries Applications. + Modelling utilities for working with Aries Applications. </description> <scm> @@ -44,18 +44,25 @@ </scm> <properties> - <aries.osgi.private.pkg> + <aries.osgi.private.pkg> org.apache.aries.application.modelling.impl; org.apache.aries.application.modelling.internal; org.apache.aries.application.modelling.utils.impl </aries.osgi.private.pkg> - <aries.osgi.export.pkg /> - <aries.osgi.import.pkg> + <aries.osgi.export.pkg/> + <aries.osgi.import.pkg> org.apache.aries.application.modelling;provide:=true, org.apache.aries.application.modelling.utils;provide:=true, * </aries.osgi.import.pkg> <lastReleaseVersion>1.0.0</lastReleaseVersion> + + <org.apache.aries.application.api.version>1.0.0</org.apache.aries.application.api.version> + <org.apache.aries.application.utils.version>1.0.0</org.apache.aries.application.utils.version> + <org.apache.aries.blueprint.core.version>1.2.0</org.apache.aries.blueprint.core.version> + <org.apache.aries.jndi.api.version>1.0.0</org.apache.aries.jndi.api.version> + <org.apache.aries.testsupport.unit.version>1.0.0</org.apache.aries.testsupport.unit.version> + <org.apache.aries.util.version>1.0.0</org.apache.aries.util.version> </properties> <dependencies> @@ -67,24 +74,24 @@ <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.api</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.api.version}</version> </dependency> <dependency> - <groupId>org.apache.aries</groupId> - <artifactId>org.apache.aries.util</artifactId> - <version>1.0.0</version> + <groupId>org.apache.aries</groupId> + <artifactId>org.apache.aries.util</artifactId> + <version>${org.apache.aries.util.version}</version> </dependency> <dependency> <groupId>org.apache.aries.testsupport</groupId> <artifactId>org.apache.aries.testsupport.unit</artifactId> <scope>test</scope> - <version>1.0.0</version> + <version>${org.apache.aries.testsupport.unit.version}</version> </dependency> <dependency> <groupId>org.apache.aries.jndi</groupId> <artifactId>org.apache.aries.jndi.api</artifactId> <scope>provided</scope> - <version>1.0.0</version> + <version>${org.apache.aries.jndi.api.version}</version> </dependency> <!-- Blueprint API must come before OSGi compendium because we want to compile against the Java 5 interfaces @@ -92,7 +99,7 @@ <dependency> <groupId>org.apache.aries.blueprint</groupId> <artifactId>org.apache.aries.blueprint.core</artifactId> - <version>1.2.0</version> + <version>${org.apache.aries.blueprint.core.version}</version> </dependency> <dependency> @@ -101,9 +108,9 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.compendium</artifactId> - <scope>provided</scope> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.compendium</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> @@ -116,9 +123,9 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.aries.application</groupId> - <artifactId>org.apache.aries.application.utils</artifactId> - <version>1.0.0</version> + <groupId>org.apache.aries.application</groupId> + <artifactId>org.apache.aries.application.utils</artifactId> + <version>${org.apache.aries.application.utils.version}</version> </dependency> </dependencies> diff --git a/application/application-noop-resolver/pom.xml b/application/application-noop-resolver/pom.xml index 715f5558f..ad441f5a3 100644 --- a/application/application-noop-resolver/pom.xml +++ b/application/application-noop-resolver/pom.xml @@ -34,7 +34,7 @@ <name>Apache Aries Application No-op Resolver</name> <version>1.0.1-SNAPSHOT</version> <description> - Dummy implementation of the AriesApplicationResolver + Dummy implementation of the AriesApplicationResolver </description> <scm> @@ -47,13 +47,15 @@ <aries.osgi.export.pkg> </aries.osgi.export.pkg> <aries.osgi.import.pkg> - org.apache.aries.application.management.spi.resolve;provide:=true, - * + org.apache.aries.application.management.spi.resolve;provide:=true, + * </aries.osgi.import.pkg> <aries.osgi.private.pkg> org.apache.aries.application.resolver.noop.impl </aries.osgi.private.pkg> <lastReleaseVersion>1.0.0</lastReleaseVersion> + + <org.apache.aries.application.api.version>1.0.0</org.apache.aries.application.api.version> </properties> <dependencies> @@ -65,7 +67,7 @@ <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.api</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.api.version}</version> </dependency> </dependencies> diff --git a/application/application-obr-resolver/pom.xml b/application/application-obr-resolver/pom.xml index df0d0404c..bec93da60 100644 --- a/application/application-obr-resolver/pom.xml +++ b/application/application-obr-resolver/pom.xml @@ -34,7 +34,7 @@ <version>1.0.1-SNAPSHOT</version> <name>Apache Aries Application OBR Resolver</name> <description> - Implementation of the AriesApplicationResolver using OBR + Implementation of the AriesApplicationResolver using OBR </description> <scm> @@ -49,10 +49,10 @@ org.apache.aries.application.resolver.obr.ext; </aries.osgi.export.pkg> <aries.osgi.import.pkg> - org.apache.aries.application.modelling;provide:=true, - org.apache.aries.application.management.spi.repository;provide:=true, - org.apache.aries.application.management.spi.resolve;provide:=true, - * + org.apache.aries.application.modelling;provide:=true, + org.apache.aries.application.management.spi.repository;provide:=true, + org.apache.aries.application.management.spi.resolve;provide:=true, + * </aries.osgi.import.pkg> <aries.osgi.private.pkg> org.apache.aries.application.resolver.obr; @@ -60,6 +60,11 @@ org.apache.aries.application.resolver.internal; </aries.osgi.private.pkg> <lastReleaseVersion>1.0.0</lastReleaseVersion> + + <org.apache.aries.application.api.version>1.0.0</org.apache.aries.application.api.version> + <org.apache.aries.application.utils.version>1.0.0</org.apache.aries.application.utils.version> + <org.apache.aries.testsupport.unit.version>1.0.0</org.apache.aries.testsupport.unit.version> + <org.apache.felix.bundlerepository.version>1.6.4</org.apache.felix.bundlerepository.version> </properties> <dependencies> @@ -71,12 +76,12 @@ <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.api</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.api.version}</version> </dependency> <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.utils</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.utils.version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> @@ -89,15 +94,15 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.bundlerepository</artifactId> - <version>1.6.4</version> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.bundlerepository</artifactId> + <version>${org.apache.felix.bundlerepository.version}</version> </dependency> <dependency> <groupId>org.apache.aries.testsupport</groupId> <artifactId>org.apache.aries.testsupport.unit</artifactId> <scope>test</scope> - <version>1.0.0</version> + <version>${org.apache.aries.testsupport.unit.version}</version> </dependency> <dependency> <groupId>junit</groupId> diff --git a/application/application-resolve-transform-cm-itests/pom.xml b/application/application-resolve-transform-cm-itests/pom.xml index 64ec384d8..163a0ccd3 100644 --- a/application/application-resolve-transform-cm-itests/pom.xml +++ b/application/application-resolve-transform-cm-itests/pom.xml @@ -47,24 +47,37 @@ <aries.osgi.private.pkg> org.apache.aries.application.resolve.transform.cm.itests; </aries.osgi.private.pkg> + + <asm-all.version>5.0.3</asm-all.version> + <depends-maven-plugin.version>1.3</depends-maven-plugin.version> + <org.apache.aries.application.api.version>1.0.0</org.apache.aries.application.api.version> + <org.apache.aries.application.resolve.transform.cm.version>1.0.0</org.apache.aries.application.resolve.transform.cm.version> + <org.apache.aries.application.utils.version>1.0.0</org.apache.aries.application.utils.version> + <org.apache.aries.blueprint.version>1.0.0</org.apache.aries.blueprint.version> + <org.apache.aries.proxy.version>1.0.2-SNAPSHOT</org.apache.aries.proxy.version> + <org.apache.aries.testsupport.unit.version>2.0.0-SNAPSHOT</org.apache.aries.testsupport.unit.version> + <org.apache.aries.util.version>1.0.0</org.apache.aries.util.version> + <org.eclipse.osgi.version>3.8.0.v20120529-1548</org.eclipse.osgi.version> + <pax-exam.version>3.4.0</pax-exam.version> + <pax-url-aether.version>1.6.0</pax-url-aether.version> </properties> <dependencies> <!-- application bundles --> <dependency> - <groupId>org.apache.aries.application</groupId> - <artifactId>org.apache.aries.application.resolve.transform.cm</artifactId> - <version>1.0.0</version> + <groupId>org.apache.aries.application</groupId> + <artifactId>org.apache.aries.application.resolve.transform.cm</artifactId> + <version>${org.apache.aries.application.resolve.transform.cm.version}</version> </dependency> <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.api</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.api.version}</version> </dependency> <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.utils</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.utils.version}</version> </dependency> <!-- framework and test bundles--> @@ -81,83 +94,83 @@ <dependency> <groupId>org.eclipse</groupId> <artifactId>org.eclipse.osgi</artifactId> - <version>3.8.0.v20120529-1548</version> + <version>${org.eclipse.osgi.version}</version> <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.aries</groupId> - <artifactId>org.apache.aries.util</artifactId> - <version>1.0.0</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.aries.blueprint</groupId> - <artifactId>org.apache.aries.blueprint</artifactId> - <version>1.0.0</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.aries.proxy</groupId> - <artifactId>org.apache.aries.proxy</artifactId> - <version>1.0.2-SNAPSHOT</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.ow2.asm</groupId> + <groupId>org.apache.aries</groupId> + <artifactId>org.apache.aries.util</artifactId> + <version>${org.apache.aries.util.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.aries.blueprint</groupId> + <artifactId>org.apache.aries.blueprint</artifactId> + <version>${org.apache.aries.blueprint.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.aries.proxy</groupId> + <artifactId>org.apache.aries.proxy</artifactId> + <version>${org.apache.aries.proxy.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.ow2.asm</groupId> <artifactId>asm-all</artifactId> - <version>5.0.3</version> - <scope>test</scope> - </dependency> + <version>${asm-all.version}</version> + <scope>test</scope> + </dependency> <!-- logging --> - <dependency> - <groupId>org.ops4j.pax.logging</groupId> - <artifactId>pax-logging-api</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.ops4j.pax.logging</groupId> - <artifactId>pax-logging-service</artifactId> - <scope>test</scope> - </dependency> + <dependency> + <groupId>org.ops4j.pax.logging</groupId> + <artifactId>pax-logging-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.ops4j.pax.logging</groupId> + <artifactId>pax-logging-service</artifactId> + <scope>test</scope> + </dependency> <!-- pax exam --> - <dependency> - <groupId>org.ops4j.pax.exam</groupId> - <artifactId>pax-exam</artifactId> - <version>3.4.0</version> - <scope>test</scope> - </dependency> + <dependency> + <groupId>org.ops4j.pax.exam</groupId> + <artifactId>pax-exam</artifactId> + <version>${pax-exam.version}</version> + <scope>test</scope> + </dependency> <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam-junit4</artifactId> - <version>3.4.0</version> + <version>${pax-exam.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam-container-forked</artifactId> - <version>3.4.0</version> + <version>${pax-exam.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam-link-mvn</artifactId> - <version>3.4.0</version> + <version>${pax-exam.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.url</groupId> <artifactId>pax-url-aether</artifactId> - <version>1.6.0</version> + <version>${pax-url-aether.version}</version> <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.aries.testsupport</groupId> - <artifactId>org.apache.aries.testsupport.unit</artifactId> - <version>2.0.0-SNAPSHOT</version> - <scope>test</scope> + <groupId>org.apache.aries.testsupport</groupId> + <artifactId>org.apache.aries.testsupport.unit</artifactId> + <version>${org.apache.aries.testsupport.unit.version}</version> + <scope>test</scope> </dependency> </dependencies> @@ -166,7 +179,7 @@ <plugin> <groupId>org.apache.servicemix.tooling</groupId> <artifactId>depends-maven-plugin</artifactId> - <version>1.3</version> + <version>${depends-maven-plugin.version}</version> <executions> <execution> <id>generate-depends-file</id> @@ -185,7 +198,7 @@ </plugin> </plugins> </build> - + <profiles> <profile> <id>ci-build-profile</id> diff --git a/application/application-resolve-transform-cm/pom.xml b/application/application-resolve-transform-cm/pom.xml index 94ec414bb..796271929 100644 --- a/application/application-resolve-transform-cm/pom.xml +++ b/application/application-resolve-transform-cm/pom.xml @@ -45,13 +45,16 @@ <aries.osgi.export.pkg> </aries.osgi.export.pkg> <aries.osgi.import.pkg> - org.apache.aries.application.management.spi.resolve;provide:=true, - * + org.apache.aries.application.management.spi.resolve;provide:=true, + * </aries.osgi.import.pkg> <aries.osgi.private.pkg> org.apache.aries.application.resolve.transform.cm </aries.osgi.private.pkg> <lastReleaseVersion>1.0.0</lastReleaseVersion> + + <org.apache.aries.application.api.version>1.0.0</org.apache.aries.application.api.version> + <org.apache.aries.application.utils.version>1.0.0</org.apache.aries.application.utils.version> </properties> <dependencies> @@ -63,12 +66,12 @@ <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.api</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.api.version}</version> </dependency> <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.utils</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.utils.version}</version> </dependency> </dependencies> @@ -89,5 +92,5 @@ </plugin> </plugins> </build> - + </project> diff --git a/application/application-runtime-framework-management/pom.xml b/application/application-runtime-framework-management/pom.xml index db1cfec4e..7cb8b338c 100644 --- a/application/application-runtime-framework-management/pom.xml +++ b/application/application-runtime-framework-management/pom.xml @@ -47,16 +47,21 @@ <aries.osgi.export.pkg> </aries.osgi.export.pkg> <aries.osgi.import.pkg> - org.apache.aries.application.management;provide:=true, - org.apache.aries.application.management.spi.framework;provide:=true, - * + org.apache.aries.application.management;provide:=true, + org.apache.aries.application.management.spi.framework;provide:=true, + * </aries.osgi.import.pkg> <aries.osgi.private.pkg> - org.apache.aries.application.runtime.framework.management + org.apache.aries.application.runtime.framework.management </aries.osgi.private.pkg> <lastReleaseVersion>1.0.0</lastReleaseVersion> + + <org.apache.aries.application.api.version>1.0.0</org.apache.aries.application.api.version> + <org.apache.aries.application.runtime.framework.version>1.0.0</org.apache.aries.application.runtime.framework.version> + <org.apache.aries.application.utils.version>1.0.0</org.apache.aries.application.utils.version> + <org.apache.aries.testsupport.unit.version>1.0.0</org.apache.aries.testsupport.unit.version> </properties> - + <dependencies> <dependency> <groupId>junit</groupId> @@ -66,23 +71,23 @@ <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.api</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.api.version}</version> </dependency> <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.runtime.framework</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.runtime.framework.version}</version> </dependency> <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.utils</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.utils.version}</version> </dependency> <dependency> <groupId>org.apache.aries.testsupport</groupId> <artifactId>org.apache.aries.testsupport.unit</artifactId> <scope>test</scope> - <version>1.0.0</version> + <version>${org.apache.aries.testsupport.unit.version}</version> </dependency> <dependency> <groupId>org.osgi</groupId> @@ -123,5 +128,5 @@ </plugin> </plugins> </build> - + </project> diff --git a/application/application-runtime-framework/pom.xml b/application/application-runtime-framework/pom.xml index bf4f5c4d2..446e97a14 100644 --- a/application/application-runtime-framework/pom.xml +++ b/application/application-runtime-framework/pom.xml @@ -46,19 +46,24 @@ <properties> <!-- Export package versions are maintained in packageinfo files --> <aries.osgi.export.pkg> - org.apache.aries.application.runtime.framework.utils + org.apache.aries.application.runtime.framework.utils </aries.osgi.export.pkg> <aries.osgi.import.pkg> - org.apache.aries.application.management.spi.framework;provide:=true, - * + org.apache.aries.application.management.spi.framework;provide:=true, + * </aries.osgi.import.pkg> <aries.osgi.private.pkg> org.apache.aries.application.runtime.framework; - org.apache.aries.application.runtime.framework.config + org.apache.aries.application.runtime.framework.config </aries.osgi.private.pkg> <lastReleaseVersion>1.0.0</lastReleaseVersion> + + <org.apache.aries.application.api.version>1.0.0</org.apache.aries.application.api.version> + <org.apache.aries.application.utils.version>1.0.0</org.apache.aries.application.utils.version> + <org.apache.aries.testsupport.unit.version>1.0.0</org.apache.aries.testsupport.unit.version> + <osgi.version>3.5.0.v20090520</osgi.version> </properties> - + <dependencies> <dependency> <groupId>junit</groupId> @@ -68,18 +73,18 @@ <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.api</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.api.version}</version> </dependency> <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.utils</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.utils.version}</version> </dependency> <dependency> <groupId>org.apache.aries.testsupport</groupId> <artifactId>org.apache.aries.testsupport.unit</artifactId> <scope>test</scope> - <version>1.0.0</version> + <version>${org.apache.aries.testsupport.unit.version}</version> </dependency> <dependency> <groupId>org.osgi</groupId> @@ -102,11 +107,11 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.eclipse</groupId> - <artifactId>osgi</artifactId> - <version>3.5.0.v20090520</version> - <type>jar</type> - <scope>provided</scope> + <groupId>org.eclipse</groupId> + <artifactId>osgi</artifactId> + <version>${osgi.version}</version> + <type>jar</type> + <scope>provided</scope> </dependency> </dependencies> @@ -127,5 +132,5 @@ </plugin> </plugins> </build> - + </project> diff --git a/application/application-runtime-isolated/pom.xml b/application/application-runtime-isolated/pom.xml index 12fb8e71b..7eef7f89b 100644 --- a/application/application-runtime-isolated/pom.xml +++ b/application/application-runtime-isolated/pom.xml @@ -47,17 +47,22 @@ <aries.osgi.export.pkg> </aries.osgi.export.pkg> <aries.osgi.import.pkg> - org.apache.aries.application.management;provide:=true, - org.apache.aries.application.management.spi.framework;provide:=true, - org.apache.aries.application.management.spi.runtime;provide:=true, - * + org.apache.aries.application.management;provide:=true, + org.apache.aries.application.management.spi.framework;provide:=true, + org.apache.aries.application.management.spi.runtime;provide:=true, + * </aries.osgi.import.pkg> <aries.osgi.private.pkg> - org.apache.aries.application.runtime.isolated.impl + org.apache.aries.application.runtime.isolated.impl </aries.osgi.private.pkg> <lastReleaseVersion>1.0.0</lastReleaseVersion> + + <org.apache.aries.application.api.version>1.0.0</org.apache.aries.application.api.version> + <org.apache.aries.application.utils.version>1.0.0</org.apache.aries.application.utils.version> + <org.apache.aries.testsupport.unit.version>1.0.0</org.apache.aries.testsupport.unit.version> + <osgi.version>3.5.0.v20090520</osgi.version> </properties> - + <dependencies> <dependency> <groupId>junit</groupId> @@ -67,18 +72,18 @@ <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.api</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.api.version}</version> </dependency> <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.utils</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.utils.version}</version> </dependency> <dependency> <groupId>org.apache.aries.testsupport</groupId> <artifactId>org.apache.aries.testsupport.unit</artifactId> <scope>test</scope> - <version>1.0.0</version> + <version>${org.apache.aries.testsupport.unit.version}</version> </dependency> <dependency> <groupId>org.osgi</groupId> @@ -101,11 +106,11 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.eclipse</groupId> - <artifactId>osgi</artifactId> - <version>3.5.0.v20090520</version> - <type>jar</type> - <scope>provided</scope> + <groupId>org.eclipse</groupId> + <artifactId>osgi</artifactId> + <version>${osgi.version}</version> + <type>jar</type> + <scope>provided</scope> </dependency> </dependencies> @@ -126,5 +131,5 @@ </plugin> </plugins> </build> - + </project> diff --git a/application/application-runtime-repository/pom.xml b/application/application-runtime-repository/pom.xml index ae0a7092f..8d7aa1bed 100644 --- a/application/application-runtime-repository/pom.xml +++ b/application/application-runtime-repository/pom.xml @@ -47,15 +47,19 @@ <aries.osgi.export.pkg> </aries.osgi.export.pkg> <aries.osgi.import.pkg> - org.apache.aries.application.management.spi.repository;provide:=true, - * + org.apache.aries.application.management.spi.repository;provide:=true, + * </aries.osgi.import.pkg> <aries.osgi.private.pkg> - org.apache.aries.application.runtime.repository + org.apache.aries.application.runtime.repository </aries.osgi.private.pkg> <lastReleaseVersion>1.0.0</lastReleaseVersion> + + <org.apache.aries.application.api.version>1.0.0</org.apache.aries.application.api.version> + <org.apache.aries.application.utils.version>1.0.0</org.apache.aries.application.utils.version> + <org.apache.aries.testsupport.unit.version>1.0.0</org.apache.aries.testsupport.unit.version> </properties> - + <dependencies> <dependency> <groupId>junit</groupId> @@ -65,18 +69,18 @@ <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.api</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.api.version}</version> </dependency> <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.utils</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.utils.version}</version> </dependency> <dependency> <groupId>org.apache.aries.testsupport</groupId> <artifactId>org.apache.aries.testsupport.unit</artifactId> <scope>test</scope> - <version>1.0.0</version> + <version>${org.apache.aries.testsupport.unit.version}</version> </dependency> <dependency> <groupId>org.osgi</groupId> @@ -117,5 +121,5 @@ </plugin> </plugins> </build> - + </project> diff --git a/application/application-runtime/pom.xml b/application/application-runtime/pom.xml index efe2c50a1..11c9376ae 100644 --- a/application/application-runtime/pom.xml +++ b/application/application-runtime/pom.xml @@ -43,15 +43,18 @@ <url>https://gitbox.apache.org/repos/asf?p=aries.git;a=summary</url> </scm> - <properties> - <aries.osgi.export.pkg /> + <properties> + <aries.osgi.export.pkg/> <aries.osgi.import.pkg> org.apache.aries.application.management;provide:=true, org.apache.aries.application.management.spi.runtime;provide:=true, * </aries.osgi.import.pkg> <lastReleaseVersion>1.0.0</lastReleaseVersion> - </properties> + + <org.apache.aries.application.utils.version>1.0.0</org.apache.aries.application.utils.version> + <org.apache.aries.testsupport.unit.version>1.0.0</org.apache.aries.testsupport.unit.version> + </properties> <dependencies> <dependency> @@ -62,13 +65,13 @@ <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.utils</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.utils.version}</version> </dependency> <dependency> <groupId>org.apache.aries.testsupport</groupId> <artifactId>org.apache.aries.testsupport.unit</artifactId> <scope>test</scope> - <version>1.0.0</version> + <version>${org.apache.aries.testsupport.unit.version}</version> </dependency> <dependency> <groupId>org.osgi</groupId> @@ -110,4 +113,4 @@ </plugins> </build> - </project> +</project> diff --git a/application/application-tooling-repository-generator/pom.xml b/application/application-tooling-repository-generator/pom.xml index 05639c722..6ec9bcd9f 100644 --- a/application/application-tooling-repository-generator/pom.xml +++ b/application/application-tooling-repository-generator/pom.xml @@ -48,25 +48,47 @@ org.apache.aries.application.repository.generator </aries.osgi.private.pkg> <lastReleaseVersion>1.0.0</lastReleaseVersion> + + <asm-all.version>5.0.3</asm-all.version> + <cm.version>3.2.0-v20070116</cm.version> + <geronimo-jpa_2.0_spec.version>1.1</geronimo-jpa_2.0_spec.version> + <geronimo-jta_1.1_spec.version>1.1.1</geronimo-jta_1.1_spec.version> + <maven-assembly-plugin.version>2.2.1</maven-assembly-plugin.version> + <org.apache.aries.application.api.version>1.0.0</org.apache.aries.application.api.version> + <org.apache.aries.application.default.local.platform.version>1.0.0</org.apache.aries.application.default.local.platform.version> + <org.apache.aries.application.modeller.version>1.0.0</org.apache.aries.application.modeller.version> + <org.apache.aries.application.resolver.obr.version>1.0.0</org.apache.aries.application.resolver.obr.version> + <org.apache.aries.application.utils.version>1.0.0</org.apache.aries.application.utils.version> + <org.apache.aries.blueprint.version>1.0.0</org.apache.aries.blueprint.version> + <org.apache.aries.jpa.api.version>1.0.0</org.apache.aries.jpa.api.version> + <org.apache.aries.jpa.blueprint.aries.version>1.0.0</org.apache.aries.jpa.blueprint.aries.version> + <org.apache.aries.proxy.version>1.0.2-SNAPSHOT</org.apache.aries.proxy.version> + <org.apache.aries.transaction.blueprint.version>1.0.0</org.apache.aries.transaction.blueprint.version> + <org.apache.aries.transaction.manager.version>1.0.0</org.apache.aries.transaction.manager.version> + <org.apache.aries.transaction.wrappers.version>1.0.0</org.apache.aries.transaction.wrappers.version> + <org.apache.aries.util.version>1.0.0</org.apache.aries.util.version> + <org.apache.felix.bundlerepository.version>1.6.4</org.apache.felix.bundlerepository.version> + <org.eclipse.osgi.version>3.8.0.v20120529-1548</org.eclipse.osgi.version> + <services.version>3.1.200-v20070605</services.version> </properties> <dependencies> <dependency> <groupId>org.eclipse</groupId> <artifactId>org.eclipse.osgi</artifactId> - <version>3.8.0.v20120529-1548</version> + <version>${org.eclipse.osgi.version}</version> </dependency> <dependency> <groupId>org.eclipse.equinox</groupId> <artifactId>cm</artifactId> - <version>3.2.0-v20070116</version> + <version>${cm.version}</version> </dependency> <dependency> <groupId>org.eclipse.osgi</groupId> <artifactId>services</artifactId> - <version>3.1.200-v20070605</version> + <version>${services.version}</version> </dependency> <dependency> @@ -82,102 +104,102 @@ <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.bundlerepository</artifactId> - <version>1.6.4</version> + <version>${org.apache.felix.bundlerepository.version}</version> </dependency> <dependency> <groupId>org.apache.aries.blueprint</groupId> <artifactId>org.apache.aries.blueprint</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.blueprint.version}</version> </dependency> <dependency> <groupId>org.apache.aries.proxy</groupId> <artifactId>org.apache.aries.proxy</artifactId> - <version>1.0.2-SNAPSHOT</version> + <version>${org.apache.aries.proxy.version}</version> </dependency> <dependency> <groupId>org.apache.aries</groupId> <artifactId>org.apache.aries.util</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.util.version}</version> </dependency> <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.api</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.api.version}</version> </dependency> <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.utils</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.utils.version}</version> </dependency> <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.default.local.platform</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.default.local.platform.version}</version> </dependency> <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.modeller</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.modeller.version}</version> </dependency> <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.resolver.obr</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.resolver.obr.version}</version> </dependency> <dependency> <groupId>org.ow2.asm</groupId> <artifactId>asm-all</artifactId> - <version>5.0.3</version> + <version>${asm-all.version}</version> <optional>true</optional> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jta_1.1_spec</artifactId> - <version>1.1.1</version> + <version>${geronimo-jta_1.1_spec.version}</version> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jpa_2.0_spec</artifactId> - <version>1.1</version> + <version>${geronimo-jpa_2.0_spec.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.aries.jpa</groupId> <artifactId>org.apache.aries.jpa.api</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.jpa.api.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.aries.transaction</groupId> - <artifactId>org.apache.aries.transaction.manager</artifactId> - <version>1.0.0</version> + <artifactId>org.apache.aries.transaction.manager</artifactId> + <version>${org.apache.aries.transaction.manager.version}</version> </dependency> - + <dependency> <groupId>org.apache.aries.transaction</groupId> - <artifactId>org.apache.aries.transaction.wrappers</artifactId> - <version>1.0.0</version> + <artifactId>org.apache.aries.transaction.wrappers</artifactId> + <version>${org.apache.aries.transaction.wrappers.version}</version> </dependency> - - <dependency> - <groupId>org.apache.aries.transaction</groupId> - <artifactId>org.apache.aries.transaction.blueprint</artifactId> - <version>1.0.0</version> + + <dependency> + <groupId>org.apache.aries.transaction</groupId> + <artifactId>org.apache.aries.transaction.blueprint</artifactId> + <version>${org.apache.aries.transaction.blueprint.version}</version> </dependency> <dependency> - <groupId>org.apache.aries.jpa</groupId> - <artifactId>org.apache.aries.jpa.blueprint.aries</artifactId> - <version>1.0.0</version> + <groupId>org.apache.aries.jpa</groupId> + <artifactId>org.apache.aries.jpa.blueprint.aries</artifactId> + <version>${org.apache.aries.jpa.blueprint.aries.version}</version> </dependency> - + </dependencies> <build> @@ -214,7 +236,7 @@ <!-- assembly a zip --> <plugin> <artifactId>maven-assembly-plugin</artifactId> - <version>2.2.1</version> + <version>${maven-assembly-plugin.version}</version> <configuration> <descriptors> <descriptor>src/main/assembly/createzip.xml</descriptor> @@ -222,11 +244,11 @@ </configuration> <executions> <execution> - <id>make-assembly</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> + <id>make-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> </execution> </executions> </plugin> diff --git a/application/application-utils/pom.xml b/application/application-utils/pom.xml index 904c257e0..dd6505a4a 100644 --- a/application/application-utils/pom.xml +++ b/application/application-utils/pom.xml @@ -22,10 +22,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.aries</groupId> - <artifactId>parent</artifactId> - <version>2.0.0</version> - <relativePath>../../parent/pom.xml</relativePath> + <groupId>org.apache.aries</groupId> + <artifactId>parent</artifactId> + <version>2.0.0</version> + <relativePath>../../parent/pom.xml</relativePath> </parent> <groupId>org.apache.aries.application</groupId> @@ -34,7 +34,7 @@ <name>Apache Aries Application Utils</name> <version>1.0.1-SNAPSHOT</version> <description> - Utilities for working with Aries Applications. + Utilities for working with Aries Applications. </description> <scm> @@ -51,7 +51,7 @@ org.apache.aries.application.utils.manifest; org.apache.aries.application.utils.management; org.apache.aries.application.utils.service; - org.apache.aries.application.utils.runtime + org.apache.aries.application.utils.runtime </aries.osgi.export.pkg> <aries.osgi.import.pkg> org.osgi.service.blueprint;resolution:=optional, @@ -61,9 +61,13 @@ <aries.osgi.private.pkg> org.apache.aries.application.impl; org.apache.aries.application.utils.internal; - org.apache.aries.application.utils.filesystem.impl + org.apache.aries.application.utils.filesystem.impl </aries.osgi.private.pkg> <lastReleaseVersion>1.0.0</lastReleaseVersion> + + <org.apache.aries.application.api.version>1.0.0</org.apache.aries.application.api.version> + <org.apache.aries.testsupport.unit.version>1.0.0</org.apache.aries.testsupport.unit.version> + <org.apache.aries.util.version>1.0.0</org.apache.aries.util.version> </properties> <dependencies> @@ -71,20 +75,20 @@ <dependency> <groupId>org.apache.aries.application</groupId> <artifactId>org.apache.aries.application.api</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.application.api.version}</version> </dependency> <!-- Dependency on other Aries module bundles --> <dependency> - <groupId>org.apache.aries</groupId> - <artifactId>org.apache.aries.util</artifactId> - <version>1.0.0</version> + <groupId>org.apache.aries</groupId> + <artifactId>org.apache.aries.util</artifactId> + <version>${org.apache.aries.util.version}</version> </dependency> <dependency> <groupId>org.apache.aries.testsupport</groupId> <artifactId>org.apache.aries.testsupport.unit</artifactId> <scope>test</scope> - <version>1.0.0</version> + <version>${org.apache.aries.testsupport.unit.version}</version> </dependency> <!--External dependencies. Versions may be specified in default parent -->
