Skip to content

Commit 5b9f971

Browse files
alien11689alien11689
committed
[MAINTENANCE] Extract dependency versions to properties - spi-fly
1 parent 8f38bd5 commit 5b9f971

File tree

22 files changed

+317
-291
lines changed

22 files changed

+317
-291
lines changed

‎spi-fly/pom.xml‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<groupId>org.apache</groupId>
2626
<artifactId>apache</artifactId>
2727
<version>30</version>
28-
<relativePath />
28+
<relativePath/>
2929
</parent>
3030

3131
<groupId>org.apache.aries.spifly</groupId>
@@ -46,6 +46,9 @@
4646

4747
<properties>
4848
<project.scm.id>apache.releases.https</project.scm.id>
49+
<maven.compiler.source>1.8</maven.compiler.source>
50+
<maven.compiler.target>1.8</maven.compiler.target>
51+
<java.source.version>1.8</java.source.version>
4952

5053
<apache-rat-plugin.version>0.16.1</apache-rat-plugin.version>
5154
<asm.version>9.7.1</asm.version>
@@ -56,18 +59,19 @@
5659
<felix.log.extension.version>1.0.0</felix.log.extension.version>
5760
<felix.log.version>1.2.6</felix.log.version>
5861
<felix.logback.version>1.0.6</felix.logback.version>
62+
<flatten-maven-plugin.version>1.6.0</flatten-maven-plugin.version>
5963
<junit-jupiter.version>5.11.4</junit-jupiter.version>
6064
<junit-platform.version>1.11.4</junit-platform.version>
65+
<junit.version>4.13.2</junit.version>
6166
<maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
67+
<maven-dependency-plugin.version>3.4.0</maven-dependency-plugin.version>
68+
<maven-enforcer-plugin.version>3.1.0</maven-enforcer-plugin.version>
69+
<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
6270
<mockito.core.version>5.9.0</mockito.core.version>
71+
<org.apache.aries.versioning.plugin.version>0.3.1</org.apache.aries.versioning.plugin.version>
6372
<osgi.core.version>5.0.0</osgi.core.version>
6473
<osgi.test.version>1.1.0</osgi.test.version>
6574
<slf4j.version>2.0.16</slf4j.version>
66-
67-
<maven.compiler.source>1.8</maven.compiler.source>
68-
<maven.compiler.target>1.8</maven.compiler.target>
69-
70-
<java.source.version>1.8</java.source.version>
7175
</properties>
7276

7377
<modules>
@@ -97,7 +101,7 @@
97101
<dependency>
98102
<groupId>junit</groupId>
99103
<artifactId>junit</artifactId>
100-
<version>4.13.2</version>
104+
<version>${junit.version}</version>
101105
<scope>test</scope>
102106
</dependency>
103107
</dependencies>
@@ -108,7 +112,7 @@
108112
<plugin>
109113
<groupId>org.apache.aries.versioning</groupId>
110114
<artifactId>org.apache.aries.versioning.plugin</artifactId>
111-
<version>0.3.1</version>
115+
<version>${org.apache.aries.versioning.plugin.version}</version>
112116
</plugin>
113117
<plugin>
114118
<groupId>org.apache.maven.plugins</groupId>
@@ -126,17 +130,17 @@
126130
<plugin>
127131
<groupId>org.apache.maven.plugins</groupId>
128132
<artifactId>maven-dependency-plugin</artifactId>
129-
<version>3.4.0</version>
133+
<version>${maven-dependency-plugin.version}</version>
130134
</plugin>
131135
<plugin>
132136
<groupId>org.apache.maven.plugins</groupId>
133137
<artifactId>maven-enforcer-plugin</artifactId>
134-
<version>3.1.0</version>
138+
<version>${maven-enforcer-plugin.version}</version>
135139
</plugin>
136140
<plugin>
137141
<groupId>org.apache.maven.plugins</groupId>
138142
<artifactId>maven-surefire-plugin</artifactId>
139-
<version>3.0.0-M5</version>
143+
<version>${maven-surefire-plugin.version}</version>
140144
<configuration>
141145
<redirectTestOutputToFile>true</redirectTestOutputToFile>
142146
<forkMode>once</forkMode>
@@ -164,7 +168,7 @@
164168
<plugin>
165169
<groupId>org.codehaus.mojo</groupId>
166170
<artifactId>flatten-maven-plugin</artifactId>
167-
<version>1.6.0</version>
171+
<version>${flatten-maven-plugin.version}</version>
168172
<configuration>
169173
<flattenMode>oss</flattenMode>
170174
</configuration>
@@ -190,6 +194,7 @@
190194

