Skip to content

Commit 1c3e950

Browse files
alien11689alien11689
committed
[MAINTENANCE] Extract dependency versions to properties - blueprint
1 parent ab55adb commit 1c3e950

File tree

32 files changed

+402
-286
lines changed

32 files changed

+402
-286
lines changed

‎blueprint/blueprint-api/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<aries.osgi.import.pkg>
5555
org.osgi.framework
5656
</aries.osgi.import.pkg>
57-
<aries.osgi.private.pkg />
57+
<aries.osgi.private.pkg/>
5858
<lastReleaseVersion>1.0.0</lastReleaseVersion>
5959
</properties>
6060

‎blueprint/blueprint-authz/pom.xml

+3-2
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,13 @@
4040
<aries.osgi.import.pkg>javax.annotation.security,*</aries.osgi.import.pkg>
4141
<aries.osgi.private.pkg>org.apache.aries.blueprint.authorization.impl</aries.osgi.private.pkg>
4242
<aries.osgi.activator>org.apache.aries.blueprint.authorization.impl.Activator</aries.osgi.activator>
43-
43+
4444
<!-- Not exporting any packages -->
4545
<aries.skip.version.check>true</aries.skip.version.check>
4646

4747
<blueprint.api.version>1.0.0</blueprint.api.version>
4848
<blueprint.parser.version>1.0.0</blueprint.parser.version>
49+
<javax.annotation-api.version>1.2</javax.annotation-api.version>
4950
</properties>
5051

5152
<profiles>
@@ -73,7 +74,7 @@
7374
<dependency>
7475
<groupId>javax.annotation</groupId>
7576
<artifactId>javax.annotation-api</artifactId>
76-
<version>1.2</version>
77+
<version>${javax.annotation-api.version}</version>
7778
</dependency>
7879
<dependency>
7980
<groupId>org.apache.aries.blueprint</groupId>

‎blueprint/blueprint-bundle/pom.xml

+15-10
Original file line numberDiff line numberDiff line change
@@ -104,14 +104,19 @@
104104
</aries.osgi.failok>
105105
<lastReleaseVersion>1.1.0</lastReleaseVersion>
106106

107+
<asm-debug-all.version>5.0.3</asm-debug-all.version>
107108
<blueprint.api.version>${blueprint.api.dev.version}</blueprint.api.version>
108-
<blueprint.core.version>${blueprint.core.dev.version}</blueprint.core.version>
109+
<blueprint.authz.version>${blueprint.authz.dev.version}</blueprint.authz.version>
109110
<blueprint.cm.version>${blueprint.cm.dev.version}</blueprint.cm.version>
111+
<blueprint.core.version>${blueprint.core.dev.version}</blueprint.core.version>
112+
<blueprint.jexl.evaluator.version>${blueprint.jexl.evaluator.dev.version}</blueprint.jexl.evaluator.version>
110113
<blueprint.parser.version>${blueprint.parser.dev.version}</blueprint.parser.version>
111-
<blueprint.authz.version>${blueprint.authz.dev.version}</blueprint.authz.version>
112-
<blueprint.spring.version>${blueprint.spring.dev.version}</blueprint.spring.version>
113114
<blueprint.spring.extender.version>${blueprint.spring.extender.dev.version}</blueprint.spring.extender.version>
114-
<blueprint.jexl.evaluator.version>${blueprint.jexl.evaluator.dev.version}</blueprint.jexl.evaluator.version>
115+
<blueprint.spring.version>${blueprint.spring.dev.version}</blueprint.spring.version>
116+
<org.apache.aries.proxy.api.version>1.0.0</org.apache.aries.proxy.api.version>
117+
<org.apache.aries.proxy.impl.version>1.0.3</org.apache.aries.proxy.impl.version>
118+
<org.apache.aries.quiesce.api.version>1.0.0</org.apache.aries.quiesce.api.version>
119+
<org.apache.aries.versioning.plugin.version>0.3.1</org.apache.aries.versioning.plugin.version>
115120
</properties>
116121

