Skip to content

Commit 2af6279

Browse files
alien11689alien11689
committed
[MAINTENANCE] Organize pax dependency version properties
1 parent b39b6fd commit 2af6279

File tree

28 files changed

+178
-116
lines changed

28 files changed

+178
-116
lines changed

‎application/application-itests/pom.xml

+7-7
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
<properties>
4747
<asm-all.version>5.0.3</asm-all.version>
4848
<depends-maven-plugin.version>1.3</depends-maven-plugin.version>
49-
<exam.version>4.13.5</exam.version>
5049
<geronimo-jta_1.1_spec.version>1.1.1</geronimo-jta_1.1_spec.version>
5150
<javax.inject.version>1</javax.inject.version>
5251
<org.apache.aries.application.default.local.platform.version>1.0.0</org.apache.aries.application.default.local.platform.version>
@@ -69,7 +68,8 @@
6968
<org.apache.felix.bundlerepository.version>1.6.6</org.apache.felix.bundlerepository.version>
7069
<org.apache.felix.configadmin.version>1.2.4</org.apache.felix.configadmin.version>
7170
<org.eclipse.osgi.version>3.8.0.v20120529-1548</org.eclipse.osgi.version>
72-
<url.version>2.6.16</url.version>
71+
<pax-exam.version>4.13.5</pax-exam.version>
72+
<pax-url.version>2.6.16</pax-url.version>
7373
</properties>
7474

7575
<dependencies>
@@ -102,31 +102,31 @@
102102
<dependency>
103103
<groupId>org.ops4j.pax.exam</groupId>
104104
<artifactId>pax-exam</artifactId>
105-
<version>${exam.version}</version>
105+
<version>${pax-exam.version}</version>
106106
<scope>test</scope>
107107
</dependency>
108108
<dependency>
109109
<groupId>org.ops4j.pax.exam</groupId>
110110
<artifactId>pax-exam-junit4</artifactId>
111-
<version>${exam.version}</version>
111+
<version>${pax-exam.version}</version>
112112
<scope>test</scope>
113113
</dependency>
114114
<dependency>
115115
<groupId>org.ops4j.pax.exam</groupId>
116116
<artifactId>pax-exam-container-native</artifactId>
117-
<version>${exam.version}</version>
117+
<version>${pax-exam.version}</version>
118118
<scope>test</scope>
119119
</dependency>
120120
<dependency>
121121
<groupId>org.ops4j.pax.exam</groupId>
122122
<artifactId>pax-exam-link-mvn</artifactId>
123-
<version>${exam.version}</version>
123+
<version>${pax-exam.version}</version>
124124
<scope>test</scope>
125125
</dependency>
126126
<dependency>
127127
<groupId>org.ops4j.pax.url</groupId>
128128
<artifactId>pax-url-aether</artifactId>
129-
<version>${url.version}</version>
129+
<version>${pax-url.version}</version>
130130
<scope>test</scope>
131131
</dependency>
132132
<!-- TODO ARIES-2165 Use testsupport dependency when application runs on newer eclispe -->

‎application/application-resolve-transform-cm-itests/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<org.apache.aries.util.version>1.0.0</org.apache.aries.util.version>
6161
<org.eclipse.osgi.version>3.8.0.v20120529-1548</org.eclipse.osgi.version>
6262
<pax-exam.version>3.4.0</pax-exam.version>
63-
<pax-url-aether.version>2.6.16</pax-url-aether.version>
63+
<pax-url.version>2.6.16</pax-url.version>
6464
</properties>
6565

6666
<dependencies>
@@ -163,7 +163,7 @@
163163
<dependency>
164164
<groupId>org.ops4j.pax.url</groupId>
165165
<artifactId>pax-url-aether</artifactId>
166-
<version>${pax-url-aether.version}</version>
166+
<version>${pax-url.version}</version>
167167
<scope>test</scope>
168168
</dependency>
169169
<!-- TODO ARIES-2165 Use testsupport dependency when application runs on newer eclispe -->

‎blueprint/itests/blueprint-itests/pom.xml

