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 1c3e9502b9ed630140b7e3bb6d674cb010c9fd0a Author: Dominik Przybysz <[email protected]> AuthorDate: Sat Jan 11 21:27:57 2025 +0100 [MAINTENANCE] Extract dependency versions to properties - blueprint --- blueprint/blueprint-api/pom.xml | 2 +- blueprint/blueprint-authz/pom.xml | 5 +- blueprint/blueprint-bundle/pom.xml | 25 +++++--- blueprint/blueprint-cm/pom.xml | 51 ++++++++------- blueprint/blueprint-compatibility/pom.xml | 28 ++++----- blueprint/blueprint-core/pom.xml | 40 +++++++----- blueprint/blueprint-distro/pom.xml | 24 +++++--- blueprint/blueprint-jexl-evaluator/pom.xml | 10 +-- blueprint/blueprint-noosgi/pom.xml | 13 ++-- blueprint/blueprint-parent/pom.xml | 25 ++++---- blueprint/blueprint-parser/pom.xml | 7 ++- blueprint/blueprint-repository/pom.xml | 52 ++++++++-------- blueprint/blueprint-spring-camel/pom.xml | 12 ++-- blueprint/blueprint-spring-extender/pom.xml | 50 +++++++++------ blueprint/blueprint-spring/pom.xml | 47 ++++++++------ blueprint/blueprint-web-osgi/pom.xml | 36 ++++++----- blueprint/blueprint-web/pom.xml | 12 ++-- .../examples/blueprint-sample-fragment/pom.xml | 8 ++- blueprint/examples/blueprint-sample-war/pom.xml | 16 +++-- blueprint/examples/blueprint-sample/pom.xml | 12 ++-- blueprint/itests/blueprint-itests/pom.xml | 72 +++++++++++++--------- blueprint/itests/blueprint-testbundlea/pom.xml | 2 +- blueprint/itests/blueprint-testbundleb/pom.xml | 2 +- blueprint/itests/blueprint-testbundlee/pom.xml | 8 ++- blueprint/itests/blueprint-testbundles/pom.xml | 8 ++- .../itests/blueprint-testquiescebundle/pom.xml | 2 +- .../blueprint-maven-plugin-annotation/pom.xml | 18 ++++-- .../plugin/blueprint-maven-plugin-itest/pom.xml | 10 ++- .../pom.xml | 10 +-- .../plugin/blueprint-maven-plugin-spi/pom.xml | 9 ++- .../blueprint-maven-plugin-spring-handlers/pom.xml | 26 +++++--- blueprint/plugin/blueprint-maven-plugin/pom.xml | 46 +++++++------- 32 files changed, 402 insertions(+), 286 deletions(-) diff --git a/blueprint/blueprint-api/pom.xml b/blueprint/blueprint-api/pom.xml index eb56995d9..5a55cb49d 100644 --- a/blueprint/blueprint-api/pom.xml +++ b/blueprint/blueprint-api/pom.xml @@ -54,7 +54,7 @@ <aries.osgi.import.pkg> org.osgi.framework </aries.osgi.import.pkg> - <aries.osgi.private.pkg /> + <aries.osgi.private.pkg/> <lastReleaseVersion>1.0.0</lastReleaseVersion> </properties> diff --git a/blueprint/blueprint-authz/pom.xml b/blueprint/blueprint-authz/pom.xml index ad6bc840b..30b871249 100644 --- a/blueprint/blueprint-authz/pom.xml +++ b/blueprint/blueprint-authz/pom.xml @@ -40,12 +40,13 @@ <aries.osgi.import.pkg>javax.annotation.security,*</aries.osgi.import.pkg> <aries.osgi.private.pkg>org.apache.aries.blueprint.authorization.impl</aries.osgi.private.pkg> <aries.osgi.activator>org.apache.aries.blueprint.authorization.impl.Activator</aries.osgi.activator> - + <!-- Not exporting any packages --> <aries.skip.version.check>true</aries.skip.version.check> <blueprint.api.version>1.0.0</blueprint.api.version> <blueprint.parser.version>1.0.0</blueprint.parser.version> + <javax.annotation-api.version>1.2</javax.annotation-api.version> </properties> <profiles> @@ -73,7 +74,7 @@ <dependency> <groupId>javax.annotation</groupId> <artifactId>javax.annotation-api</artifactId> - <version>1.2</version> + <version>${javax.annotation-api.version}</version> </dependency> <dependency> <groupId>org.apache.aries.blueprint</groupId> diff --git a/blueprint/blueprint-bundle/pom.xml b/blueprint/blueprint-bundle/pom.xml index 670818b50..57663625d 100644 --- a/blueprint/blueprint-bundle/pom.xml +++ b/blueprint/blueprint-bundle/pom.xml @@ -104,14 +104,19 @@ </aries.osgi.failok> <lastReleaseVersion>1.1.0</lastReleaseVersion> + <asm-debug-all.version>5.0.3</asm-debug-all.version> <blueprint.api.version>${blueprint.api.dev.version}</blueprint.api.version> - <blueprint.core.version>${blueprint.core.dev.version}</blueprint.core.version> + <blueprint.authz.version>${blueprint.authz.dev.version}</blueprint.authz.version> <blueprint.cm.version>${blueprint.cm.dev.version}</blueprint.cm.version> + <blueprint.core.version>${blueprint.core.dev.version}</blueprint.core.version> + <blueprint.jexl.evaluator.version>${blueprint.jexl.evaluator.dev.version}</blueprint.jexl.evaluator.version> <blueprint.parser.version>${blueprint.parser.dev.version}</blueprint.parser.version> - <blueprint.authz.version>${blueprint.authz.dev.version}</blueprint.authz.version> - <blueprint.spring.version>${blueprint.spring.dev.version}</blueprint.spring.version> <blueprint.spring.extender.version>${blueprint.spring.extender.dev.version}</blueprint.spring.extender.version> - <blueprint.jexl.evaluator.version>${blueprint.jexl.evaluator.dev.version}</blueprint.jexl.evaluator.version> + <blueprint.spring.version>${blueprint.spring.dev.version}</blueprint.spring.version> + <org.apache.aries.proxy.api.version>1.0.0</org.apache.aries.proxy.api.version> + <org.apache.aries.proxy.impl.version>1.0.3</org.apache.aries.proxy.impl.version> + <org.apache.aries.quiesce.api.version>1.0.0</org.apache.aries.quiesce.api.version> + <org.apache.aries.versioning.plugin.version>0.3.1</org.apache.aries.versioning.plugin.version> </properties> <dependencies> @@ -136,19 +141,19 @@ <dependency> <groupId>org.apache.aries.proxy</groupId> <artifactId>org.apache.aries.proxy.api</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.proxy.api.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.aries.proxy</groupId> <artifactId>org.apache.aries.proxy.impl</artifactId> - <version>1.0.3</version> + <version>${org.apache.aries.proxy.impl.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ow2.asm</groupId> <artifactId>asm-debug-all</artifactId> - <version>5.0.3</version> + <version>${asm-debug-all.version}</version> <scope>test</scope> <optional>true</optional> </dependency> @@ -161,7 +166,7 @@ <groupId>org.apache.aries.quiesce</groupId> <artifactId>org.apache.aries.quiesce.api</artifactId> <scope>provided</scope> - <version>1.0.0</version> + <version>${org.apache.aries.quiesce.api.version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> @@ -219,11 +224,11 @@ </execution> </executions> </plugin> - + <plugin> <groupId>org.apache.aries.versioning</groupId> <artifactId>org.apache.aries.versioning.plugin</artifactId> - <version>0.3.1</version> + <version>${org.apache.aries.versioning.plugin.version}</version> <configuration> <excludes> <exclude>method org.apache.aries.blueprint.di.Repository getRepository() has been deleted</exclude> diff --git a/blueprint/blueprint-cm/pom.xml b/blueprint/blueprint-cm/pom.xml index 92d4f068a..fad2fe46d 100644 --- a/blueprint/blueprint-cm/pom.xml +++ b/blueprint/blueprint-cm/pom.xml @@ -41,25 +41,34 @@ <connection>scm:git:https://gitbox.apache.org/repos/asf/aries.git</connection> <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/aries.git</developerConnection> <url>https://gitbox.apache.org/repos/asf?p=aries.git;a=summary</url> - <tag>HEAD</tag> - </scm> + <tag>HEAD</tag> + </scm> <properties> <!-- Export package versions are maintained in packageinfo files --> - <aries.osgi.export.pkg /> + <aries.osgi.export.pkg/> <aries.osgi.import.pkg> - org.apache.aries.blueprint;provide:=true;version="[1.0,2.0)", - org.apache.aries.blueprint.ext;provide:=true;version="[1.0,2.0)", - * + org.apache.aries.blueprint;provide:=true;version="[1.0,2.0)", + org.apache.aries.blueprint.ext;provide:=true;version="[1.0,2.0)", + * </aries.osgi.import.pkg> <aries.osgi.private.pkg> org.apache.aries.blueprint.compendium.cm </aries.osgi.private.pkg> + <lastReleaseVersion>1.1.0</lastReleaseVersion> <blueprint.api.version>1.0.1</blueprint.api.version> <blueprint.core.version>1.10.3</blueprint.core.version> <blueprint.parser.version>1.6.0</blueprint.parser.version> - <lastReleaseVersion>1.1.0</lastReleaseVersion> + <de.kalpatec.pojosr.framework.version>0.1.6</de.kalpatec.pojosr.framework.version> + <jcl-over-slf4j.version>1.7.5</jcl-over-slf4j.version> + <maven-release-plugin.version>2.5.2</maven-release-plugin.version> + <org.apache.aries.blueprint.core.version>1.10.0</org.apache.aries.blueprint.core.version> + <org.apache.aries.proxy.version>1.1.0</org.apache.aries.proxy.version> + <org.apache.felix.configadmin.version>1.2.8</org.apache.felix.configadmin.version> + <org.osgi.compendium.version>4.1.0</org.osgi.compendium.version> + <pax-swissbox-tinybundles.version>1.3.1</pax-swissbox-tinybundles.version> + <slf4j-log4j12.version>1.7.5</slf4j-log4j12.version> </properties> <profiles> @@ -89,18 +98,18 @@ <dependency> <groupId>org.apache.aries.blueprint</groupId> <artifactId>blueprint-parser</artifactId> - <version>1.6.0</version> + <version>${blueprint-parser.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.aries.blueprint</groupId> <artifactId>org.apache.aries.blueprint.core</artifactId> - <version>1.10.0</version> + <version>${org.apache.aries.blueprint.core.version}</version> <exclusions> - <exclusion> - <groupId>org.apache.aries</groupId> - <artifactId>org.apache.aries.util</artifactId> - </exclusion> + <exclusion> + <groupId>org.apache.aries</groupId> + <artifactId>org.apache.aries.util</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -112,7 +121,7 @@ <groupId>org.osgi</groupId> <artifactId>org.osgi.compendium</artifactId> <scope>provided</scope> - <version>4.1.0</version> + <version>${org.osgi.compendium.version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> @@ -123,13 +132,13 @@ <dependency> <groupId>com.googlecode.pojosr</groupId> <artifactId>de.kalpatec.pojosr.framework</artifactId> - <version>0.1.6</version> + <version>${de.kalpatec.pojosr.framework.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.swissbox</groupId> <artifactId>pax-swissbox-tinybundles</artifactId> - <version>1.3.1</version> + <version>${pax-swissbox-tinybundles.version}</version> <scope>test</scope> </dependency> <dependency> @@ -140,25 +149,25 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>1.7.5</version> + <version>${slf4j-log4j12.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>jcl-over-slf4j</artifactId> - <version>1.7.5</version> + <version>${jcl-over-slf4j.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.aries.proxy</groupId> <artifactId>org.apache.aries.proxy</artifactId> - <version>1.1.0</version> + <version>${org.apache.aries.proxy.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.configadmin</artifactId> - <version>1.2.8</version> + <version>${org.apache.felix.configadmin.version}</version> <scope>test</scope> </dependency> </dependencies> @@ -180,7 +189,7 @@ </plugin> <plugin> <artifactId>maven-release-plugin</artifactId> - <version>2.5.2</version> + <version>${maven-release-plugin.version}</version> </plugin> </plugins> </build> diff --git a/blueprint/blueprint-compatibility/pom.xml b/blueprint/blueprint-compatibility/pom.xml index e49f3710d..1f38eeb8c 100644 --- a/blueprint/blueprint-compatibility/pom.xml +++ b/blueprint/blueprint-compatibility/pom.xml @@ -138,20 +138,20 @@ <sourcepath>${project.build.directory}/sources</sourcepath> </configuration> </plugin> - - <plugin> - <groupId>org.apache.aries.versioning</groupId> - <artifactId>org.apache.aries.versioning.plugin</artifactId> - <executions> - <execution> - <id>default-verify</id> - <phase>verify</phase> - <goals> - <goal>version-check</goal> - </goals> - </execution> - </executions> - </plugin> + + <plugin> + <groupId>org.apache.aries.versioning</groupId> + <artifactId>org.apache.aries.versioning.plugin</artifactId> + <executions> + <execution> + <id>default-verify</id> + <phase>verify</phase> + <goals> + <goal>version-check</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> </profile> diff --git a/blueprint/blueprint-core/pom.xml b/blueprint/blueprint-core/pom.xml index 6f9425465..52d559dd3 100644 --- a/blueprint/blueprint-core/pom.xml +++ b/blueprint/blueprint-core/pom.xml @@ -42,8 +42,8 @@ <connection>scm:git:http://gitbox.apache.org/repos/asf/aries.git</connection> <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/aries.git</developerConnection> <url>https://gitbox.apache.org/repos/asf?p=aries.git</url> - <tag>HEAD</tag> - </scm> + <tag>HEAD</tag> + </scm> <properties> <rat.excludesFile>${project.basedir}/rat-excludes.txt</rat.excludesFile> @@ -93,14 +93,20 @@ {maven-resources}, org/apache/aries/blueprint/blueprint.xsd=${project.build.directory}/sources/org/osgi/service/blueprint/blueprint.xsd </aries.osgi.include.resource> + <lastReleaseVersion>1.6.0</lastReleaseVersion> + + <asm-debug-all.version>5.0.3</asm-debug-all.version> <blueprint.annotation.api.version>1.0.1</blueprint.annotation.api.version> <blueprint.api.version>1.0.1</blueprint.api.version> <blueprint.parser.version>1.6.0</blueprint.parser.version> + <easymock.version>4.2</easymock.version> + <maven-release-plugin.version>2.5.2</maven-release-plugin.version> + <org.apache.aries.versioning.plugin.version>0.3.1</org.apache.aries.versioning.plugin.version> + <org.apache.felix.utils.version>1.11.6</org.apache.felix.utils.version> <proxy.api.version>1.1.1</proxy.api.version> <proxy.impl.version>1.1.9</proxy.impl.version> <quiesce.api.version>1.0.0</quiesce.api.version> <util.version>1.1.3</util.version> - <lastReleaseVersion>1.6.0</lastReleaseVersion> </properties> <profiles> @@ -163,7 +169,7 @@ <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.utils</artifactId> - <version>1.11.6</version> + <version>${org.apache.felix.utils.version}</version> <scope>provided</scope> </dependency> <dependency> @@ -175,7 +181,7 @@ <groupId>org.ow2.asm</groupId> <artifactId>asm-debug-all</artifactId> <optional>true</optional> - <version>5.0.3</version> + <version>${asm-debug-all.version}</version> </dependency> <dependency> <groupId>org.apache.aries.quiesce</groupId> @@ -185,7 +191,7 @@ <dependency> <groupId>org.easymock</groupId> <artifactId>easymock</artifactId> - <version>4.2</version> + <version>${easymock.version}</version> <scope>test</scope> </dependency> <dependency> @@ -242,15 +248,15 @@ </execution> </executions> </plugin> - + <plugin> <groupId>org.apache.aries.versioning</groupId> <artifactId>org.apache.aries.versioning.plugin</artifactId> - <version>0.3.1</version> + <version>${org.apache.aries.versioning.plugin.version}</version> <configuration> <excludes> - <exclude>method org.apache.aries.blueprint.di.Repository getRepository() has been deleted</exclude> - <exclude>class org/apache/aries/blueprint/ext/PropertyPlaceholder was not abstract but is changed to be abstract</exclude> + <exclude>method org.apache.aries.blueprint.di.Repository getRepository() has been deleted</exclude> + <exclude>class org/apache/aries/blueprint/ext/PropertyPlaceholder was not abstract but is changed to be abstract</exclude> </excludes> </configuration> <executions> @@ -276,23 +282,23 @@ version:Version="1.0" </Provide-Capability> <Require-Capability> - osgi.service;filter:="(objectClass=org.apache.aries.proxy.ProxyManager)";effective:="active" + osgi.service;filter:="(objectClass=org.apache.aries.proxy.ProxyManager)";effective:="active" </Require-Capability> </instructions> </configuration> </plugin> <plugin> <artifactId>maven-release-plugin</artifactId> - <version>2.5.2</version> + <version>${maven-release-plugin.version}</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <additionalparam>-Xdoclint:none</additionalparam> - </configuration> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <additionalparam>-Xdoclint:none</additionalparam> + </configuration> </plugin> </plugins> </build> - + </project> diff --git a/blueprint/blueprint-distro/pom.xml b/blueprint/blueprint-distro/pom.xml index 616dee4ee..0edf40b21 100644 --- a/blueprint/blueprint-distro/pom.xml +++ b/blueprint/blueprint-distro/pom.xml @@ -39,36 +39,46 @@ <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.blueprint.annotation.api.version>1.0.0</org.apache.aries.blueprint.annotation.api.version> + <org.apache.aries.blueprint.annotation.impl.version>1.0.0-SNAPSHOT</org.apache.aries.blueprint.annotation.impl.version> + <org.apache.aries.blueprint.api.version>1.0.0</org.apache.aries.blueprint.api.version> + <org.apache.aries.blueprint.cm.version>1.0.0-SNAPSHOT</org.apache.aries.blueprint.cm.version> + <org.apache.aries.blueprint.core.version>1.0.0</org.apache.aries.blueprint.core.version> + <org.apache.aries.blueprint.jexl.evaluator.version>1.0.0-SNAPSHOT</org.apache.aries.blueprint.jexl.evaluator.version> + </properties> + <dependencies> <dependency> <groupId>org.apache.aries.blueprint</groupId> <artifactId>org.apache.aries.blueprint.annotation.api</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.blueprint.annotation.api.version}</version> </dependency> <dependency> <groupId>org.apache.aries.blueprint</groupId> <artifactId>org.apache.aries.blueprint.annotation.impl</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>${org.apache.aries.blueprint.annotation.impl.version}</version> </dependency> <dependency> <groupId>org.apache.aries.blueprint</groupId> <artifactId>org.apache.aries.blueprint.api</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.blueprint.api.version}</version> </dependency> <dependency> <groupId>org.apache.aries.blueprint</groupId> <artifactId>org.apache.aries.blueprint.cm</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>${org.apache.aries.blueprint.cm.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> </dependency> <dependency> <groupId>org.apache.aries.blueprint</groupId> <artifactId>org.apache.aries.blueprint.jexl.evaluator</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>${org.apache.aries.blueprint.jexl.evaluator.version}</version> </dependency> </dependencies> @@ -76,7 +86,7 @@ <plugins> <plugin> <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-5</version> + <version>${maven-assembly-plugin.version}</version> <executions> <execution> <phase>package</phase> diff --git a/blueprint/blueprint-jexl-evaluator/pom.xml b/blueprint/blueprint-jexl-evaluator/pom.xml index fa2bc2f89..725965bd2 100644 --- a/blueprint/blueprint-jexl-evaluator/pom.xml +++ b/blueprint/blueprint-jexl-evaluator/pom.xml @@ -45,7 +45,7 @@ <properties> <!-- Export package versions are maintained in packageinfo files --> - <aries.osgi.export.pkg /> + <aries.osgi.export.pkg/> <aries.osgi.import> org.apache.aries.blueprint.ext.evaluator;provide:=true, org.apache.commons.jexl2, @@ -55,8 +55,10 @@ <aries.osgi.private.pkg> org.apache.aries.blueprint.jexl.evaluator </aries.osgi.private.pkg> - <blueprint.core.version>1.10.0</blueprint.core.version> <lastReleaseVersion>1.0.0</lastReleaseVersion> + + <blueprint.core.version>1.10.0</blueprint.core.version> + <commons-jexl.version>2.0</commons-jexl.version> </properties> <profiles> @@ -82,12 +84,12 @@ <dependency> <groupId>org.apache.aries.blueprint</groupId> <artifactId>org.apache.aries.blueprint.core</artifactId> - <version>1.10.0</version> + <version>${blueprint.core.version}</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-jexl</artifactId> - <version>2.0</version> + <version>${commons-jexl.version}</version> <exclusions> <exclusion> <groupId>commons-logging</groupId> diff --git a/blueprint/blueprint-noosgi/pom.xml b/blueprint/blueprint-noosgi/pom.xml index f41c66a62..fa2a9c0d7 100644 --- a/blueprint/blueprint-noosgi/pom.xml +++ b/blueprint/blueprint-noosgi/pom.xml @@ -44,10 +44,13 @@ </scm> <properties> + <blueprint-parser.version>1.6.0</blueprint-parser.version> <blueprint.api.version>1.0.1</blueprint.api.version> <blueprint.core.version>1.10.0</blueprint.core.version> <blueprint.parser.version>1.6.0</blueprint.parser.version> + <org.apache.felix.utils.version>1.11.6</org.apache.felix.utils.version> <proxy.impl.version>1.0.3</proxy.impl.version> + <slf4j.version>1.7.5</slf4j.version> </properties> <profiles> @@ -83,13 +86,13 @@ <dependency> <groupId>org.apache.aries.blueprint</groupId> <artifactId>blueprint-parser</artifactId> - <version>1.6.0</version> + <version>${blueprint-parser.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.aries.blueprint</groupId> <artifactId>org.apache.aries.blueprint.core</artifactId> - <version>1.10.0</version> + <version>${blueprint.core.version}</version> <exclusions> <exclusion> <groupId>org.apache.aries.quiesce</groupId> @@ -111,7 +114,7 @@ <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.utils</artifactId> - <version>1.11.6</version> + <version>${org.apache.felix.utils.version}</version> <scope>provided</scope> </dependency> <dependency> @@ -127,13 +130,13 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>1.7.5</version> + <version>${slf4j.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>jcl-over-slf4j</artifactId> - <version>1.7.5</version> + <version>${slf4j.version}</version> <scope>test</scope> </dependency> </dependencies> diff --git a/blueprint/blueprint-parent/pom.xml b/blueprint/blueprint-parent/pom.xml index b22c801ef..9515f143e 100644 --- a/blueprint/blueprint-parent/pom.xml +++ b/blueprint/blueprint-parent/pom.xml @@ -44,23 +44,24 @@ </scm> <properties> + <apache-rat-plugin.version>0.12</apache-rat-plugin.version> + <blueprint-maven-plugin-annotation.dev-version>1.3.1-SNAPSHOT</blueprint-maven-plugin-annotation.dev-version> + <blueprint-maven-plugin-pax-cdi-handlers.dev-version>1.0.1-SNAPSHOT</blueprint-maven-plugin-pax-cdi-handlers.dev-version> + <blueprint-maven-plugin-spi.dev-version>1.1.1-SNAPSHOT</blueprint-maven-plugin-spi.dev-version> + <blueprint-maven-plugin-spring-handlers.dev-version>1.0.1-SNAPSHOT</blueprint-maven-plugin-spring-handlers.dev-version> <blueprint.api.dev.version>1.0.2-SNAPSHOT</blueprint.api.dev.version> - <blueprint.core.dev.version>1.10.4-SNAPSHOT</blueprint.core.dev.version> - <blueprint.cm.dev.version>1.3.3-SNAPSHOT</blueprint.cm.dev.version> - <blueprint.parser.dev.version>1.6.2-SNAPSHOT</blueprint.parser.dev.version> <blueprint.authz.dev.version>1.0.1-SNAPSHOT</blueprint.authz.dev.version> - <blueprint.spring.dev.version>1.0.0-SNAPSHOT</blueprint.spring.dev.version> - <blueprint.spring.extender.dev.version>1.0.0-SNAPSHOT</blueprint.spring.extender.dev.version> + <blueprint.bundle.dev.version>1.3.0-SNAPSHOT</blueprint.bundle.dev.version> + <blueprint.cm.dev.version>1.3.3-SNAPSHOT</blueprint.cm.dev.version> + <blueprint.core.dev.version>1.10.4-SNAPSHOT</blueprint.core.dev.version> <blueprint.jexl.evaluator.dev.version>1.1.1-SNAPSHOT</blueprint.jexl.evaluator.dev.version> + <blueprint.noosgi.dev.version>1.2.0-SNAPSHOT</blueprint.noosgi.dev.version> + <blueprint.parser.dev.version>1.6.2-SNAPSHOT</blueprint.parser.dev.version> <blueprint.sample.dev.version>1.0.1-SNAPSHOT</blueprint.sample.dev.version> <blueprint.sample.fragment.dev.version>1.0.1-SNAPSHOT</blueprint.sample.fragment.dev.version> - <blueprint.noosgi.dev.version>1.2.0-SNAPSHOT</blueprint.noosgi.dev.version> - <blueprint.bundle.dev.version>1.3.0-SNAPSHOT</blueprint.bundle.dev.version> + <blueprint.spring.dev.version>1.0.0-SNAPSHOT</blueprint.spring.dev.version> + <blueprint.spring.extender.dev.version>1.0.0-SNAPSHOT</blueprint.spring.extender.dev.version> <blueprint.web.dev.version>1.1.2-SNAPSHOT</blueprint.web.dev.version> - <blueprint-maven-plugin-spi.dev-version>1.1.1-SNAPSHOT</blueprint-maven-plugin-spi.dev-version> - <blueprint-maven-plugin-spring-handlers.dev-version>1.0.1-SNAPSHOT</blueprint-maven-plugin-spring-handlers.dev-version> - <blueprint-maven-plugin-annotation.dev-version>1.3.1-SNAPSHOT</blueprint-maven-plugin-annotation.dev-version> - <blueprint-maven-plugin-pax-cdi-handlers.dev-version>1.0.1-SNAPSHOT</blueprint-maven-plugin-pax-cdi-handlers.dev-version> </properties> <build> @@ -68,7 +69,7 @@ <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> - <version>0.12</version> + <version>${apache-rat-plugin.version}</version> <executions> <execution> <phase>verify</phase> diff --git a/blueprint/blueprint-parser/pom.xml b/blueprint/blueprint-parser/pom.xml index d838e3008..b4bcdd7b2 100644 --- a/blueprint/blueprint-parser/pom.xml +++ b/blueprint/blueprint-parser/pom.xml @@ -41,12 +41,13 @@ <connection>scm:git:https://gitbox.apache.org/repos/asf/aries.git</connection> <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/aries.git</developerConnection> <url>https://gitbox.apache.org/repos/asf?p=aries.git;a=summary</url> - <tag>HEAD</tag> - </scm> + <tag>HEAD</tag> + </scm> <properties> - <blueprint.api.version>1.0.0</blueprint.api.version> <lastReleaseVersion>1.4.0</lastReleaseVersion> + + <blueprint.api.version>1.0.0</blueprint.api.version> </properties> <profiles> diff --git a/blueprint/blueprint-repository/pom.xml b/blueprint/blueprint-repository/pom.xml index 81e225dd3..ac660474f 100644 --- a/blueprint/blueprint-repository/pom.xml +++ b/blueprint/blueprint-repository/pom.xml @@ -32,13 +32,17 @@ <version>1.5.0-SNAPSHOT</version> <packaging>pom</packaging> <properties> - <bnd.version>3.1.0</bnd.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <local.index.policy>ALLOWED</local.index.policy> + <asm-all.version>5.0.4</asm-all.version> <blueprint.api.version>1.0.1</blueprint.api.version> - <blueprint.core.version>1.5.0</blueprint.core.version> <blueprint.cm.version>1.0.9</blueprint.cm.version> + <blueprint.core.version>1.5.0</blueprint.core.version> + <bnd.version>3.1.0</bnd.version> + <org.apache.aries.proxy.api.version>1.0.1</org.apache.aries.proxy.api.version> + <org.apache.aries.proxy.impl.version>1.0.6</org.apache.aries.proxy.impl.version> + <org.apache.aries.util.version>1.1.3</org.apache.aries.util.version> </properties> <profiles> @@ -80,44 +84,44 @@ </plugin> </plugins> </build> - <dependencies> + <dependencies> <!-- Aries PROXY --> <dependency> <groupId>org.ow2.asm</groupId> <artifactId>asm-all</artifactId> - <version>5.0.4</version> + <version>${asm-all.version}</version> </dependency> <dependency> <groupId>org.apache.aries</groupId> <artifactId>org.apache.aries.util</artifactId> - <version>1.1.3</version> + <version>${org.apache.aries.util.version}</version> </dependency> <dependency> <groupId>org.apache.aries.proxy</groupId> <artifactId>org.apache.aries.proxy.api</artifactId> - <version>1.0.1</version> + <version>${org.apache.aries.proxy.api.version}</version> </dependency> <dependency> <groupId>org.apache.aries.proxy</groupId> <artifactId>org.apache.aries.proxy.impl</artifactId> - <version>1.0.6</version> + <version>${org.apache.aries.proxy.impl.version}</version> </dependency> - <!-- blueprint --> - <dependency> - <groupId>org.apache.aries.blueprint</groupId> - <artifactId>org.apache.aries.blueprint.api</artifactId> - <version>${blueprint.api.version}</version> - </dependency> - <dependency> - <groupId>org.apache.aries.blueprint</groupId> - <artifactId>org.apache.aries.blueprint.core</artifactId> - <version>${blueprint.core.version}</version> - </dependency> - <dependency> - <groupId>org.apache.aries.blueprint</groupId> - <artifactId>org.apache.aries.blueprint.cm</artifactId> - <version>${blueprint.cm.version}</version> - </dependency> - </dependencies> + <!-- blueprint --> + <dependency> + <groupId>org.apache.aries.blueprint</groupId> + <artifactId>org.apache.aries.blueprint.api</artifactId> + <version>${blueprint.api.version}</version> + </dependency> + <dependency> + <groupId>org.apache.aries.blueprint</groupId> + <artifactId>org.apache.aries.blueprint.core</artifactId> + <version>${blueprint.core.version}</version> + </dependency> + <dependency> + <groupId>org.apache.aries.blueprint</groupId> + <artifactId>org.apache.aries.blueprint.cm</artifactId> + <version>${blueprint.cm.version}</version> + </dependency> + </dependencies> </project> diff --git a/blueprint/blueprint-spring-camel/pom.xml b/blueprint/blueprint-spring-camel/pom.xml index cf240fdf6..79f208017 100644 --- a/blueprint/blueprint-spring-camel/pom.xml +++ b/blueprint/blueprint-spring-camel/pom.xml @@ -44,12 +44,14 @@ </scm> <properties> - <blueprint.api.version>1.0.0</blueprint.api.version> - <blueprint.core.version>1.6.2</blueprint.core.version> - <blueprint.parser.version>1.4.0</blueprint.parser.version> <!-- <lastReleaseVersion>1.0.4</lastReleaseVersion> --> + + <blueprint.api.version>1.0.0</blueprint.api.version> + <blueprint.core.version>1.6.2</blueprint.core.version> + <blueprint.parser.version>1.4.0</blueprint.parser.version> + <camel.version>2.19.0</camel.version> </properties> <profiles> @@ -74,12 +76,12 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-spring</artifactId> - <version>2.19.0</version> + <version>${camel.version}</version> </dependency> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-core-osgi</artifactId> - <version>2.19.0</version> + <version>${camel.version}</version> </dependency> <dependency> <groupId>org.osgi</groupId> diff --git a/blueprint/blueprint-spring-extender/pom.xml b/blueprint/blueprint-spring-extender/pom.xml index 17b557996..e6246e4b4 100644 --- a/blueprint/blueprint-spring-extender/pom.xml +++ b/blueprint/blueprint-spring-extender/pom.xml @@ -45,11 +45,11 @@ <properties> <!-- Export package versions are maintained in packageinfo files --> - <aries.osgi.export.pkg /> + <aries.osgi.export.pkg/> <aries.osgi.import.pkg> - org.apache.aries.blueprint;provide:=true;version="[1.0,2.0)", - org.apache.aries.blueprint.ext;provide:=true;version="[1.0,2.0)", - * + org.apache.aries.blueprint;provide:=true;version="[1.0,2.0)", + org.apache.aries.blueprint.ext;provide:=true;version="[1.0,2.0)", + * </aries.osgi.import.pkg> <aries.osgi.private.pkg> org.apache.aries.blueprint.spring.extender, @@ -58,12 +58,22 @@ <aries.osgi.activator> org.apache.aries.blueprint.spring.extender.Activator </aries.osgi.activator> - <blueprint.api.version>1.0.0</blueprint.api.version> - <blueprint.core.version>1.6.2</blueprint.core.version> - <blueprint.parser.version>1.4.0</blueprint.parser.version> <!-- <lastReleaseVersion>1.0.4</lastReleaseVersion> --> + + <blueprint.api.version>1.0.0</blueprint.api.version> + <blueprint.core.version>1.6.2</blueprint.core.version> + <blueprint.parser.version>1.4.0</blueprint.parser.version> + <de.kalpatec.pojosr.framework.version>0.1.6</de.kalpatec.pojosr.framework.version> + <junit.version>4.7</junit.version> + <org.apache.aries.proxy.impl.version>1.0.3</org.apache.aries.proxy.impl.version> + <org.apache.felix.configadmin.version>1.2.8</org.apache.felix.configadmin.version> + <org.apache.felix.utils.version>1.11.6</org.apache.felix.utils.version> + <org.osgi.compendium.version>4.3.1</org.osgi.compendium.version> + <pax-swissbox-tinybundles.version>1.3.1</pax-swissbox-tinybundles.version> + <slf4j.version>1.7.5</slf4j.version> + <spring.version>4.2.2.RELEASE</spring.version> </properties> <profiles> @@ -110,7 +120,7 @@ <groupId>org.osgi</groupId> <artifactId>org.osgi.compendium</artifactId> <scope>provided</scope> - <version>4.3.1</version> + <version>${org.osgi.compendium.version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> @@ -120,73 +130,73 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> - <version>4.2.2.RELEASE</version> + <version>${spring.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> - <version>4.2.2.RELEASE</version> + <version>${spring.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.utils</artifactId> - <version>1.11.6</version> + <version>${org.apache.felix.utils.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>com.googlecode.pojosr</groupId> <artifactId>de.kalpatec.pojosr.framework</artifactId> - <version>0.1.6</version> + <version>${de.kalpatec.pojosr.framework.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.swissbox</groupId> <artifactId>pax-swissbox-tinybundles</artifactId> - <version>1.3.1</version> + <version>${pax-swissbox-tinybundles.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.7</version> + <version>${junit.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>1.7.5</version> + <version>${slf4j.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>jcl-over-slf4j</artifactId> - <version>1.7.5</version> + <version>${slf4j.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.aries.proxy</groupId> <artifactId>org.apache.aries.proxy.impl</artifactId> - <version>1.0.3</version> + <version>${org.apache.aries.proxy.impl.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.configadmin</artifactId> - <version>1.2.8</version> + <version>${org.apache.felix.configadmin.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-tx</artifactId> - <version>4.2.2.RELEASE</version> + <version>${spring.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-aop</artifactId> - <version>4.2.2.RELEASE</version> + <version>${spring.version}</version> <scope>test</scope> </dependency> </dependencies> diff --git a/blueprint/blueprint-spring/pom.xml b/blueprint/blueprint-spring/pom.xml index 7ce6dcabd..9cbb1f65a 100644 --- a/blueprint/blueprint-spring/pom.xml +++ b/blueprint/blueprint-spring/pom.xml @@ -45,11 +45,11 @@ <properties> <!-- Export package versions are maintained in packageinfo files --> - <aries.osgi.export.pkg /> + <aries.osgi.export.pkg/> <aries.osgi.import.pkg> - org.apache.aries.blueprint;provide:=true;version="[1.0,2.0)", - org.apache.aries.blueprint.ext;provide:=true;version="[1.0,2.0)", - * + org.apache.aries.blueprint;provide:=true;version="[1.0,2.0)", + org.apache.aries.blueprint.ext;provide:=true;version="[1.0,2.0)", + * </aries.osgi.import.pkg> <aries.osgi.private.pkg> org.apache.aries.blueprint.spring, @@ -58,12 +58,23 @@ <aries.osgi.activator> org.apache.aries.blueprint.spring.Activator </aries.osgi.activator> - <blueprint.api.version>1.0.0</blueprint.api.version> - <blueprint.core.version>1.9.0</blueprint.core.version> - <blueprint.parser.version>1.5.0</blueprint.parser.version> <!-- <lastReleaseVersion>1.0.4</lastReleaseVersion> --> + + <blueprint.api.version>1.0.0</blueprint.api.version> + <blueprint.core.version>1.9.0</blueprint.core.version> + <blueprint.parser.version>1.5.0</blueprint.parser.version> + <de.kalpatec.pojosr.framework.version>0.1.6</de.kalpatec.pojosr.framework.version> + <org.apache.aries.proxy.impl.version>1.0.3</org.apache.aries.proxy.impl.version> + <org.apache.felix.configadmin.version>1.2.8</org.apache.felix.configadmin.version> + <org.apache.felix.utils.version>1.11.6</org.apache.felix.utils.version> + <pax-swissbox-tinybundles.version>1.3.1</pax-swissbox-tinybundles.version> + <slf4j.version>1.7.5</slf4j.version> + <spring-aop.version>4.2.2.RELEASE</spring-aop.version> + <spring-beans.version>4.2.2.RELEASE</spring-beans.version> + <spring-context.version>4.2.2.RELEASE</spring-context.version> + <spring-tx.version>4.2.2.RELEASE</spring-tx.version> </properties> <profiles> @@ -119,31 +130,31 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> - <version>4.2.2.RELEASE</version> + <version>${spring-context.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> - <version>4.2.2.RELEASE</version> + <version>${spring-beans.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.utils</artifactId> - <version>1.11.6</version> + <version>${org.apache.felix.utils.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>com.googlecode.pojosr</groupId> <artifactId>de.kalpatec.pojosr.framework</artifactId> - <version>0.1.6</version> + <version>${de.kalpatec.pojosr.framework.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.swissbox</groupId> <artifactId>pax-swissbox-tinybundles</artifactId> - <version>1.3.1</version> + <version>${pax-swissbox-tinybundles.version}</version> <scope>test</scope> </dependency> <dependency> @@ -154,37 +165,37 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>1.7.5</version> + <version>${slf4j.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>jcl-over-slf4j</artifactId> - <version>1.7.5</version> + <version>${slf4j.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.aries.proxy</groupId> <artifactId>org.apache.aries.proxy.impl</artifactId> - <version>1.0.3</version> + <version>${org.apache.aries.proxy.impl.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.configadmin</artifactId> - <version>1.2.8</version> + <version>${org.apache.felix.configadmin.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-tx</artifactId> - <version>4.2.2.RELEASE</version> + <version>${spring-tx.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-aop</artifactId> - <version>4.2.2.RELEASE</version> + <version>${spring-aop.version}</version> <scope>test</scope> </dependency> </dependencies> diff --git a/blueprint/blueprint-web-osgi/pom.xml b/blueprint/blueprint-web-osgi/pom.xml index 297111dad..9e0feed7b 100644 --- a/blueprint/blueprint-web-osgi/pom.xml +++ b/blueprint/blueprint-web-osgi/pom.xml @@ -49,12 +49,14 @@ org.apache.aries.blueprint.web </aries.osgi.export.pkg> <aries.osgi.import.pkg> - org.osgi.framework, - org.osgi.service.blueprint.container;provide:=true, - org.apache.aries.blueprint.services;provide:=true;version="[1.2,2.0)", - javax.servlet*;version="[0.0,4)" + org.osgi.framework, + org.osgi.service.blueprint.container;provide:=true, + org.apache.aries.blueprint.services;provide:=true;version="[1.2,2.0)", + javax.servlet*;version="[0.0,4)" </aries.osgi.import.pkg> + <blueprint.core.version>1.3.0</blueprint.core.version> + <geronimo-servlet_2.5_spec.version>1.2</geronimo-servlet_2.5_spec.version> </properties> <profiles> @@ -84,7 +86,7 @@ <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-servlet_2.5_spec</artifactId> - <version>1.2</version> + <version>${geronimo-servlet_2.5_spec.version}</version> <scope>provided</scope> </dependency> <dependency> @@ -93,19 +95,19 @@ <scope>provided</scope> </dependency> </dependencies> - + <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <configuration> - <mavenExecutorId>forked-path</mavenExecutorId> - </configuration> - </plugin> - </plugins> - </pluginManagement> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-release-plugin</artifactId> + <configuration> + <mavenExecutorId>forked-path</mavenExecutorId> + </configuration> + </plugin> + </plugins> + </pluginManagement> </build> </project> diff --git a/blueprint/blueprint-web/pom.xml b/blueprint/blueprint-web/pom.xml index e8f38a587..98239401a 100644 --- a/blueprint/blueprint-web/pom.xml +++ b/blueprint/blueprint-web/pom.xml @@ -45,10 +45,12 @@ </scm> <properties> + <lastReleaseVersion>1.1.1</lastReleaseVersion> + + <blueprint.noosgi.version>1.1.0</blueprint.noosgi.version> <blueprint.nosgi.version>1.2.0-SNAPSHOT</blueprint.nosgi.version> <blueprint.parser.version>1.5.0</blueprint.parser.version> - <blueprint.noosgi.version>1.1.0</blueprint.noosgi.version> - <lastReleaseVersion>1.1.1</lastReleaseVersion> + <geronimo-servlet_2.5_spec.version>1.2</geronimo-servlet_2.5_spec.version> </properties> <profiles> @@ -85,7 +87,7 @@ <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-servlet_2.5_spec</artifactId> - <version>1.2</version> + <version>${geronimo-servlet_2.5_spec.version}</version> <scope>provided</scope> </dependency> <dependency> @@ -135,7 +137,7 @@ </execution> </executions> </plugin> - + <plugin> <groupId>org.apache.aries.versioning</groupId> <artifactId>org.apache.aries.versioning.plugin</artifactId> @@ -151,5 +153,5 @@ </plugin> </plugins> </build> - + </project> diff --git a/blueprint/examples/blueprint-sample-fragment/pom.xml b/blueprint/examples/blueprint-sample-fragment/pom.xml index a17fff545..d6c45976c 100644 --- a/blueprint/examples/blueprint-sample-fragment/pom.xml +++ b/blueprint/examples/blueprint-sample-fragment/pom.xml @@ -51,9 +51,11 @@ org.apache.aries.blueprint.annotation;provide:=true, * </aries.osgi.import> - <aries.osgi.private.pkg /> + <aries.osgi.private.pkg/> <blueprint.api.version>1.0.1</blueprint.api.version> + <org.apache.aries.blueprint.annotation.api.version>1.0.0</org.apache.aries.blueprint.annotation.api.version> + <osgi.version>3.5.0.v20090520</osgi.version> </properties> <profiles> @@ -69,7 +71,7 @@ <dependency> <groupId>org.eclipse</groupId> <artifactId>osgi</artifactId> - <version>3.5.0.v20090520</version> + <version>${osgi.version}</version> <scope>provided</scope> </dependency> <dependency> @@ -80,7 +82,7 @@ <dependency> <groupId>org.apache.aries.blueprint</groupId> <artifactId>org.apache.aries.blueprint.annotation.api</artifactId> - <version>1.0.0</version> + <version>${org.apache.aries.blueprint.annotation.api.version}</version> </dependency> </dependencies> diff --git a/blueprint/examples/blueprint-sample-war/pom.xml b/blueprint/examples/blueprint-sample-war/pom.xml index 30e89288d..e9e6889ce 100644 --- a/blueprint/examples/blueprint-sample-war/pom.xml +++ b/blueprint/examples/blueprint-sample-war/pom.xml @@ -46,7 +46,13 @@ <properties> <context>/</context> <httpPort>8080</httpPort> + <blueprint.web.version>1.0.0</blueprint.web.version> + <geronimo-servlet_2.5_spec.version>1.2</geronimo-servlet_2.5_spec.version> + <jetty-maven-plugin.version>8.1.8.v20121106</jetty-maven-plugin.version> + <maven-war-plugin.version>2.3</maven-war-plugin.version> + <tomcat6-maven-plugin.version>2.0</tomcat6-maven-plugin.version> + <tomcat7-maven-plugin.version>2.0</tomcat7-maven-plugin.version> </properties> <profiles> @@ -62,7 +68,7 @@ <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-servlet_2.5_spec</artifactId> - <version>1.2</version> + <version>${geronimo-servlet_2.5_spec.version}</version> <scope>provided</scope> </dependency> <dependency> @@ -81,7 +87,7 @@ <plugin> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> - <version>8.1.8.v20121106</version> + <version>${jetty-maven-plugin.version}</version> <configuration> <scanIntervalSeconds>1</scanIntervalSeconds> <useTestScope>true</useTestScope> @@ -106,7 +112,7 @@ <plugin> <groupId>org.apache.tomcat.maven</groupId> <artifactId>tomcat7-maven-plugin</artifactId> - <version>2.0</version> + <version>${tomcat7-maven-plugin.version}</version> <configuration> <port>${httpPort}</port> <path>${context}</path> @@ -119,7 +125,7 @@ <plugin> <groupId>org.apache.tomcat.maven</groupId> <artifactId>tomcat6-maven-plugin</artifactId> - <version>2.0</version> + <version>${tomcat6-maven-plugin.version}</version> <configuration> <port>${httpPort}</port> <path>${context}</path> @@ -132,7 +138,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> - <version>2.3</version> + <version>${maven-war-plugin.version}</version> <configuration> <webResources> <resource> diff --git a/blueprint/examples/blueprint-sample/pom.xml b/blueprint/examples/blueprint-sample/pom.xml index c1c002908..3a3399648 100644 --- a/blueprint/examples/blueprint-sample/pom.xml +++ b/blueprint/examples/blueprint-sample/pom.xml @@ -55,7 +55,7 @@ org.osgi.service.blueprint, org.osgi.service.blueprint.container </aries.osgi.import.pkg> - <aries.osgi.private.pkg /> + <aries.osgi.private.pkg/> <blueprint.api.version>1.0.0</blueprint.api.version> </properties> @@ -70,11 +70,11 @@ </profiles> <dependencies> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + <scope>provided</scope> + </dependency> <dependency> <groupId>org.apache.aries.blueprint</groupId> <artifactId>org.apache.aries.blueprint.api</artifactId> diff --git a/blueprint/itests/blueprint-itests/pom.xml b/blueprint/itests/blueprint-itests/pom.xml index fdde354c4..8a62614ad 100644 --- a/blueprint/itests/blueprint-itests/pom.xml +++ b/blueprint/itests/blueprint-itests/pom.xml @@ -42,26 +42,38 @@ </scm> <properties> - <exam.version>4.10.0</exam.version> - <url.version>2.5.3</url.version> - + <asm-debug-all.version>5.0.3</asm-debug-all.version> <blueprint.api.version>${blueprint.api.dev.version}</blueprint.api.version> - <blueprint.core.version>${blueprint.core.dev.version}</blueprint.core.version> - <blueprint.cm.version>${blueprint.cm.dev.version}</blueprint.cm.version> - <blueprint.parser.version>${blueprint.parser.dev.version}</blueprint.parser.version> <blueprint.authz.version>${blueprint.authz.dev.version}</blueprint.authz.version> - <blueprint.spring.version>${blueprint.spring.dev.version}</blueprint.spring.version> - <blueprint.spring.extender.version>${blueprint.spring.extender.dev.version}</blueprint.spring.extender.version> + <blueprint.cm.version>${blueprint.cm.dev.version}</blueprint.cm.version> + <blueprint.core.version>${blueprint.core.dev.version}</blueprint.core.version> <blueprint.jexl.evaluator.version>${blueprint.jexl.evaluator.dev.version}</blueprint.jexl.evaluator.version> - <blueprint.sample.version>${blueprint.sample.dev.version}</blueprint.sample.version> + <blueprint.parser.version>${blueprint.parser.dev.version}</blueprint.parser.version> <blueprint.sample.fragment.version>${blueprint.sample.fragment.dev.version}</blueprint.sample.fragment.version> + <blueprint.sample.version>${blueprint.sample.dev.version}</blueprint.sample.version> + <blueprint.spring.extender.version>${blueprint.spring.extender.dev.version}</blueprint.spring.extender.version> + <blueprint.spring.version>${blueprint.spring.dev.version}</blueprint.spring.version> + <commons-jexl.version>2.0</commons-jexl.version> + <depends-maven-plugin.version>1.4.0</depends-maven-plugin.version> + <exam.version>4.10.0</exam.version> + <org.apache.aries.proxy.version>1.1.0</org.apache.aries.proxy.version> + <org.apache.aries.quiesce.api.version>1.0.0</org.apache.aries.quiesce.api.version> + <org.apache.aries.testsupport.unit.version>2.0.0-SNAPSHOT</org.apache.aries.testsupport.unit.version> + <org.apache.felix.configadmin.version>1.8.0</org.apache.felix.configadmin.version> + <org.apache.servicemix.bundles.aopalliance.version>1.0_6</org.apache.servicemix.bundles.aopalliance.version> + <org.apache.servicemix.bundles.spring.version>4.2.2.RELEASE_1</org.apache.servicemix.bundles.spring.version> + <org.eclipse.osgi.version>3.11.3</org.eclipse.osgi.version> + <slf4j.version>1.7.7</slf4j.version> + <tinybundles.version>2.0.0</tinybundles.version> + <url.version>2.5.3</url.version> + <xbean.version>3.18</xbean.version> </properties> <dependencies> <dependency> <groupId>org.eclipse.platform</groupId> <artifactId>org.eclipse.osgi</artifactId> - <version>3.11.3</version> + <version>${org.eclipse.osgi.version}</version> <scope>provided</scope> </dependency> <dependency> @@ -92,54 +104,54 @@ <dependency> <groupId>org.apache.aries.proxy</groupId> <artifactId>org.apache.aries.proxy</artifactId> - <version>1.1.0</version> + <version>${org.apache.aries.proxy.version}</version> </dependency> <dependency> <groupId>org.apache.servicemix.bundles</groupId> <artifactId>org.apache.servicemix.bundles.spring-context</artifactId> - <version>4.2.2.RELEASE_1</version> + <version>${org.apache.servicemix.bundles.spring.version}</version> </dependency> <dependency> <groupId>org.apache.servicemix.bundles</groupId> <artifactId>org.apache.servicemix.bundles.spring-tx</artifactId> - <version>4.2.2.RELEASE_1</version> + <version>${org.apache.servicemix.bundles.spring.version}</version> </dependency> <dependency> <groupId>org.apache.servicemix.bundles</groupId> <artifactId>org.apache.servicemix.bundles.spring-context-support</artifactId> - <version>4.2.2.RELEASE_1</version> + <version>${org.apache.servicemix.bundles.spring.version}</version> </dependency> <dependency> <groupId>org.apache.servicemix.bundles</groupId> <artifactId>org.apache.servicemix.bundles.spring-beans</artifactId> - <version>4.2.2.RELEASE_1</version> + <version>${org.apache.servicemix.bundles.spring.version}</version> </dependency> <dependency> <groupId>org.apache.servicemix.bundles</groupId> <artifactId>org.apache.servicemix.bundles.spring-aop</artifactId> - <version>4.2.2.RELEASE_1</version> + <version>${org.apache.servicemix.bundles.spring.version}</version> </dependency> <dependency> <groupId>org.apache.servicemix.bundles</groupId> <artifactId>org.apache.servicemix.bundles.spring-core</artifactId> - <version>4.2.2.RELEASE_1</version> + <version>${org.apache.servicemix.bundles.spring.version}</version> </dependency> <dependency> <groupId>org.apache.servicemix.bundles</groupId> <artifactId>org.apache.servicemix.bundles.spring-expression</artifactId> - <version>4.2.2.RELEASE_1</version> + <version>${org.apache.servicemix.bundles.spring.version}</version> </dependency> <dependency> <groupId>org.apache.servicemix.bundles</groupId> <artifactId>org.apache.servicemix.bundles.aopalliance</artifactId> - <version>1.0_6</version> + <version>${org.apache.servicemix.bundles.aopalliance.version}</version> </dependency> <dependency> <groupId>org.apache.aries.quiesce</groupId> <artifactId>org.apache.aries.quiesce.api</artifactId> <type>bundle</type> <scope>provided</scope> - <version>1.0.0</version> + <version>${org.apache.aries.quiesce.api.version}</version> </dependency> <dependency> <groupId>org.apache.aries.blueprint</groupId> @@ -170,7 +182,7 @@ <groupId>org.apache.aries.testsupport</groupId> <artifactId>org.apache.aries.testsupport.unit</artifactId> <scope>test</scope> - <version>2.0.0-SNAPSHOT</version> + <version>${org.apache.aries.testsupport.unit.version}</version> </dependency> <dependency> <groupId>org.apache.aries.blueprint</groupId> @@ -212,7 +224,7 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.7.7</version> + <version>${slf4j.version}</version> </dependency> <dependency> <groupId>org.ops4j.pax.exam</groupId> @@ -247,7 +259,7 @@ <dependency> <groupId>org.ops4j.pax.tinybundles</groupId> <artifactId>tinybundles</artifactId> - <version>2.0.0</version> + <version>${tinybundles.version}</version> </dependency> <dependency> <groupId>junit</groupId> @@ -259,28 +271,28 @@ <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.configadmin</artifactId> <scope>test</scope> - <version>1.8.0</version> + <version>${org.apache.felix.configadmin.version}</version> </dependency> <dependency> <groupId>org.ow2.asm</groupId> <artifactId>asm-debug-all</artifactId> <scope>test</scope> - <version>5.0.3</version> + <version>${asm-debug-all.version}</version> </dependency> <dependency> <groupId>org.apache.xbean</groupId> <artifactId>xbean-asm5-shaded</artifactId> - <version>3.18</version> + <version>${xbean.version}</version> </dependency> <dependency> <groupId>org.apache.xbean</groupId> <artifactId>xbean-bundleutils</artifactId> - <version>3.18</version> + <version>${xbean.version}</version> </dependency> <dependency> <groupId>org.apache.xbean</groupId> <artifactId>xbean-finder</artifactId> - <version>3.18</version> + <version>${xbean.version}</version> </dependency> <dependency> <groupId>org.apache.aries.blueprint</groupId> @@ -304,7 +316,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-jexl</artifactId> - <version>2.0</version> + <version>${commons-jexl.version}</version> <scope>test</scope> </dependency> <dependency> @@ -337,7 +349,7 @@ <plugin> <groupId>org.apache.servicemix.tooling</groupId> <artifactId>depends-maven-plugin</artifactId> - <version>1.4.0</version> + <version>${depends-maven-plugin.version}</version> <executions> <execution> <id>generate-depends-file</id> diff --git a/blueprint/itests/blueprint-testbundlea/pom.xml b/blueprint/itests/blueprint-testbundlea/pom.xml index 5d0e5eb58..008e589c4 100644 --- a/blueprint/itests/blueprint-testbundlea/pom.xml +++ b/blueprint/itests/blueprint-testbundlea/pom.xml @@ -38,7 +38,7 @@ <aries.osgi.activator> org.apache.aries.blueprint.testbundlea.Activator </aries.osgi.activator> - <aries.osgi.private.pkg /> + <aries.osgi.private.pkg/> <aries.osgi.export.pkg>${project.artifactId}*</aries.osgi.export.pkg> </properties> diff --git a/blueprint/itests/blueprint-testbundleb/pom.xml b/blueprint/itests/blueprint-testbundleb/pom.xml index 2565a8d08..f1c2430eb 100644 --- a/blueprint/itests/blueprint-testbundleb/pom.xml +++ b/blueprint/itests/blueprint-testbundleb/pom.xml @@ -38,7 +38,7 @@ <aries.osgi.activator> org.apache.aries.blueprint.testbundleb.Activator </aries.osgi.activator> - <aries.osgi.private.pkg /> + <aries.osgi.private.pkg/> <aries.osgi.export.pkg>${project.artifactId}*</aries.osgi.export.pkg> </properties> diff --git a/blueprint/itests/blueprint-testbundlee/pom.xml b/blueprint/itests/blueprint-testbundlee/pom.xml index 8eeef443b..1633f0210 100644 --- a/blueprint/itests/blueprint-testbundlee/pom.xml +++ b/blueprint/itests/blueprint-testbundlee/pom.xml @@ -35,21 +35,23 @@ <description>Blueprint Test Bundle E, provides Spring Extender test</description> <properties> - <aries.osgi.private.pkg /> + <aries.osgi.private.pkg/> <aries.osgi.export.pkg>${project.artifactId}*</aries.osgi.export.pkg> + + <spring.version>4.2.2.RELEASE</spring.version> </properties> <dependencies> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> - <version>4.2.2.RELEASE</version> + <version>${spring.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-tx</artifactId> - <version>4.2.2.RELEASE</version> + <version>${spring.version}</version> <scope>provided</scope> </dependency> </dependencies> diff --git a/blueprint/itests/blueprint-testbundles/pom.xml b/blueprint/itests/blueprint-testbundles/pom.xml index eaf3fb94e..a6139b121 100644 --- a/blueprint/itests/blueprint-testbundles/pom.xml +++ b/blueprint/itests/blueprint-testbundles/pom.xml @@ -35,21 +35,23 @@ <description>Blueprint Test Bundle S, provides Spring test</description> <properties> - <aries.osgi.private.pkg /> + <aries.osgi.private.pkg/> <aries.osgi.export.pkg>${project.artifactId}*</aries.osgi.export.pkg> + + <spring.version>4.2.2.RELEASE</spring.version> </properties> <dependencies> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> - <version>4.2.2.RELEASE</version> + <version>${spring.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-tx</artifactId> - <version>4.2.2.RELEASE</version> + <version>${spring.version}</version> <scope>provided</scope> </dependency> </dependencies> diff --git a/blueprint/itests/blueprint-testquiescebundle/pom.xml b/blueprint/itests/blueprint-testquiescebundle/pom.xml index 8466805ef..251b297dd 100644 --- a/blueprint/itests/blueprint-testquiescebundle/pom.xml +++ b/blueprint/itests/blueprint-testquiescebundle/pom.xml @@ -42,7 +42,7 @@ org.osgi.framework, org.osgi.service.blueprint </aries.osgi.import.pkg> - <aries.osgi.private.pkg /> + <aries.osgi.private.pkg/> <aries.osgi.export.pkg>${project.artifactId}*</aries.osgi.export.pkg> </properties> diff --git a/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml b/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml index bd3f0b54b..cdabe1ef9 100644 --- a/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml +++ b/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml @@ -41,11 +41,19 @@ <url>https://gitbox.apache.org/repos/asf?p=aries.git;a=summary</url> </scm> + <properties> + <java.source.version>1.8</java.source.version> + <java.target.version>1.8</java.target.version> + + <bnd-maven-plugin.version>5.0.0</bnd-maven-plugin.version> + <osgi.annotation.version>7.0.0</osgi.annotation.version> + </properties> + <dependencies> <dependency> <groupId>org.osgi</groupId> <artifactId>osgi.annotation</artifactId> - <version>7.0.0</version> + <version>${osgi.annotation.version}</version> <scope>provided</scope> </dependency> </dependencies> @@ -55,21 +63,21 @@ <plugin> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <source>1.8</source> - <target>1.8</target> + <source>${java.source.version}</source> + <target>${java.target.version}</target> </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> <configuration> - <source>1.8</source> + <source>${java.source.version}</source> </configuration> </plugin> <plugin> <groupId>biz.aQute.bnd</groupId> <artifactId>bnd-maven-plugin</artifactId> - <version>5.0.0</version> + <version>${bnd-maven-plugin.version}</version> <executions> <execution> <phase>prepare-package</phase> diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/pom.xml b/blueprint/plugin/blueprint-maven-plugin-itest/pom.xml index 6689887d7..be7978e31 100644 --- a/blueprint/plugin/blueprint-maven-plugin-itest/pom.xml +++ b/blueprint/plugin/blueprint-maven-plugin-itest/pom.xml @@ -35,7 +35,11 @@ <name>Apache Aries Blueprint Maven Plugin iTest</name> <properties> + <java.target.version>1.7</java.target.version> + <java.source.version>1.7</java.source.version> + <blueprint-maven-plugin.version>1.9.1-SNAPSHOT</blueprint-maven-plugin.version> + <maven-invoker-plugin.version>1.10</maven-invoker-plugin.version> </properties> <scm> @@ -49,8 +53,8 @@ <plugin> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <target>1.7</target> - <source>1.7</source> + <target>${java.target.version}</target> + <source>${java.source.version}</source> </configuration> </plugin> </plugins> @@ -64,7 +68,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-invoker-plugin</artifactId> - <version>1.10</version> + <version>${maven-invoker-plugin.version}</version> <configuration> <projectsDirectory>src/it</projectsDirectory> <pomIncludes> diff --git a/blueprint/plugin/blueprint-maven-plugin-pax-cdi-handlers/pom.xml b/blueprint/plugin/blueprint-maven-plugin-pax-cdi-handlers/pom.xml index 20f383b94..995526c4d 100644 --- a/blueprint/plugin/blueprint-maven-plugin-pax-cdi-handlers/pom.xml +++ b/blueprint/plugin/blueprint-maven-plugin-pax-cdi-handlers/pom.xml @@ -34,10 +34,12 @@ <name>Apache Aries Blueprint Maven Plugin Pax Cdi Handlers</name> <properties> - <pax-cdi-api.version>0.8.0</pax-cdi-api.version> - <guava.version>19.0</guava.version> + <java.target.version>1.7</java.target.version> + <java.source.version>1.7</java.source.version> <blueprint-maven-plugin-spi.version>1.0.0</blueprint-maven-plugin-spi.version> + <guava.version>19.0</guava.version> + <pax-cdi-api.version>0.8.0</pax-cdi-api.version> </properties> <profiles> @@ -60,8 +62,8 @@ <plugin> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <target>1.7</target> - <source>1.7</source> + <target>${java.target.version}</target> + <source>${java.source.version}</source> </configuration> </plugin> </plugins> diff --git a/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml b/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml index 27ecfaea1..bc9cb7c68 100644 --- a/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml +++ b/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml @@ -39,13 +39,18 @@ <url>https://gitbox.apache.org/repos/asf?p=aries.git;a=summary</url> </scm> + <properties> + <java.target.version>1.7</java.target.version> + <java.source.version>1.7</java.source.version> + </properties> + <build> <plugins> <plugin> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <target>1.7</target> - <source>1.7</source> + <target>${java.target.version}</target> + <source>${java.source.version}</source> </configuration> </plugin> </plugins> diff --git a/blueprint/plugin/blueprint-maven-plugin-spring-handlers/pom.xml b/blueprint/plugin/blueprint-maven-plugin-spring-handlers/pom.xml index 7b4b0f0e8..5833e660f 100644 --- a/blueprint/plugin/blueprint-maven-plugin-spring-handlers/pom.xml +++ b/blueprint/plugin/blueprint-maven-plugin-spring-handlers/pom.xml @@ -38,22 +38,28 @@ <url>https://gitbox.apache.org/repos/asf?p=aries.git;a=summary</url> </scm> + <properties> + <java.target.version>1.7</java.target.version> + <java.source.version>1.7</java.source.version> + + <blueprint-maven-plugin-spi.version>1.0.0</blueprint-maven-plugin-spi.version> + <commons-lang.version>2.6</commons-lang.version> + <guava.version>19.0</guava.version> + <spring.version>3.1.4.RELEASE</spring.version> + </properties> + <build> <plugins> <plugin> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <target>1.7</target> - <source>1.7</source> + <target>${java.target.version}</target> + <source>${java.source.version}</source> </configuration> </plugin> </plugins> </build> - <properties> - <blueprint-maven-plugin-spi.version>1.0.0</blueprint-maven-plugin-spi.version> - </properties> - <profiles> <profile> <id>dev</id> @@ -73,7 +79,7 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> - <version>3.1.4.RELEASE</version> + <version>${spring.version}</version> <exclusions> <exclusion> <artifactId>spring-aop</artifactId> @@ -96,18 +102,18 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-tx</artifactId> - <version>3.1.4.RELEASE</version> + <version>${spring.version}</version> </dependency> <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> - <version>2.6</version> + <version>${commons-lang.version}</version> </dependency> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>19.0</version> + <version>${guava.version}</version> </dependency> </dependencies> diff --git a/blueprint/plugin/blueprint-maven-plugin/pom.xml b/blueprint/plugin/blueprint-maven-plugin/pom.xml index 046efb1b7..7970d2493 100644 --- a/blueprint/plugin/blueprint-maven-plugin/pom.xml +++ b/blueprint/plugin/blueprint-maven-plugin/pom.xml @@ -38,36 +38,35 @@ </description> <properties> - <maven.version>3.0.5</maven.version> - <aether.version>1.11</aether.version> - <maven-plugin-plugin.version>3.4</maven-plugin-plugin.version> - <lifecycle-mapping.version>1.0.0</lifecycle-mapping.version> + <java.source.version>1.7</java.source.version> + <java.target.version>1.7</java.target.version> - <blueprint-maven-plugin-spi.version>1.1.0</blueprint-maven-plugin-spi.version> - <blueprint-maven-plugin-spring-handlers.version>1.0.0</blueprint-maven-plugin-spring-handlers.version> + <aether.version>1.11</aether.version> <blueprint-maven-plugin-annotation.version>1.3.0</blueprint-maven-plugin-annotation.version> <blueprint-maven-plugin-pax-cdi-handlers.version>1.0.0</blueprint-maven-plugin-pax-cdi-handlers.version> - + <blueprint-maven-plugin-spi.version>1.1.0</blueprint-maven-plugin-spi.version> + <blueprint-maven-plugin-spring-handlers.version>1.0.0</blueprint-maven-plugin-spring-handlers.version> + <cdi-api.version>1.2</cdi-api.version> + <javax.annotation-api.version>1.3.2</javax.annotation-api.version> <javax.inject.version>1</javax.inject.version> <javax.transaction-api.version>1.2</javax.transaction-api.version> <javax.transaction.cdi-api.version>1.2-b03</javax.transaction.cdi-api.version> - <cdi-api.version>1.2</cdi-api.version> - <persistence-api.version>1.0.2</persistence-api.version> - - <wagon-http-lightweight.version>2.6</wagon-http-lightweight.version> - <slf4j-jdk14.version>1.7.7</slf4j-jdk14.version> + <lifecycle-mapping.version>1.0.0</lifecycle-mapping.version> <maven-filtering.version>1.0-beta-4</maven-filtering.version> - <plexus-build-api.version>0.0.7</plexus-build-api.version> - <plexus-utils.version>3.0</plexus-utils.version> - <osgi.cmpn.version>6.0.0</osgi.cmpn.version> - <xbean-finder-shaded.version>4.9</xbean-finder-shaded.version> - + <maven-plugin-plugin.version>3.4</maven-plugin-plugin.version> + <maven.version>3.0.5</maven.version> <org.apache.aries.blueprint.api.version>1.0.1</org.apache.aries.blueprint.api.version> - <org.apache.aries.blueprint.core.version>1.7.1</org.apache.aries.blueprint.core.version> <org.apache.aries.blueprint.cm.version>1.0.9</org.apache.aries.blueprint.cm.version> - <org.apache.aries.transaction.blueprint.version>1.1.1</org.apache.aries.transaction.blueprint.version> + <org.apache.aries.blueprint.core.version>1.7.1</org.apache.aries.blueprint.core.version> <org.apache.aries.jpa.blueprint.aries.version>1.0.2</org.apache.aries.jpa.blueprint.aries.version> - <javax.annotation-api.version>1.3.2</javax.annotation-api.version> + <org.apache.aries.transaction.blueprint.version>1.1.1</org.apache.aries.transaction.blueprint.version> + <osgi.cmpn.version>6.0.0</osgi.cmpn.version> + <persistence-api.version>1.0.2</persistence-api.version> + <plexus-build-api.version>0.0.7</plexus-build-api.version> + <plexus-utils.version>3.0</plexus-utils.version> + <slf4j-jdk14.version>1.7.7</slf4j-jdk14.version> + <wagon-http-lightweight.version>2.6</wagon-http-lightweight.version> + <xbean-finder-shaded.version>4.9</xbean-finder-shaded.version> </properties> <profiles> @@ -97,8 +96,8 @@ <plugin> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <target>1.7</target> - <source>1.7</source> + <target>${java.source.version}</target> + <source>${java.target.version}</source> </configuration> </plugin> <plugin> @@ -168,7 +167,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore /> + <ignore/> </action> </pluginExecution> </pluginExecutions> @@ -234,7 +233,6 @@ <version>${javax.annotation-api.version}</version> </dependency> - <dependency> <groupId>org.apache.aries.blueprint</groupId> <artifactId>blueprint-maven-plugin-annotation</artifactId>