191195
<profiles>
192196
<profile>
197+
<id>java9</id>
193198
<activation>
194199
<jdk>[9,)</jdk>
195200
</activation>

‎spi-fly/spi-fly-core/pom.xml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@
4444
<tag>HEAD</tag>
4545
</scm>
4646

47+
<properties>
48+
<easymock.version>5.5.0</easymock.version>
49+
</properties>
50+
4751
<dependencies>
4852
<dependency>
4953
<groupId>org.osgi</groupId>
@@ -68,7 +72,7 @@
6872
<dependency>
6973
<groupId>org.easymock</groupId>
7074
<artifactId>easymock</artifactId>
71-
<version>5.5.0</version>
75+
<version>${easymock.version}</version>
7276
<scope>test</scope>
7377
</dependency>
7478
<dependency>

‎spi-fly/spi-fly-dynamic-bundle/pom.xml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@
4343
<tag>HEAD</tag>
4444
</scm>
4545

46+
<properties>
47+
<build-helper-maven-plugin.version>3.3.0</build-helper-maven-plugin.version>
48+
</properties>
49+
4650
<dependencies>
4751
<dependency>
4852
<groupId>org.ow2.asm</groupId>
@@ -235,7 +239,7 @@
235239
<id>unpack</id>
236240
<phase>package</phase>
237241
<goals>
238-
<goal>unpack</goal>
242+
<goal>unpack</goal>
239243
</goals>
240244
<configuration>
241245
<artifactItems>
@@ -273,7 +277,7 @@
273277
<plugin>
274278
<groupId>org.codehaus.mojo</groupId>
275279
<artifactId>build-helper-maven-plugin</artifactId>
276-
<version>3.3.0</version>
280+
<version>${build-helper-maven-plugin.version}</version>
277281
<executions>
278282
<execution>
279283
<id>add-source</id>

‎spi-fly/spi-fly-dynamic-framework-extension/pom.xml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@
4343
<tag>HEAD</tag>
4444
</scm>
4545

46+
<properties>
47+
<build-helper-maven-plugin.version>3.3.0</build-helper-maven-plugin.version>
48+
</properties>
49+
4650
<dependencies>
4751
<dependency>
4852
<groupId>org.ow2.asm</groupId>
@@ -238,7 +242,7 @@
238242
<id>unpack</id>
239243
<phase>package</phase>
240244
<goals>
241-
<goal>unpack</goal>
245+
<goal>unpack</goal>
242246
</goals>
243247
<configuration>
244248
<artifactItems>
@@ -303,7 +307,7 @@
303307
<plugin>
304308
<groupId>org.codehaus.mojo</groupId>
305309
<artifactId>build-helper-maven-plugin</artifactId>
306-
<version>3.3.0</version>
310+
<version>${build-helper-maven-plugin.version}</version>
307311
<executions>
308312
<execution>
309313
<id>add-source</id>

‎spi-fly/spi-fly-examples/pom.xml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,15 @@
4141
<maven.deploy.skip>true</maven.deploy.skip>
4242
<maven.install.skip>true</maven.install.skip>
4343
<obrRepository>none</obrRepository>
44+
<maven-bundle-plugin.version>5.1.8</maven-bundle-plugin.version>
4445
</properties>
4546

4647
<scm>
4748
<connection>scm:git:https://gitbox.apache.org/repos/asf/aries.git</connection>
4849
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/aries.git</developerConnection>
4950
<url>https://gitbox.apache.org/repos/asf?p=aries.git;a=summary</url>
50-
<tag>HEAD</tag>
51-
</scm>
51+
<tag>HEAD</tag>
52+
</scm>
5253

5354
<modules>
5455
<module>spi-fly-example-spi-bundle</module>
@@ -67,6 +68,8 @@
6768
<module>spi-fly-example-resource-client-bundle</module>
6869
</modules>
6970

71+
<properties/>
72+
7073
<dependencyManagement>
7174
<dependencies>
7275
<dependency>
@@ -83,7 +86,7 @@
8386
<plugin>
8487
<groupId>org.apache.felix</groupId>
8588
<artifactId>maven-bundle-plugin</artifactId>
86-
<version>5.1.8</version>
89+
<version>${maven-bundle-plugin.version}</version>
8790
<extensions>true</extensions>
8891
</plugin>
8992
</plugins>