+9-9
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@
5555
<blueprint.spring.version>${blueprint.spring.dev.version}</blueprint.spring.version>
5656
<commons-jexl.version>2.1.1</commons-jexl.version>
5757
<depends-maven-plugin.version>1.5.0</depends-maven-plugin.version>
58-
<exam.version>4.13.5</exam.version>
5958
<maven-surefire-plugin.version>3.5.2</maven-surefire-plugin.version>
6059
<org.apache.aries.proxy.version>1.1.0</org.apache.aries.proxy.version>
6160
<org.apache.aries.quiesce.api.version>1.0.0</org.apache.aries.quiesce.api.version>
@@ -64,9 +63,10 @@
6463
<org.apache.servicemix.bundles.aopalliance.version>1.0_6</org.apache.servicemix.bundles.aopalliance.version>
6564
<org.apache.servicemix.bundles.spring.version>5.3.39_1</org.apache.servicemix.bundles.spring.version>
6665
<org.eclipse.osgi.version>3.11.3</org.eclipse.osgi.version>
66+
<pax-exam.version>4.13.5</pax-exam.version>
67+
<pax-tinybundles.version>2.0.0</pax-tinybundles.version>
68+
<pax-url.version>2.6.16</pax-url.version>
6769
<slf4j.version>1.7.7</slf4j.version>
68-
<tinybundles.version>2.0.0</tinybundles.version>
69-
<url.version>2.6.16</url.version>
7070
<xbean.version>4.5</xbean.version>
7171
</properties>
7272

@@ -230,37 +230,37 @@
230230
<dependency>
231231
<groupId>org.ops4j.pax.exam</groupId>
232232
<artifactId>pax-exam</artifactId>
233-
<version>${exam.version}</version>
233+
<version>${pax-exam.version}</version>
234234
<scope>test</scope>
235235
</dependency>
236236
<dependency>
237237
<groupId>org.ops4j.pax.exam</groupId>
238238
<artifactId>pax-exam-container-native</artifactId>
239-
<version>${exam.version}</version>
239+
<version>${pax-exam.version}</version>
240240
<scope>test</scope>
241241
</dependency>
242242
<dependency>
243243
<groupId>org.ops4j.pax.exam</groupId>
244244
<artifactId>pax-exam-junit4</artifactId>
245-
<version>${exam.version}</version>
245+
<version>${pax-exam.version}</version>
246246
<scope>test</scope>
247247
</dependency>
248248
<dependency>
249249
<groupId>org.ops4j.pax.exam</groupId>
250250
<artifactId>pax-exam-link-mvn</artifactId>
251-
<version>${exam.version}</version>
251+
<version>${pax-exam.version}</version>
252252
<scope>test</scope>
253253
</dependency>
254254
<dependency>
255255
<groupId>org.ops4j.pax.url</groupId>
256256
<artifactId>pax-url-aether</artifactId>
257-
<version>${url.version}</version>
257+
<version>${pax-url.version}</version>
258258
<scope>test</scope>
259259
</dependency>
260260
<dependency>
261261
<groupId>org.ops4j.pax.tinybundles</groupId>
262262
<artifactId>tinybundles</artifactId>
263-
<version>${tinybundles.version}</version>
263+
<version>${pax-tinybundles.version}</version>
264264
</dependency>
265265
<dependency>
266266
<groupId>junit</groupId>

‎blueprint/plugin/blueprint-maven-plugin-itest/pom.xml

+64-1
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,13 @@
3838
<aries.skip.version.check>true</aries.skip.version.check>
3939

4040
<blueprint-maven-plugin.version>1.10.1-SNAPSHOT</blueprint-maven-plugin.version>
41-
<maven-invoker-plugin.version>3.9.0</maven-invoker-plugin.version>
4241
<groovy.version>4.0.24</groovy.version>
42+
<javax.enterprise.cdi-api.version>1.2</javax.enterprise.cdi-api.version>
43+
<javax.inject.version>1</javax.inject.version>
44+
<javax.transaction-api.version>1.2</javax.transaction-api.version>
45+
<maven-invoker-plugin.version>3.9.0</maven-invoker-plugin.version>
46+
<pax-cdi.version>0.8.0</pax-cdi.version>
47+
<spring.version>3.1.4.RELEASE</spring.version>
4348
</properties>
4449

4550
<scm>
@@ -48,6 +53,64 @@
4853
<url>https://gitbox.apache.org/repos/asf?p=aries.git;a=summary</url>
4954
</scm>
5055

