This is an automated email from the ASF dual-hosted git repository. alien11689 pushed a commit to branch organize-pax-dependency-version-properties in repository https://gitbox.apache.org/repos/asf/aries.git
commit 92cd676ea281a15ed6c846aff12e64d1f031c417 Author: Dominik Przybysz <[email protected]> AuthorDate: Sun Feb 16 10:35:19 2025 +0100 [MAINTENANCE] Organize pax dependency version properties --- application/application-itests/pom.xml | 14 ++--- .../pom.xml | 4 +- blueprint/itests/blueprint-itests/pom.xml | 18 +++--- .../plugin/blueprint-maven-plugin-itest/pom.xml | 65 +++++++++++++++++++++- .../src/it/custom-destination/pom.xml | 2 +- .../src/it/fail-on-conflict/pom.xml | 2 +- .../src/it/multiple-invocation/pom.xml | 2 +- .../src/it/pax-cdi/pom.xml | 4 +- .../src/it/produced-bean-by-method-name/pom.xml | 4 +- .../src/it/scanpath-restrict/pom.xml | 2 +- .../src/it/simple-project/pom.xml | 2 +- .../src/it/spring/pom.xml | 4 +- .../src/it/transaction-annotation/pom.xml | 4 +- .../src/it/with-provide/a/pom.xml | 6 +- .../src/it/with-provide/b/pom.xml | 2 +- .../src/it/with-provide/c/pom.xml | 2 +- .../pom.xml | 4 +- blueprint/plugin/blueprint-maven-plugin/pom.xml | 4 +- ejb/ejb-modeller-itest/pom.xml | 18 +++--- ejb/openejb-extender-itest/pom.xml | 11 ++-- jmx/jmx-itests/pom.xml | 18 +++--- jmx/jmx-whiteboard/pom.xml | 18 +++--- jndi/jndi-url-itest/pom.xml | 4 +- proxy/proxy-itests/pom.xml | 18 +++--- quiesce/quiesce-manager-itest/pom.xml | 4 +- subsystem/subsystem-itests/pom.xml | 18 +++--- transaction/transaction-itests/pom.xml | 22 ++++---- web/web-itests/pom.xml | 18 +++--- 28 files changed, 178 insertions(+), 116 deletions(-) diff --git a/application/application-itests/pom.xml b/application/application-itests/pom.xml index 1039119cf..1873281b3 100644 --- a/application/application-itests/pom.xml +++ b/application/application-itests/pom.xml @@ -46,7 +46,6 @@ <properties> <asm-all.version>5.0.3</asm-all.version> <depends-maven-plugin.version>1.3</depends-maven-plugin.version> - <exam.version>4.13.5</exam.version> <geronimo-jta_1.1_spec.version>1.1.1</geronimo-jta_1.1_spec.version> <javax.inject.version>1</javax.inject.version> <org.apache.aries.application.default.local.platform.version>1.0.0</org.apache.aries.application.default.local.platform.version> @@ -69,7 +68,8 @@ <org.apache.felix.bundlerepository.version>1.6.6</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.6.16</url.version> + <pax-exam.version>4.13.5</pax-exam.version> + <pax-url.version>2.6.16</pax-url.version> </properties> <dependencies> @@ -102,31 +102,31 @@ <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam</artifactId> - <version>${exam.version}</version> + <version>${pax-exam.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam-junit4</artifactId> - <version>${exam.version}</version> + <version>${pax-exam.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam-container-native</artifactId> - <version>${exam.version}</version> + <version>${pax-exam.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam-link-mvn</artifactId> - <version>${exam.version}</version> + <version>${pax-exam.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.url</groupId> <artifactId>pax-url-aether</artifactId> - <version>${url.version}</version> + <version>${pax-url.version}</version> <scope>test</scope> </dependency> <!-- TODO ARIES-2165 Use testsupport dependency when application runs on newer eclispe --> diff --git a/application/application-resolve-transform-cm-itests/pom.xml b/application/application-resolve-transform-cm-itests/pom.xml index 40a11bed9..2988620d3 100644 --- a/application/application-resolve-transform-cm-itests/pom.xml +++ b/application/application-resolve-transform-cm-itests/pom.xml @@ -60,7 +60,7 @@ <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>2.6.16</pax-url-aether.version> + <pax-url.version>2.6.16</pax-url.version> </properties> <dependencies> @@ -163,7 +163,7 @@ <dependency> <groupId>org.ops4j.pax.url</groupId> <artifactId>pax-url-aether</artifactId> - <version>${pax-url-aether.version}</version> + <version>${pax-url.version}</version> <scope>test</scope> </dependency> <!-- TODO ARIES-2165 Use testsupport dependency when application runs on newer eclispe --> diff --git a/blueprint/itests/blueprint-itests/pom.xml b/blueprint/itests/blueprint-itests/pom.xml index d79001214..c5cb99993 100644 --- a/blueprint/itests/blueprint-itests/pom.xml +++ b/blueprint/itests/blueprint-itests/pom.xml @@ -55,7 +55,6 @@ <blueprint.spring.version>${blueprint.spring.dev.version}</blueprint.spring.version> <commons-jexl.version>2.1.1</commons-jexl.version> <depends-maven-plugin.version>1.5.0</depends-maven-plugin.version> - <exam.version>4.13.5</exam.version> <maven-surefire-plugin.version>3.5.2</maven-surefire-plugin.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> @@ -64,9 +63,10 @@ <org.apache.servicemix.bundles.aopalliance.version>1.0_6</org.apache.servicemix.bundles.aopalliance.version> <org.apache.servicemix.bundles.spring.version>5.3.39_1</org.apache.servicemix.bundles.spring.version> <org.eclipse.osgi.version>3.11.3</org.eclipse.osgi.version> + <pax-exam.version>4.13.5</pax-exam.version> + <pax-tinybundles.version>2.0.0</pax-tinybundles.version> + <pax-url.version>2.6.16</pax-url.version> <slf4j.version>1.7.7</slf4j.version> - <tinybundles.version>2.0.0</tinybundles.version> - <url.version>2.6.16</url.version> <xbean.version>4.5</xbean.version> </properties> @@ -230,37 +230,37 @@ <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam</artifactId> - <version>${exam.version}</version> + <version>${pax-exam.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam-container-native</artifactId> - <version>${exam.version}</version> + <version>${pax-exam.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam-junit4</artifactId> - <version>${exam.version}</version> + <version>${pax-exam.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam-link-mvn</artifactId> - <version>${exam.version}</version> + <version>${pax-exam.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.url</groupId> <artifactId>pax-url-aether</artifactId> - <version>${url.version}</version> + <version>${pax-url.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.tinybundles</groupId> <artifactId>tinybundles</artifactId> - <version>${tinybundles.version}</version> + <version>${pax-tinybundles.version}</version> </dependency> <dependency> <groupId>junit</groupId> diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/pom.xml b/blueprint/plugin/blueprint-maven-plugin-itest/pom.xml index e88faccad..56e4d222f 100644 --- a/blueprint/plugin/blueprint-maven-plugin-itest/pom.xml +++ b/blueprint/plugin/blueprint-maven-plugin-itest/pom.xml @@ -38,8 +38,13 @@ <aries.skip.version.check>true</aries.skip.version.check> <blueprint-maven-plugin.version>1.10.1-SNAPSHOT</blueprint-maven-plugin.version> - <maven-invoker-plugin.version>3.9.0</maven-invoker-plugin.version> <groovy.version>4.0.24</groovy.version> + <javax.enterprise.cdi-api.version>1.2</javax.enterprise.cdi-api.version> + <javax.inject.version>1</javax.inject.version> + <javax.transaction-api.version>1.2</javax.transaction-api.version> + <maven-invoker-plugin.version>3.9.0</maven-invoker-plugin.version> + <pax-cdi.version>0.8.0</pax-cdi.version> + <spring.version>3.1.4.RELEASE</spring.version> </properties> <scm> @@ -48,6 +53,64 @@ <url>https://gitbox.apache.org/repos/asf?p=aries.git;a=summary</url> </scm> + <!-- adding dependencies used in tested subproject to have automatic dependency updates --> + <dependencies> + <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + <version>${javax.inject.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + <version>${javax.enterprise.cdi-api.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>javax.transaction-api</artifactId> + <version>${javax.transaction-api.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.ops4j.pax.cdi</groupId> + <artifactId>pax-cdi-api</artifactId> + <version>${pax-cdi.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + <version>${spring.version}</version> + <scope>test</scope> + <exclusions> + <exclusion> + <artifactId>spring-aop</artifactId> + <groupId>org.springframework</groupId> + </exclusion> + <exclusion> + <artifactId>spring-core</artifactId> + <groupId>org.springframework</groupId> + </exclusion> + <exclusion> + <artifactId>spring-expression</artifactId> + <groupId>org.springframework</groupId> + </exclusion> + <exclusion> + <artifactId>spring-asm</artifactId> + <groupId>org.springframework</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-tx</artifactId> + <version>${spring.version}</version> + <scope>test</scope> + </dependency> + </dependencies> + <build> <plugins> <plugin> diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/custom-destination/pom.xml b/blueprint/plugin/blueprint-maven-plugin-itest/src/it/custom-destination/pom.xml index c92232161..e8383f319 100644 --- a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/custom-destination/pom.xml +++ b/blueprint/plugin/blueprint-maven-plugin-itest/src/it/custom-destination/pom.xml @@ -30,7 +30,7 @@ <dependency> <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> - <version>1</version> + <version>@javax.inject.version@</version> </dependency> </dependencies> diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/fail-on-conflict/pom.xml b/blueprint/plugin/blueprint-maven-plugin-itest/src/it/fail-on-conflict/pom.xml index e79b306ec..d68487769 100644 --- a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/fail-on-conflict/pom.xml +++ b/blueprint/plugin/blueprint-maven-plugin-itest/src/it/fail-on-conflict/pom.xml @@ -30,7 +30,7 @@ <dependency> <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> - <version>1</version> + <version>@javax.inject.version@</version> </dependency> </dependencies> diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/multiple-invocation/pom.xml b/blueprint/plugin/blueprint-maven-plugin-itest/src/it/multiple-invocation/pom.xml index 05d487f68..262282238 100644 --- a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/multiple-invocation/pom.xml +++ b/blueprint/plugin/blueprint-maven-plugin-itest/src/it/multiple-invocation/pom.xml @@ -30,7 +30,7 @@ <dependency> <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> - <version>1</version> + <version>@javax.inject.version@</version> </dependency> </dependencies> diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/pax-cdi/pom.xml b/blueprint/plugin/blueprint-maven-plugin-itest/src/it/pax-cdi/pom.xml index 44de0976a..c38e30bba 100644 --- a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/pax-cdi/pom.xml +++ b/blueprint/plugin/blueprint-maven-plugin-itest/src/it/pax-cdi/pom.xml @@ -30,12 +30,12 @@ <dependency> <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> - <version>1</version> + <version>@javax.inject.version@</version> </dependency> <dependency> <groupId>org.ops4j.pax.cdi</groupId> <artifactId>pax-cdi-api</artifactId> - <version>0.8.0</version> + <version>@pax-cdi.version@</version> </dependency> </dependencies> diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/produced-bean-by-method-name/pom.xml b/blueprint/plugin/blueprint-maven-plugin-itest/src/it/produced-bean-by-method-name/pom.xml index 9ea676e05..de29c7bc9 100644 --- a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/produced-bean-by-method-name/pom.xml +++ b/blueprint/plugin/blueprint-maven-plugin-itest/src/it/produced-bean-by-method-name/pom.xml @@ -30,12 +30,12 @@ <dependency> <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> - <version>1</version> + <version>@javax.inject.version@</version> </dependency> <dependency> <groupId>javax.enterprise</groupId> <artifactId>cdi-api</artifactId> - <version>1.2</version> + <version>@javax.enterprise.cdi-api.version@</version> </dependency> </dependencies> diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/scanpath-restrict/pom.xml b/blueprint/plugin/blueprint-maven-plugin-itest/src/it/scanpath-restrict/pom.xml index eb8a4437b..ce779b563 100644 --- a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/scanpath-restrict/pom.xml +++ b/blueprint/plugin/blueprint-maven-plugin-itest/src/it/scanpath-restrict/pom.xml @@ -30,7 +30,7 @@ <dependency> <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> - <version>1</version> + <version>@javax.inject.version@</version> </dependency> </dependencies> diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/simple-project/pom.xml b/blueprint/plugin/blueprint-maven-plugin-itest/src/it/simple-project/pom.xml index e5899fbc6..fcc61f2c9 100644 --- a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/simple-project/pom.xml +++ b/blueprint/plugin/blueprint-maven-plugin-itest/src/it/simple-project/pom.xml @@ -30,7 +30,7 @@ <dependency> <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> - <version>1</version> + <version>@javax.inject.version@</version> </dependency> </dependencies> diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/spring/pom.xml b/blueprint/plugin/blueprint-maven-plugin-itest/src/it/spring/pom.xml index b3d998a8c..84c869b46 100644 --- a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/spring/pom.xml +++ b/blueprint/plugin/blueprint-maven-plugin-itest/src/it/spring/pom.xml @@ -30,7 +30,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> @@ -53,7 +53,7 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-tx</artifactId> - <version>3.1.4.RELEASE</version> + <version>@spring.version@</version> </dependency> </dependencies> diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/transaction-annotation/pom.xml b/blueprint/plugin/blueprint-maven-plugin-itest/src/it/transaction-annotation/pom.xml index a09074f75..387110558 100644 --- a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/transaction-annotation/pom.xml +++ b/blueprint/plugin/blueprint-maven-plugin-itest/src/it/transaction-annotation/pom.xml @@ -30,12 +30,12 @@ <dependency> <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> - <version>1</version> + <version>@javax.inject.version@</version> </dependency> <dependency> <groupId>javax.transaction</groupId> <artifactId>javax.transaction-api</artifactId> - <version>1.2</version> + <version>@javax.transaction-api.version@</version> </dependency> </dependencies> diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/with-provide/a/pom.xml b/blueprint/plugin/blueprint-maven-plugin-itest/src/it/with-provide/a/pom.xml index c535ca54a..6f4b493b5 100644 --- a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/with-provide/a/pom.xml +++ b/blueprint/plugin/blueprint-maven-plugin-itest/src/it/with-provide/a/pom.xml @@ -30,12 +30,12 @@ <dependency> <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> - <version>1</version> + <version>@javax.inject.version@</version> </dependency> <dependency> <groupId>org.apache.aries.blueprint.plugin.itest</groupId> <artifactId>b</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>${project.version}</version> <scope>provided</scope> </dependency> </dependencies> @@ -63,7 +63,7 @@ <dependency> <groupId>org.apache.aries.blueprint.plugin.itest</groupId> <artifactId>c</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>${project.version}</version> </dependency> </dependencies> </plugin> diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/with-provide/b/pom.xml b/blueprint/plugin/blueprint-maven-plugin-itest/src/it/with-provide/b/pom.xml index c3feb3ce9..9b398ab75 100644 --- a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/with-provide/b/pom.xml +++ b/blueprint/plugin/blueprint-maven-plugin-itest/src/it/with-provide/b/pom.xml @@ -30,7 +30,7 @@ <dependency> <groupId>org.apache.aries.blueprint.plugin.itest</groupId> <artifactId>c</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>${project.version}</version> <scope>provided</scope> </dependency> </dependencies> diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/with-provide/c/pom.xml b/blueprint/plugin/blueprint-maven-plugin-itest/src/it/with-provide/c/pom.xml index b33dc575d..588e57a2f 100644 --- a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/with-provide/c/pom.xml +++ b/blueprint/plugin/blueprint-maven-plugin-itest/src/it/with-provide/c/pom.xml @@ -30,7 +30,7 @@ <dependency> <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> - <version>1</version> + <version>@javax.inject.version@</version> </dependency> </dependencies> 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 a97fc857f..8aa3d6afd 100644 --- a/blueprint/plugin/blueprint-maven-plugin-pax-cdi-handlers/pom.xml +++ b/blueprint/plugin/blueprint-maven-plugin-pax-cdi-handlers/pom.xml @@ -36,7 +36,7 @@ <properties> <blueprint-maven-plugin-spi.version>1.0.0</blueprint-maven-plugin-spi.version> <guava.version>33.4.0-jre</guava.version> - <pax-cdi-api.version>0.8.0</pax-cdi-api.version> + <pax-cdi.version>0.8.0</pax-cdi.version> </properties> <scm> @@ -54,7 +54,7 @@ <dependency> <groupId>org.ops4j.pax.cdi</groupId> <artifactId>pax-cdi-api</artifactId> - <version>${pax-cdi-api.version}</version> + <version>${pax-cdi.version}</version> </dependency> <dependency> <groupId>com.google.guava</groupId> diff --git a/blueprint/plugin/blueprint-maven-plugin/pom.xml b/blueprint/plugin/blueprint-maven-plugin/pom.xml index 5e6e0aeec..f0ca19ecf 100644 --- a/blueprint/plugin/blueprint-maven-plugin/pom.xml +++ b/blueprint/plugin/blueprint-maven-plugin/pom.xml @@ -42,7 +42,7 @@ <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.enterprise.cdi-api.version>1.2</javax.enterprise.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> @@ -147,7 +147,7 @@ <dependency> <groupId>javax.enterprise</groupId> <artifactId>cdi-api</artifactId> - <version>${cdi-api.version}</version> + <version>${javax.enterprise.cdi-api.version}</version> </dependency> <dependency> <groupId>javax.persistence</groupId> diff --git a/ejb/ejb-modeller-itest/pom.xml b/ejb/ejb-modeller-itest/pom.xml index 960a62d3c..e25b5c550 100644 --- a/ejb/ejb-modeller-itest/pom.xml +++ b/ejb/ejb-modeller-itest/pom.xml @@ -47,7 +47,6 @@ <commons-lang.version>2.6</commons-lang.version> <commons-lang3.version>3.17.0</commons-lang3.version> <depends-maven-plugin.version>1.5.0</depends-maven-plugin.version> - <exam.version>4.13.5</exam.version> <geronimo-activation_1.1_spec.version>1.1</geronimo-activation_1.1_spec.version> <geronimo-annotation_1.1_spec.version>1.0.1</geronimo-annotation_1.1_spec.version> <geronimo-ejb_3.1_spec.version>1.0.2</geronimo-ejb_3.1_spec.version> @@ -89,8 +88,9 @@ <org.apache.servicemix.bundles.wsdl4j-1.6.1.version>4.0-m1</org.apache.servicemix.bundles.wsdl4j-1.6.1.version> <org.eclipse.osgi.version>3.22.0</org.eclipse.osgi.version> <scannotation.version>1.0.2_1</scannotation.version> - <tinybundles.version>2.0.0</tinybundles.version> - <url.version>2.6.16</url.version> + <pax-exam.version>4.13.5</pax-exam.version> + <pax-tinybundles.version>2.0.0</pax-tinybundles.version> + <pax-url.version>2.6.16</pax-url.version> <xbeans.version>4.25</xbeans.version> </properties> @@ -475,31 +475,31 @@ <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam</artifactId> - <version>${exam.version}</version> + <version>${pax-exam.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam-container-native</artifactId> - <version>${exam.version}</version> + <version>${pax-exam.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam-junit4</artifactId> - <version>${exam.version}</version> + <version>${pax-exam.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam-link-mvn</artifactId> - <version>${exam.version}</version> + <version>${pax-exam.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.url</groupId> <artifactId>pax-url-aether</artifactId> - <version>${url.version}</version> + <version>${pax-url.version}</version> <scope>test</scope> </dependency> <!-- <dependency> --> @@ -517,7 +517,7 @@ <dependency> <groupId>org.ops4j.pax.tinybundles</groupId> <artifactId>tinybundles</artifactId> - <version>${tinybundles.version}</version> + <version>${pax-tinybundles.version}</version> <exclusions> <exclusion> <artifactId>org.osgi.core</artifactId> diff --git a/ejb/openejb-extender-itest/pom.xml b/ejb/openejb-extender-itest/pom.xml index 7807948db..8a6ee133f 100644 --- a/ejb/openejb-extender-itest/pom.xml +++ b/ejb/openejb-extender-itest/pom.xml @@ -94,10 +94,9 @@ <org.eclipse.osgi.version>3.22.0</org.eclipse.osgi.version> <org.osgi.enterprise.version>4.2.0</org.osgi.enterprise.version> <pax-exam.version>4.13.5</pax-exam.version> - <pax-logging-api.version>1.7.2</pax-logging-api.version> - <pax-logging-service.version>1.7.2</pax-logging-service.version> + <pax-logging.version>1.7.2</pax-logging.version> <pax-swissbox.version>1.8.3</pax-swissbox.version> - <pax-url-aether.version>2.6.16</pax-url-aether.version> + <pax-url.version>2.6.16</pax-url.version> <scannotation.version>1.0.2_1</scannotation.version> <xbeansVersion>3.8</xbeansVersion> </properties> @@ -125,13 +124,13 @@ <dependency> <groupId>org.ops4j.pax.logging</groupId> <artifactId>pax-logging-api</artifactId> - <version>${pax-logging-api.version}</version> + <version>${pax-logging.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.logging</groupId> <artifactId>pax-logging-service</artifactId> - <version>${pax-logging-service.version}</version> + <version>${pax-logging.version}</version> <scope>test</scope> </dependency> @@ -163,7 +162,7 @@ <dependency> <groupId>org.ops4j.pax.url</groupId> <artifactId>pax-url-aether</artifactId> - <version>${pax-url-aether.version}</version> + <version>${pax-url.version}</version> <scope>test</scope> </dependency> <!-- Explicit dependency for swissbox to fix https://github.com/ops4j/org.ops4j.pax.exam/issues/1124 --> diff --git a/jmx/jmx-itests/pom.xml b/jmx/jmx-itests/pom.xml index 2c1bed45d..9271b57e7 100644 --- a/jmx/jmx-itests/pom.xml +++ b/jmx/jmx-itests/pom.xml @@ -52,10 +52,10 @@ <org.apache.aries.util.version>1.0.0</org.apache.aries.util.version> <org.apache.felix.configadmin.version>1.8.0</org.apache.felix.configadmin.version> <org.eclipse.osgi.version>3.22.0</org.eclipse.osgi.version> + <pax-exam.version>4.13.5</pax-exam.version> + <pax-tinybundles.version>2.0.0</pax-tinybundles.version> + <pax-url.version>2.6.16</pax-url.version> <slf4j-api.version>1.7.7</slf4j-api.version> - <tinybundles.version>2.0.0</tinybundles.version> - <exam.version>4.13.5</exam.version> - <url.version>2.6.16</url.version> </properties> <dependencies> @@ -176,37 +176,37 @@ <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam</artifactId> - <version>${exam.version}</version> + <version>${pax-exam.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam-container-native</artifactId> - <version>${exam.version}</version> + <version>${pax-exam.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam-junit4</artifactId> - <version>${exam.version}</version> + <version>${pax-exam.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam-link-mvn</artifactId> - <version>${exam.version}</version> + <version>${pax-exam.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.url</groupId> <artifactId>pax-url-aether</artifactId> - <version>${url.version}</version> + <version>${pax-url.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.tinybundles</groupId> <artifactId>tinybundles</artifactId> - <version>${tinybundles.version}</version> + <version>${pax-tinybundles.version}</version> <exclusions> <exclusion> <artifactId>org.osgi.core</artifactId> diff --git a/jmx/jmx-whiteboard/pom.xml b/jmx/jmx-whiteboard/pom.xml index 923ccc38c..e9bf02124 100644 --- a/jmx/jmx-whiteboard/pom.xml +++ b/jmx/jmx-whiteboard/pom.xml @@ -80,14 +80,14 @@ javax.management.MBeanServer </aries.osgi.import.service> - <exam.version>4.13.5</exam.version> <javax.inject.version>1</javax.inject.version> <maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version> <mockito-core.version>4.11.0</mockito-core.version> <org.apache.aries.jmx.core.version>1.1.8</org.apache.aries.jmx.core.version> <org.eclipse.osgi.version>3.22.0</org.eclipse.osgi.version> - <tinybundles.version>2.0.0</tinybundles.version> - <url.version>2.6.16</url.version> + <pax-exam.version>4.13.5</pax-exam.version> + <pax-tinybundles.version>2.0.0</pax-tinybundles.version> + <pax-url.version>2.6.16</pax-url.version> </properties> <build> @@ -177,37 +177,37 @@ <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam</artifactId> - <version>${exam.version}</version> + <version>${pax-exam.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam-junit4</artifactId> - <version>${exam.version}</version> + <version>${pax-exam.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam-container-native</artifactId> - <version>${exam.version}</version> + <version>${pax-exam.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam-link-mvn</artifactId> - <version>${exam.version}</version> + <version>${pax-exam.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.url</groupId> <artifactId>pax-url-aether</artifactId> - <version>${url.version}</version> + <version>${pax-url.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.tinybundles</groupId> <artifactId>tinybundles</artifactId> - <version>${tinybundles.version}</version> + <version>${pax-tinybundles.version}</version> <scope>test</scope> </dependency> <dependency> diff --git a/jndi/jndi-url-itest/pom.xml b/jndi/jndi-url-itest/pom.xml index 6c547bd0d..03c2a9463 100644 --- a/jndi/jndi-url-itest/pom.xml +++ b/jndi/jndi-url-itest/pom.xml @@ -59,11 +59,11 @@ <org.apache.servicemix.bundles.cglib.version>3.3.0_1</org.apache.servicemix.bundles.cglib.version> <org.eclipse.osgi.version>3.22.0</org.eclipse.osgi.version> <pax-exam.version>4.13.0</pax-exam.version> + <pax-tinybundles.version>2.0.0</pax-tinybundles.version> <pax-url.version>2.6.16</pax-url.version> <pax-web.version>8.0.30</pax-web.version> <services.version>3.2.100.v20100503</services.version> <slf4j-api.version>1.7.7</slf4j-api.version> - <tinybundles.version>2.0.0</tinybundles.version> <xbean.version>4.26</xbean.version> </properties> @@ -191,7 +191,7 @@ <dependency> <groupId>org.ops4j.pax.tinybundles</groupId> <artifactId>tinybundles</artifactId> - <version>${tinybundles.version}</version> + <version>${pax-tinybundles.version}</version> <exclusions> <exclusion> <groupId>org.osgi</groupId> diff --git a/proxy/proxy-itests/pom.xml b/proxy/proxy-itests/pom.xml index 19c5cc962..d2aa48569 100644 --- a/proxy/proxy-itests/pom.xml +++ b/proxy/proxy-itests/pom.xml @@ -45,7 +45,6 @@ <properties> <asm.version>9.7.1</asm.version> <depends-maven-plugin.version>1.5.0</depends-maven-plugin.version> - <exam.version>4.13.5</exam.version> <javax.inject.version>1</javax.inject.version> <logback.version>1.5.16</logback.version> <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version> @@ -53,9 +52,10 @@ <org.apache.aries.proxy.version>1.1.15-SNAPSHOT</org.apache.aries.proxy.version> <org.apache.aries.testsupport.unit.version>2.0.0-SNAPSHOT</org.apache.aries.testsupport.unit.version> <org.eclipse.osgi.version>3.22.0</org.eclipse.osgi.version> + <pax-exam.version>4.13.5</pax-exam.version> + <pax-tinybundles.version>2.0.0</pax-tinybundles.version> + <pax-url.version>2.6.16</pax-url.version> <slf4j-api.version>1.7.7</slf4j-api.version> - <tinybundles.version>2.0.0</tinybundles.version> - <url.version>2.6.16</url.version> </properties> <dependencies> @@ -98,31 +98,31 @@ <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam</artifactId> - <version>${exam.version}</version> + <version>${pax-exam.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam-container-native</artifactId> - <version>${exam.version}</version> + <version>${pax-exam.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam-junit4</artifactId> - <version>${exam.version}</version> + <version>${pax-exam.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam-link-mvn</artifactId> - <version>${exam.version}</version> + <version>${pax-exam.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.url</groupId> <artifactId>pax-url-aether</artifactId> - <version>${url.version}</version> + <version>${pax-url.version}</version> <scope>test</scope> </dependency> <dependency> @@ -140,7 +140,7 @@ <dependency> <groupId>org.ops4j.pax.tinybundles</groupId> <artifactId>tinybundles</artifactId> - <version>${tinybundles.version}</version> + <version>${pax-tinybundles.version}</version> </dependency> <dependency> <groupId>junit</groupId> diff --git a/quiesce/quiesce-manager-itest/pom.xml b/quiesce/quiesce-manager-itest/pom.xml index 0b7a8d04d..4ae3a459a 100644 --- a/quiesce/quiesce-manager-itest/pom.xml +++ b/quiesce/quiesce-manager-itest/pom.xml @@ -47,7 +47,7 @@ <org.apache.aries.util.version>1.2.0-SNAPSHOT</org.apache.aries.util.version> <org.eclipse.osgi.version>3.22.0</org.eclipse.osgi.version> <pax-exam.version>4.13.5</pax-exam.version> - <pax-url-aether.version>2.6.16</pax-url-aether.version> + <pax-url.version>2.6.16</pax-url.version> </properties> <dependencies> @@ -121,7 +121,7 @@ <dependency> <groupId>org.ops4j.pax.url</groupId> <artifactId>pax-url-aether</artifactId> - <version>${pax-url-aether.version}</version> + <version>${pax-url.version}</version> <scope>test</scope> </dependency> <dependency> diff --git a/subsystem/subsystem-itests/pom.xml b/subsystem/subsystem-itests/pom.xml index 2225f55c2..90c4ecd16 100644 --- a/subsystem/subsystem-itests/pom.xml +++ b/subsystem/subsystem-itests/pom.xml @@ -42,7 +42,6 @@ <build-helper-maven-plugin.version>3.6.0</build-helper-maven-plugin.version> <depends-maven-plugin.version>1.5.0</depends-maven-plugin.version> <easymock.version>3.0</easymock.version> - <exam.version>4.13.5</exam.version> <logback.version>1.5.16</logback.version> <maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version> <maven-jar-plugin.version>3.4.2</maven-jar-plugin.version> @@ -66,9 +65,10 @@ <osgi.cmpn.version>7.0.0</osgi.cmpn.version> <osgi.core.version>8.0.0</osgi.core.version> <osgi.enterprise.version>6.0.0</osgi.enterprise.version> + <pax-exam.version>4.13.5</pax-exam.version> + <pax-tinybundles.version>2.0.0</pax-tinybundles.version> + <pax-url.version>2.6.16</pax-url.version> <slf4j-api.version>1.7.7</slf4j-api.version> - <tinybundles.version>2.0.0</tinybundles.version> - <url.version>2.6.16</url.version> </properties> <dependencies> @@ -287,31 +287,31 @@ <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam</artifactId> - <version>${exam.version}</version> + <version>${pax-exam.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam-container-native</artifactId> - <version>${exam.version}</version> + <version>${pax-exam.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam-junit4</artifactId> - <version>${exam.version}</version> + <version>${pax-exam.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam-link-mvn</artifactId> - <version>${exam.version}</version> + <version>${pax-exam.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.url</groupId> <artifactId>pax-url-aether</artifactId> - <version>${url.version}</version> + <version>${pax-url.version}</version> <scope>test</scope> </dependency> <dependency> @@ -329,7 +329,7 @@ <dependency> <groupId>org.ops4j.pax.tinybundles</groupId> <artifactId>tinybundles</artifactId> - <version>${tinybundles.version}</version> + <version>${pax-tinybundles.version}</version> <exclusions> <exclusion> <artifactId>org.osgi.core</artifactId> diff --git a/transaction/transaction-itests/pom.xml b/transaction/transaction-itests/pom.xml index 4232dff73..a3dff81e2 100644 --- a/transaction/transaction-itests/pom.xml +++ b/transaction/transaction-itests/pom.xml @@ -41,9 +41,8 @@ <properties> <asm.version>5.0.3</asm.version> - <cdi-api.version>1.2</cdi-api.version> + <javax.enterprise.cdi-api.version>1.2</javax.enterprise.cdi-api.version> <depends-maven-plugin.version>1.5.0</depends-maven-plugin.version> - <exam.version>4.13.5</exam.version> <geronimo-connector.version>3.1.1</geronimo-connector.version> <geronimo-j2ee-connector_1.6_spec.version>1.0</geronimo-j2ee-connector_1.6_spec.version> <geronimo-validation_1.0_spec.version>1.1</geronimo-validation_1.0_spec.version> @@ -66,9 +65,10 @@ <org.eclipse.osgi.version>3.22.0</org.eclipse.osgi.version> <org.osgi.core.version>6.0.0</org.osgi.core.version> <pax-swissbox.version>1.8.3</pax-swissbox.version> + <pax-exam.version>4.13.5</pax-exam.version> + <pax-tinybundles.version>2.0.0</pax-tinybundles.version> + <pax-url.version>2.6.16</pax-url.version> <slf4j-api.version>1.7.7</slf4j-api.version> - <tinybundles.version>2.0.0</tinybundles.version> - <url.version>2.6.16</url.version> </properties> <dependencies> @@ -152,7 +152,7 @@ <dependency> <groupId>javax.enterprise</groupId> <artifactId>cdi-api</artifactId> - <version>${cdi-api.version}</version> + <version>${javax.enterprise.cdi-api.version}</version> </dependency> <dependency> @@ -224,37 +224,37 @@ <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam</artifactId> - <version>${exam.version}</version> + <version>${pax-exam.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam-container-forked</artifactId> - <version>${exam.version}</version> + <version>${pax-exam.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam-junit4</artifactId> - <version>${exam.version}</version> + <version>${pax-exam.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam-link-mvn</artifactId> - <version>${exam.version}</version> + <version>${pax-exam.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.url</groupId> <artifactId>pax-url-aether</artifactId> - <version>${url.version}</version> + <version>${pax-url.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.tinybundles</groupId> <artifactId>tinybundles</artifactId> - <version>${tinybundles.version}</version> + <version>${pax-tinybundles.version}</version> </dependency> <!-- Explicit dependency for swissbox to fix https://github.com/ops4j/org.ops4j.pax.exam/issues/1124 --> <dependency> diff --git a/web/web-itests/pom.xml b/web/web-itests/pom.xml index 634940bfa..31cd1b041 100644 --- a/web/web-itests/pom.xml +++ b/web/web-itests/pom.xml @@ -43,14 +43,14 @@ <properties> <asm.version>9.7.1</asm.version> <depends-maven-plugin.version>1.5.0</depends-maven-plugin.version> - <exam.version>4.13.5</exam.version> <org.apache.aries.testsupport.unit.version>2.0.0-SNAPSHOT</org.apache.aries.testsupport.unit.version> <org.apache.aries.util.version>1.2.0-SNAPSHOT</org.apache.aries.util.version> <org.apache.aries.web.urlhandler.version>1.0.1-SNAPSHOT</org.apache.aries.web.urlhandler.version> <org.apache.felix.configadmin.version>1.9.26</org.apache.felix.configadmin.version> <org.eclipse.osgi.version>3.22.0</org.eclipse.osgi.version> - <tinybundles.version>2.1.1</tinybundles.version> - <url.version>2.6.16</url.version> + <pax-exam.version>4.13.5</pax-exam.version> + <pax-tinybundles.version>2.1.1</pax-tinybundles.version> + <pax-url.version>2.6.16</pax-url.version> </properties> <dependencies> @@ -132,37 +132,37 @@ <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam</artifactId> - <version>${exam.version}</version> + <version>${pax-exam.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam-container-native</artifactId> - <version>${exam.version}</version> + <version>${pax-exam.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.tinybundles</groupId> <artifactId>tinybundles</artifactId> - <version>${tinybundles.version}</version> + <version>${pax-tinybundles.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam-junit4</artifactId> - <version>${exam.version}</version> + <version>${pax-exam.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam-link-mvn</artifactId> - <version>${exam.version}</version> + <version>${pax-exam.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.url</groupId> <artifactId>pax-url-aether</artifactId> - <version>${url.version}</version> + <version>${pax-url.version}</version> <scope>test</scope> </dependency>