117122
<dependencies>
@@ -136,19 +141,19 @@
136141
<dependency>
137142
<groupId>org.apache.aries.proxy</groupId>
138143
<artifactId>org.apache.aries.proxy.api</artifactId>
139-
<version>1.0.0</version>
144+
<version>${org.apache.aries.proxy.api.version}</version>
140145
<scope>provided</scope>
141146
</dependency>
142147
<dependency>
143148
<groupId>org.apache.aries.proxy</groupId>
144149
<artifactId>org.apache.aries.proxy.impl</artifactId>
145-
<version>1.0.3</version>
150+
<version>${org.apache.aries.proxy.impl.version}</version>
146151
<scope>test</scope>
147152
</dependency>
148153
<dependency>
149154
<groupId>org.ow2.asm</groupId>
150155
<artifactId>asm-debug-all</artifactId>
151-
<version>5.0.3</version>
156+
<version>${asm-debug-all.version}</version>
152157
<scope>test</scope>
153158
<optional>true</optional>
154159
</dependency>
@@ -161,7 +166,7 @@
161166
<groupId>org.apache.aries.quiesce</groupId>
162167
<artifactId>org.apache.aries.quiesce.api</artifactId>
163168
<scope>provided</scope>
164-
<version>1.0.0</version>
169+
<version>${org.apache.aries.quiesce.api.version}</version>
165170
</dependency>
166171
<dependency>
167172
<groupId>org.slf4j</groupId>
@@ -219,11 +224,11 @@
219224
</execution>
220225
</executions>
221226
</plugin>
222-
227+
223228
<plugin>
224229
<groupId>org.apache.aries.versioning</groupId>
225230
<artifactId>org.apache.aries.versioning.plugin</artifactId>
226-
<version>0.3.1</version>
231+
<version>${org.apache.aries.versioning.plugin.version}</version>
227232
<configuration>
228233
<excludes>
229234
<exclude>method org.apache.aries.blueprint.di.Repository getRepository() has been deleted</exclude>

‎blueprint/blueprint-cm/pom.xml

+30-21
Original file line numberDiff line numberDiff line change
@@ -41,25 +41,34 @@
4141
<connection>scm:git:https://gitbox.apache.org/repos/asf/aries.git</connection>
4242
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/aries.git</developerConnection>
4343
<url>https://gitbox.apache.org/repos/asf?p=aries.git;a=summary</url>
44-
<tag>HEAD</tag>
45-
</scm>
44+
<tag>HEAD</tag>
45+
</scm>
4646

4747
<properties>
4848
<!-- Export package versions are maintained in packageinfo files -->
49-
<aries.osgi.export.pkg />
49+
<aries.osgi.export.pkg/>
5050
<aries.osgi.import.pkg>
51-
org.apache.aries.blueprint;provide:=true;version="[1.0,2.0)",
52-
org.apache.aries.blueprint.ext;provide:=true;version="[1.0,2.0)",
53-
*
51+
org.apache.aries.blueprint;provide:=true;version="[1.0,2.0)",
52+
org.apache.aries.blueprint.ext;provide:=true;version="[1.0,2.0)",
53+
*
5454
</aries.osgi.import.pkg>
5555
<aries.osgi.private.pkg>
5656
org.apache.aries.blueprint.compendium.cm
5757
</aries.osgi.private.pkg>
58+
<lastReleaseVersion>1.1.0</lastReleaseVersion>
5859

5960
<blueprint.api.version>1.0.1</blueprint.api.version>
6061
<blueprint.core.version>1.10.3</blueprint.core.version>
6162
<blueprint.parser.version>1.6.0</blueprint.parser.version>
62-
<lastReleaseVersion>1.1.0</lastReleaseVersion>
63+
<de.kalpatec.pojosr.framework.version>0.1.6</de.kalpatec.pojosr.framework.version>
64+
<jcl-over-slf4j.version>1.7.5</jcl-over-slf4j.version>
65+
<maven-release-plugin.version>2.5.2</maven-release-plugin.version>
66+
<org.apache.aries.blueprint.core.version>1.10.0</org.apache.aries.blueprint.core.version>
67+
<org.apache.aries.proxy.version>1.1.0</org.apache.aries.proxy.version>
68+
<org.apache.felix.configadmin.version>1.2.8</org.apache.felix.configadmin.version>
69+
<org.osgi.compendium.version>4.1.0</org.osgi.compendium.version>
70+
<pax-swissbox-tinybundles.version>1.3.1</pax-swissbox-tinybundles.version>
71+
<slf4j-log4j12.version>1.7.5</slf4j-log4j12.version>
6372
</properties>
6473