56+
<!-- adding dependencies used in tested subproject to have automatic dependency updates -->
57+
<dependencies>
58+
<dependency>
59+
<groupId>javax.inject</groupId>
60+
<artifactId>javax.inject</artifactId>
61+
<version>${javax.inject.version}</version>
62+
<scope>test</scope>
63+
</dependency>
64+
<dependency>
65+
<groupId>javax.enterprise</groupId>
66+
<artifactId>cdi-api</artifactId>
67+
<version>${javax.enterprise.cdi-api.version}</version>
68+
<scope>test</scope>
69+
</dependency>
70+
<dependency>
71+
<groupId>javax.transaction</groupId>
72+
<artifactId>javax.transaction-api</artifactId>
73+
<version>${javax.transaction-api.version}</version>
74+
<scope>test</scope>
75+
</dependency>
76+
<dependency>
77+
<groupId>org.ops4j.pax.cdi</groupId>
78+
<artifactId>pax-cdi-api</artifactId>
79+
<version>${pax-cdi.version}</version>
80+
<scope>test</scope>
81+
</dependency>
82+
<dependency>
83+
<groupId>org.springframework</groupId>
84+
<artifactId>spring-context</artifactId>
85+
<version>${spring.version}</version>
86+
<scope>test</scope>
87+
<exclusions>
88+
<exclusion>
89+
<artifactId>spring-aop</artifactId>
90+
<groupId>org.springframework</groupId>
91+
</exclusion>
92+
<exclusion>
93+
<artifactId>spring-core</artifactId>
94+
<groupId>org.springframework</groupId>
95+
</exclusion>
96+
<exclusion>
97+
<artifactId>spring-expression</artifactId>
98+
<groupId>org.springframework</groupId>
99+
</exclusion>
100+
<exclusion>
101+
<artifactId>spring-asm</artifactId>
102+
<groupId>org.springframework</groupId>
103+
</exclusion>
104+
</exclusions>
105+
</dependency>
106+
<dependency>
107+
<groupId>org.springframework</groupId>
108+
<artifactId>spring-tx</artifactId>
109+
<version>${spring.version}</version>
110+
<scope>test</scope>
111+
</dependency>
112+
</dependencies>
113+
51114
<build>
52115
<plugins>
53116
<plugin>

‎blueprint/plugin/blueprint-maven-plugin-itest/src/it/custom-destination/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<dependency>
3131
<groupId>javax.inject</groupId>
3232
<artifactId>javax.inject</artifactId>
33-
<version>1</version>
33+
<version>@javax.inject.version@</version>
3434
</dependency>
3535
</dependencies>
3636

‎blueprint/plugin/blueprint-maven-plugin-itest/src/it/fail-on-conflict/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<dependency>
3131
<groupId>javax.inject</groupId>
3232
<artifactId>javax.inject</artifactId>
33-
<version>1</version>
33+
<version>@javax.inject.version@</version>
3434
</dependency>
3535
</dependencies>
3636

‎blueprint/plugin/blueprint-maven-plugin-itest/src/it/multiple-invocation/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<dependency>
3131
<groupId>javax.inject</groupId>
3232
<artifactId>javax.inject</artifactId>
33-
<version>1</version>
33+
<version>@javax.inject.version@</version>
3434
</dependency>
3535
</dependencies>
3636

‎blueprint/plugin/blueprint-maven-plugin-itest/src/it/pax-cdi/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@
3030
<dependency>
3131
<groupId>javax.inject</groupId>
3232
<artifactId>javax.inject</artifactId>
33-
<version>1</version>
33+
<version>@javax.inject.version@</version>
3434
</dependency>
3535
<dependency>
3636
<groupId>org.ops4j.pax.cdi</groupId>
3737
<artifactId>pax-cdi-api</artifactId>
38-
<version>0.8.0</version>
38+
<version>@pax-cdi.version@</version>
3939
</dependency>
4040
</dependencies>
4141

‎blueprint/plugin/blueprint-maven-plugin-itest/src/it/produced-bean-by-method-name/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@
3030
<dependency>
3131
<groupId>javax.inject</groupId>
3232
<artifactId>javax.inject</artifactId>
33-
<version>1</version>
33+
<version>@javax.inject.version@</version>
3434
</dependency>
3535
<dependency>
3636
<groupId>javax.enterprise</groupId>
3737
<artifactId>cdi-api</artifactId>
38-
<version>1.2</version>
38+
<version>@javax.enterprise.cdi-api.version@</version>
3939
</dependency>
4040
</dependencies>
4141

‎blueprint/plugin/blueprint-maven-plugin-itest/src/it/scanpath-restrict/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<dependency>
3131
<groupId>javax.inject</groupId>
3232
<artifactId>javax.inject</artifactId>
33-
<version>1</version>
33+
<version>@javax.inject.version@</version>
3434
</dependency>
3535
</dependencies>
3636