‎spi-fly/spi-fly-examples/spi-fly-example-client1-bundle/pom.xml‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!--
3-
Licensed to the Apache Software Foundation (ASF) under one
4-
or more contributor license agreements. See the NOTICE file
5-
distributed with this work for additional information
6-
regarding copyright ownership. The ASF licenses this file
7-
to you under the Apache License, Version 2.0 (the
8-
"License"); you may not use this file except in compliance
9-
with the License. You may obtain a copy of the License at
2+
<!--
3+
Licensed to the Apache Software Foundation (ASF) under one
4+
or more contributor license agreements. See the NOTICE file
5+
distributed with this work for additional information
6+
regarding copyright ownership. The ASF licenses this file
7+
to you under the Apache License, Version 2.0 (the
8+
"License"); you may not use this file except in compliance
9+
with the License. You may obtain a copy of the License at
1010
11-
http://www.apache.org/licenses/LICENSE-2.0
11+
http://www.apache.org/licenses/LICENSE-2.0
1212
1313
1414
15-
Unless required by applicable law or agreed to in writing,
16-
software distributed under the License is distributed on an
17-
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
18-
KIND, either express or implied. See the License for the
19-
specific language governing permissions and limitations
20-
under the License.
21-
-->
15+
Unless required by applicable law or agreed to in writing,
16+
software distributed under the License is distributed on an
17+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
18+
KIND, either express or implied. See the License for the
19+
specific language governing permissions and limitations
20+
under the License.
21+
-->
2222
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2323
<modelVersion>4.0.0</modelVersion>
2424
<parent>
@@ -56,7 +56,7 @@
5656
</dependencies>
5757

5858
<properties>
59-
<aries.osgi.export.pkg />
59+
<aries.osgi.export.pkg/>
6060
<lastReleaseVersion>1.0.0</lastReleaseVersion>
6161
</properties>
6262

@@ -70,8 +70,8 @@
7070
<Import-Package>
7171
*
7272
</Import-Package>
73-
<Export-Package />
74-
<_exportcontents />
73+
<Export-Package/>
74+
<_exportcontents/>
7575
<Private-Package>
7676
org.apache.aries.spifly.client.bundle
7777
</Private-Package>

‎spi-fly/spi-fly-examples/spi-fly-example-client1-jar/pom.xml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!--
3-
Licensed to the Apache Software Foundation (ASF) under one
4-
or more contributor license agreements. See the NOTICE file
5-
distributed with this work for additional information
6-
regarding copyright ownership. The ASF licenses this file
7-
to you under the Apache License, Version 2.0 (the
8-
"License"); you may not use this file except in compliance
9-
with the License. You may obtain a copy of the License at
2+
<!--
3+
Licensed to the Apache Software Foundation (ASF) under one
4+
or more contributor license agreements. See the NOTICE file
5+
distributed with this work for additional information
6+
regarding copyright ownership. The ASF licenses this file
7+
to you under the Apache License, Version 2.0 (the
8+
"License"); you may not use this file except in compliance
9+
with the License. You may obtain a copy of the License at
1010
11-
http://www.apache.org/licenses/LICENSE-2.0
11+
http://www.apache.org/licenses/LICENSE-2.0
1212
1313
1414
15-
Unless required by applicable law or agreed to in writing,
16-
software distributed under the License is distributed on an
17-
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
18-
KIND, either express or implied. See the License for the
19-
specific language governing permissions and limitations
20-
under the License.
21-
-->
15+
Unless required by applicable law or agreed to in writing,
16+
software distributed under the License is distributed on an
17+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
18+
KIND, either express or implied. See the License for the
19+
specific language governing permissions and limitations
20+
under the License.
21+
-->
2222
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2323
<modelVersion>4.0.0</modelVersion>
2424
<parent>
@@ -39,6 +39,6 @@
3939
<groupId>org.apache.aries.spifly.examples</groupId>
4040
<artifactId>org.apache.aries.spifly.examples.spi.bundle</artifactId>
4141
<version>${project.version}</version>
42-
</dependency>
42+
</dependency>
4343
</dependencies>
4444
</project>

0 commit comments

Comments
 (0)