6574
<profiles>
@@ -89,18 +98,18 @@
8998
<dependency>
9099
<groupId>org.apache.aries.blueprint</groupId>
91100
<artifactId>blueprint-parser</artifactId>
92-
<version>1.6.0</version>
101+
<version>${blueprint-parser.version}</version>
93102
<scope>provided</scope>
94103
</dependency>
95104
<dependency>
96105
<groupId>org.apache.aries.blueprint</groupId>
97106
<artifactId>org.apache.aries.blueprint.core</artifactId>
98-
<version>1.10.0</version>
107+
<version>${org.apache.aries.blueprint.core.version}</version>
99108
<exclusions>
100-
<exclusion>
101-
<groupId>org.apache.aries</groupId>
102-
<artifactId>org.apache.aries.util</artifactId>
103-
</exclusion>
109+
<exclusion>
110+
<groupId>org.apache.aries</groupId>
111+
<artifactId>org.apache.aries.util</artifactId>
112+
</exclusion>
104113
</exclusions>
105114
</dependency>
106115
<dependency>
@@ -112,7 +121,7 @@
112121
<groupId>org.osgi</groupId>
113122
<artifactId>org.osgi.compendium</artifactId>
114123
<scope>provided</scope>
115-
<version>4.1.0</version>
124+
<version>${org.osgi.compendium.version}</version>
116125
</dependency>
117126
<dependency>
118127
<groupId>org.slf4j</groupId>
@@ -123,13 +132,13 @@
123132
<dependency>
124133
<groupId>com.googlecode.pojosr</groupId>
125134
<artifactId>de.kalpatec.pojosr.framework</artifactId>
126-
<version>0.1.6</version>
135+
<version>${de.kalpatec.pojosr.framework.version}</version>
127136
<scope>test</scope>
128137
</dependency>
129138
<dependency>
130139
<groupId>org.ops4j.pax.swissbox</groupId>
131140
<artifactId>pax-swissbox-tinybundles</artifactId>
132-
<version>1.3.1</version>
141+
<version>${pax-swissbox-tinybundles.version}</version>
133142
<scope>test</scope>
134143
</dependency>
135144
<dependency>
@@ -140,25 +149,25 @@
140149
<dependency>
141150
<groupId>org.slf4j</groupId>
142151
<artifactId>slf4j-log4j12</artifactId>
143-
<version>1.7.5</version>
152+
<version>${slf4j-log4j12.version}</version>
144153
<scope>test</scope>
145154
</dependency>
146155
<dependency>
147156
<groupId>org.slf4j</groupId>
148157
<artifactId>jcl-over-slf4j</artifactId>
149-
<version>1.7.5</version>
158+
<version>${jcl-over-slf4j.version}</version>
150159
<scope>test</scope>
151160
</dependency>
152161
<dependency>
153162
<groupId>org.apache.aries.proxy</groupId>
154163
<artifactId>org.apache.aries.proxy</artifactId>
155-
<version>1.1.0</version>
164+
<version>${org.apache.aries.proxy.version}</version>
156165
<scope>test</scope>
157166
</dependency>
158167
<dependency>
159168
<groupId>org.apache.felix</groupId>
160169
<artifactId>org.apache.felix.configadmin</artifactId>
161-
<version>1.2.8</version>
170+
<version>${org.apache.felix.configadmin.version}</version>
162171
<scope>test</scope>
163172
</dependency>
164173
</dependencies>
@@ -180,7 +189,7 @@
180189
</plugin>
181190
<plugin>
182191
<artifactId>maven-release-plugin</artifactId>
183-
<version>2.5.2</version>
192+
<version>${maven-release-plugin.version}</version>
184193
</plugin>
185194
</plugins>
186195
</build>

‎blueprint/blueprint-compatibility/pom.xml

+14-14
Original file line numberDiff line numberDiff line change
@@ -138,20 +138,20 @@
138138
<sourcepath>${project.build.directory}/sources</sourcepath>
139139
</configuration>
140140
</plugin>
141-
142-
<plugin>
143-
<groupId>org.apache.aries.versioning</groupId>
144-
<artifactId>org.apache.aries.versioning.plugin</artifactId>
145-
<executions>
146-
<execution>
147-
<id>default-verify</id>
148-
<phase>verify</phase>
149-
<goals>
150-
<goal>version-check</goal>
151-
</goals>
152-
</execution>
153-
</executions>
154-
</plugin>
141+
142+
<plugin>
143+
<groupId>org.apache.aries.versioning</groupId>
144+
<artifactId>org.apache.aries.versioning.plugin</artifactId>
145+
<executions>
146+
<execution>
147+
<id>default-verify</id>
148+
<phase>verify</phase>
149+
<goals>
150+
<goal>version-check</goal>
151+
</goals>
152+
</execution>
153+
</executions>
154+
</plugin>
155155
</plugins>
156156
</build>
157157
</profile>

‎blueprint/blueprint-core/pom.xml

+23-17
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
<connection>scm:git:http://gitbox.apache.org/repos/asf/aries.git</connection>
4343
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/aries.git</developerConnection>
4444
<url>https://gitbox.apache.org/repos/asf?p=aries.git</url>
45-
<tag>HEAD</tag>
46-
</scm>
45+
<tag>HEAD</tag>
46+
</scm>
4747