‎blueprint/plugin/blueprint-maven-plugin-itest/src/it/simple-project/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<dependency>
3131
<groupId>javax.inject</groupId>
3232
<artifactId>javax.inject</artifactId>
33-
<version>1</version>
33+
<version>@javax.inject.version@</version>
3434
</dependency>
3535
</dependencies>
3636

‎blueprint/plugin/blueprint-maven-plugin-itest/src/it/spring/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<dependency>
3131
<groupId>org.springframework</groupId>
3232
<artifactId>spring-context</artifactId>
33-
<version>3.1.4.RELEASE</version>
33+
<version>@spring.version@</version>
3434
<exclusions>
3535
<exclusion>
3636
<artifactId>spring-aop</artifactId>
@@ -53,7 +53,7 @@
5353
<dependency>
5454
<groupId>org.springframework</groupId>
5555
<artifactId>spring-tx</artifactId>
56-
<version>3.1.4.RELEASE</version>
56+
<version>@spring.version@</version>
5757
</dependency>
5858
</dependencies>
5959

‎blueprint/plugin/blueprint-maven-plugin-itest/src/it/transaction-annotation/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@
3030
<dependency>
3131
<groupId>javax.inject</groupId>
3232
<artifactId>javax.inject</artifactId>
33-
<version>1</version>
33+
<version>@javax.inject.version@</version>
3434
</dependency>
3535
<dependency>
3636
<groupId>javax.transaction</groupId>
3737
<artifactId>javax.transaction-api</artifactId>
38-
<version>1.2</version>
38+
<version>@javax.transaction-api.version@</version>
3939
</dependency>
4040
</dependencies>
4141

‎blueprint/plugin/blueprint-maven-plugin-itest/src/it/with-provide/a/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@
3030
<dependency>
3131
<groupId>javax.inject</groupId>
3232
<artifactId>javax.inject</artifactId>
33-
<version>1</version>
33+
<version>@javax.inject.version@</version>
3434
</dependency>
3535
<dependency>
3636
<groupId>org.apache.aries.blueprint.plugin.itest</groupId>
3737
<artifactId>b</artifactId>
38-
<version>1.0.0-SNAPSHOT</version>
38+
<version>${project.version}</version>
3939
<scope>provided</scope>
4040
</dependency>
4141
</dependencies>
@@ -63,7 +63,7 @@
6363
<dependency>
6464
<groupId>org.apache.aries.blueprint.plugin.itest</groupId>
6565
<artifactId>c</artifactId>
66-
<version>1.0.0-SNAPSHOT</version>
66+
<version>${project.version}</version>
6767
</dependency>
6868
</dependencies>
6969
</plugin>

‎blueprint/plugin/blueprint-maven-plugin-itest/src/it/with-provide/b/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<dependency>
3131
<groupId>org.apache.aries.blueprint.plugin.itest</groupId>
3232
<artifactId>c</artifactId>
33-
<version>1.0.0-SNAPSHOT</version>
33+
<version>${project.version}</version>
3434
<scope>provided</scope>
3535
</dependency>
3636
</dependencies>

‎blueprint/plugin/blueprint-maven-plugin-itest/src/it/with-provide/c/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<dependency>
3131
<groupId>javax.inject</groupId>
3232
<artifactId>javax.inject</artifactId>
33-
<version>1</version>
33+
<version>@javax.inject.version@</version>
3434
</dependency>
3535
</dependencies>
3636

‎blueprint/plugin/blueprint-maven-plugin-pax-cdi-handlers/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<properties>
3737
<blueprint-maven-plugin-spi.version>1.0.0</blueprint-maven-plugin-spi.version>
3838
<guava.version>33.4.0-jre</guava.version>
39-
<pax-cdi-api.version>0.8.0</pax-cdi-api.version>
39+
<pax-cdi.version>0.8.0</pax-cdi.version>
4040
</properties>
4141

4242
<scm>
@@ -54,7 +54,7 @@
5454
<dependency>
5555
<groupId>org.ops4j.pax.cdi</groupId>
5656
<artifactId>pax-cdi-api</artifactId>
57-
<version>${pax-cdi-api.version}</version>
57+
<version>${pax-cdi.version}</version>
5858
</dependency>
5959
<dependency>
6060
<groupId>com.google.guava</groupId>

0 commit comments

Comments
 (0)