4848
<properties>
4949
<rat.excludesFile>${project.basedir}/rat-excludes.txt</rat.excludesFile>
@@ -93,14 +93,20 @@
9393
{maven-resources},
9494
org/apache/aries/blueprint/blueprint.xsd=${project.build.directory}/sources/org/osgi/service/blueprint/blueprint.xsd
9595
</aries.osgi.include.resource>
96+
<lastReleaseVersion>1.6.0</lastReleaseVersion>
97+
98+
<asm-debug-all.version>5.0.3</asm-debug-all.version>
9699
<blueprint.annotation.api.version>1.0.1</blueprint.annotation.api.version>
97100
<blueprint.api.version>1.0.1</blueprint.api.version>
98101
<blueprint.parser.version>1.6.0</blueprint.parser.version>
102+
<easymock.version>4.2</easymock.version>
103+
<maven-release-plugin.version>2.5.2</maven-release-plugin.version>
104+
<org.apache.aries.versioning.plugin.version>0.3.1</org.apache.aries.versioning.plugin.version>
105+
<org.apache.felix.utils.version>1.11.6</org.apache.felix.utils.version>
99106
<proxy.api.version>1.1.1</proxy.api.version>
100107
<proxy.impl.version>1.1.9</proxy.impl.version>
101108
<quiesce.api.version>1.0.0</quiesce.api.version>
102109
<util.version>1.1.3</util.version>
103-
<lastReleaseVersion>1.6.0</lastReleaseVersion>
104110
</properties>
105111

106112
<profiles>
@@ -163,7 +169,7 @@
163169
<dependency>
164170
<groupId>org.apache.felix</groupId>
165171
<artifactId>org.apache.felix.utils</artifactId>
166-
<version>1.11.6</version>
172+
<version>${org.apache.felix.utils.version}</version>
167173
<scope>provided</scope>
168174
</dependency>
169175
<dependency>
@@ -175,7 +181,7 @@
175181
<groupId>org.ow2.asm</groupId>
176182
<artifactId>asm-debug-all</artifactId>
177183
<optional>true</optional>
178-
<version>5.0.3</version>
184+
<version>${asm-debug-all.version}</version>
179185
</dependency>
180186
<dependency>
181187
<groupId>org.apache.aries.quiesce</groupId>
@@ -185,7 +191,7 @@
185191
<dependency>
186192
<groupId>org.easymock</groupId>
187193
<artifactId>easymock</artifactId>
188-
<version>4.2</version>
194+
<version>${easymock.version}</version>
189195
<scope>test</scope>
190196
</dependency>
191197
<dependency>
@@ -242,15 +248,15 @@
242248
</execution>
243249
</executions>
244250
</plugin>
245-
251+
246252
<plugin>
247253
<groupId>org.apache.aries.versioning</groupId>
248254
<artifactId>org.apache.aries.versioning.plugin</artifactId>
249-
<version>0.3.1</version>
255+
<version>${org.apache.aries.versioning.plugin.version}</version>
250256
<configuration>
251257
<excludes>
252-
<exclude>method org.apache.aries.blueprint.di.Repository getRepository() has been deleted</exclude>
253-
<exclude>class org/apache/aries/blueprint/ext/PropertyPlaceholder was not abstract but is changed to be abstract</exclude>
258+
<exclude>method org.apache.aries.blueprint.di.Repository getRepository() has been deleted</exclude>
259+
<exclude>class org/apache/aries/blueprint/ext/PropertyPlaceholder was not abstract but is changed to be abstract</exclude>
254260
</excludes>
255261
</configuration>
256262
<executions>
@@ -276,23 +282,23 @@
276282
version:Version="1.0"
277283
</Provide-Capability>
278284
<Require-Capability>
279-
osgi.service;filter:="(objectClass=org.apache.aries.proxy.ProxyManager)";effective:="active"
285+
osgi.service;filter:="(objectClass=org.apache.aries.proxy.ProxyManager)";effective:="active"
280286
</Require-Capability>
281287
</instructions>
282288
</configuration>
283289
</plugin>
284290
<plugin>
285291
<artifactId>maven-release-plugin</artifactId>
286-
<version>2.5.2</version>
292+
<version>${maven-release-plugin.version}</version>
287293
</plugin>
288294
<plugin>
289295
<groupId>org.apache.maven.plugins</groupId>
290-
<artifactId>maven-javadoc-plugin</artifactId>
291-
<configuration>
292-
<additionalparam>-Xdoclint:none</additionalparam>
293-
</configuration>
296+
<artifactId>maven-javadoc-plugin</artifactId>
297+
<configuration>
298+
<additionalparam>-Xdoclint:none</additionalparam>
299+
</configuration>
294300
</plugin>
295301
</plugins>
296302
</build>
297-
303+
298304
</project>

0 commit comments

Comments
 (0)