Skip to content

Commit a7bdf0d

Browse files
alien11689alien11689
authored
Merge pull request #325 from apache/extract-dependency-versions-to-properties
Extract dependency versions to properties
2 parents 8b33e10 + efb682a commit a7bdf0d

File tree

190 files changed

+4949
-4102
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

190 files changed

+4949
-4102
lines changed

‎README.md

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ See [Apache Aries Website](http://aries.apache.org/).
2121
- [![SPI Fly - CI Build](https://github.com/apache/aries/actions/workflows/spi-fly.yml/badge.svg)](https://github.com/apache/aries/actions/workflows/spi-fly.yml)
2222
- [![Subsystem - CI Build](https://github.com/apache/aries/actions/workflows/subsystem.yml/badge.svg)](https://github.com/apache/aries/actions/workflows/subsystem.yml)
2323
- [![Transaction - CI Build](https://github.com/apache/aries/actions/workflows/transaction.yml/badge.svg)](https://github.com/apache/aries/actions/workflows/transaction.yml)
24-
- Tutorials - Missing
2524
- [![Versioning - CI Build](https://github.com/apache/aries/actions/workflows/versioning.yml/badge.svg)](https://github.com/apache/aries/actions/workflows/versioning.yml)
2625
- [![Web - CI Build](https://github.com/apache/aries/actions/workflows/web.yml/badge.svg)](https://github.com/apache/aries/actions/workflows/web.yml)
2726
- [![Util - CI Build](https://github.com/apache/aries/actions/workflows/util.yml/badge.svg)](https://github.com/apache/aries/actions/workflows/util.yml)

‎application/application-api/pom.xml

+8-6
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<name>Apache Aries Application API</name>
3535
<version>1.0.1-SNAPSHOT</version>
3636
<description>
37-
Application API.
37+
Application API.
3838
</description>
3939

4040
<scm>
@@ -53,8 +53,10 @@
5353
org.apache.aries.application.modelling;
5454
org.apache.aries.application.modelling.utils,
5555
</aries.osgi.export.pkg>
56-
<aries.osgi.private.pkg />
56+
<aries.osgi.private.pkg/>
5757
<lastReleaseVersion>1.0.0</lastReleaseVersion>
58+
59+
<org.apache.aries.util.version>1.0.0</org.apache.aries.util.version>
5860
</properties>
5961

6062
<dependencies>
@@ -63,10 +65,10 @@
6365
<artifactId>org.osgi.core</artifactId>
6466
<scope>provided</scope>
6567
</dependency>
66-
<dependency>
67-
<groupId>org.apache.aries</groupId>
68-
<artifactId>org.apache.aries.util</artifactId>
69-
<version>1.0.0</version>
68+
<dependency>
69+
<groupId>org.apache.aries</groupId>
70+
<artifactId>org.apache.aries.util</artifactId>
71+
<version>${org.apache.aries.util.version}</version>
7072
</dependency>
7173
</dependencies>
7274

‎application/application-bundle/pom.xml

+13-8
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
<name>Apache Aries Application Bundle</name>
3535
<version>1.0.1-SNAPSHOT</version>
3636
<description>
37-
This bundle is a standalone bundle to support
38-
Aries applications.
37+
This bundle is a standalone bundle to support
38+
Aries applications.
3939
</description>
4040

4141
<scm>
@@ -68,28 +68,33 @@
6868
OSGI-INF*
6969
</aries.osgi.private.pkg>
7070
<lastReleaseVersion>1.0.0</lastReleaseVersion>
71+
72+
<org.apache.aries.application.api.version>1.0.0</org.apache.aries.application.api.version>
73+
<org.apache.aries.application.management.version>1.0.0</org.apache.aries.application.management.version>
74+
<org.apache.aries.application.runtime.version>1.0.0</org.apache.aries.application.runtime.version>
75+
<org.apache.aries.application.utils.version>1.0.0</org.apache.aries.application.utils.version>
7176
</properties>
7277

7378
<dependencies>
7479
<dependency>
7580
<groupId>org.apache.aries.application</groupId>
7681
<artifactId>org.apache.aries.application.api</artifactId>
77-
<version>1.0.0</version>
82+
<version>${org.apache.aries.application.api.version}</version>
7883
</dependency>
7984
<dependency>
8085
<groupId>org.apache.aries.application</groupId>
8186
<artifactId>org.apache.aries.application.management</artifactId>
82-
<version>1.0.0</version>
87+
<version>${org.apache.aries.application.management.version}</version>
8388
</dependency>
8489
<dependency>
8590
<groupId>org.apache.aries.application</groupId>
8691
<artifactId>org.apache.aries.application.runtime</artifactId>
87-
<version>1.0.0</version>
92+
<version>${org.apache.aries.application.runtime.version}</version>
8893
</dependency>
8994
<dependency>
9095
<groupId>org.apache.aries.application</groupId>
9196
<artifactId>org.apache.aries.application.utils</artifactId>
92-
<version>1.0.0</version>
97+
<version>${org.apache.aries.application.utils.version}</version>
9398
</dependency>
9499
<dependency>
95100
<groupId>org.osgi</groupId>
@@ -107,7 +112,7 @@
107112
<scope>provided</scope>
108113
</dependency>
109114
</dependencies>
110-
115+
111116
<build>
112117
<plugins>
113118
<!-- Use the shade plugin with the dependency plugin to unjar the three jars (api, core and cm)
@@ -132,7 +137,7 @@
132137
</includes>
133138
</artifactSet>
134139
<filters>
135-
<filter>
140+
<filter>
136141
<artifact>org.apache.aries.application:org.apache.aries.application.api</artifact>
137142
<excludes>
138143
<exclude>org/**</exclude>

‎application/application-converters/pom.xml

+13-7
Original file line numberDiff line numberDiff line change
@@ -52,33 +52,39 @@
5252
org.apache.aries.application.converters;
5353
</aries.osgi.private.pkg>
5454
<lastReleaseVersion>1.0.0</lastReleaseVersion>
55+
56+
<asm-all.version>5.0.3</asm-all.version>
57+
<org.apache.aries.application.api.version>1.0.0</org.apache.aries.application.api.version>
58+
<org.apache.aries.application.utils.version>1.0.0</org.apache.aries.application.utils.version>
59+
<org.apache.aries.testsupport.unit.version>1.0.0</org.apache.aries.testsupport.unit.version>
60+
<org.apache.aries.web.urlhandler.version>1.0.0</org.apache.aries.web.urlhandler.version>
5561
</properties>
5662

5763
<dependencies>
5864
<!--Dependency on other Application bundles -->
5965
<dependency>
6066
<groupId>org.apache.aries.application</groupId>
6167
<artifactId>org.apache.aries.application.api</artifactId>
62-
<version>1.0.0</version>
68+
<version>${org.apache.aries.application.api.version}</version>
6369
</dependency>
6470
<dependency>
65-
<groupId>org.apache.aries.application</groupId>
66-
<artifactId>org.apache.aries.application.utils</artifactId>
67-
<version>1.0.0</version>
71+
<groupId>org.apache.aries.application</groupId>
72+
<artifactId>org.apache.aries.application.utils</artifactId>
73+
<version>${org.apache.aries.application.utils.version}</version>
6874
</dependency>
6975

7076
<!-- Dependency on other Aries module bundles -->
7177
<dependency>
7278
<groupId>org.apache.aries.testsupport</groupId>
7379
<artifactId>org.apache.aries.testsupport.unit</artifactId>
7480
<scope>test</scope>
75-
<version>1.0.0</version>
81+
<version>${org.apache.aries.testsupport.unit.version}</version>
7682
</dependency>
7783
<dependency>
7884
<groupId>org.apache.aries.web</groupId>
7985
<artifactId>org.apache.aries.web.urlhandler</artifactId>
8086
<scope>provided</scope>
81-
<version>1.0.0</version>
87+
<version>${org.apache.aries.web.urlhandler.version}</version>
8288
</dependency>
8389
<!--External dependencies. Versions may be specified in parent -->
8490
<dependency>
@@ -95,7 +101,7 @@
95101
<groupId>org.ow2.asm</groupId>
96102
<artifactId>asm-all</artifactId>
97103
<scope>provided</scope>
98-
<version>5.0.3</version>
104+
<version>${asm-all.version}</version>
99105
</dependency>
100106
<dependency>
101107
<groupId>org.slf4j</groupId>

‎application/application-default-local-platform/pom.xml

+6-4
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<name>Apache Aries Application Default local platform</name>
3535
<version>1.0.1-SNAPSHOT</version>
3636
<description>
37-
Implementation of the default local Platform Repository
37+
Implementation of the default local Platform Repository
3838
</description>
3939

4040
<scm>
@@ -47,13 +47,15 @@
4747
<aries.osgi.export.pkg>
4848
</aries.osgi.export.pkg>
4949
<aries.osgi.import.pkg>
50-
org.apache.aries.application.management.spi.runtime;provide:=true,
51-
*
50+
org.apache.aries.application.management.spi.runtime;provide:=true,
51+
*
5252
</aries.osgi.import.pkg>
5353
<aries.osgi.private.pkg>
5454
org.apache.aries.application.local.platform.impl
5555
</aries.osgi.private.pkg>
5656
<lastReleaseVersion>1.0.0</lastReleaseVersion>
57+
58+
<org.apache.aries.application.api.version>1.0.0</org.apache.aries.application.api.version>
5759
</properties>
5860

5961
<dependencies>
@@ -65,7 +67,7 @@
6567
<dependency>
6668
<groupId>org.apache.aries.application</groupId>
6769
<artifactId>org.apache.aries.application.api</artifactId>
68-
<version>1.0.0</version>
70+
<version>${org.apache.aries.application.api.version}</version>
6971
</dependency>
7072
</dependencies>
7173

‎application/application-deployment-management/pom.xml

+22-16
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<name>Apache Aries Application Deployment Management</name>
3535
<version>1.0.1-SNAPSHOT</version>
3636
<description>
37-
Deployment Manager for resolving an Aries Applications.
37+
Deployment Manager for resolving an Aries Applications.
3838
</description>
3939

4040
<scm>
@@ -44,12 +44,18 @@
4444
</scm>
4545

4646
<properties>
47-
<aries.osgi.export.pkg />
47+
<aries.osgi.export.pkg/>
4848
<aries.osgi.import.pkg>
49-
org.apache.aries.application.management.spi.resolve;provide:=true,
50-
*
49+
org.apache.aries.application.management.spi.resolve;provide:=true,
50+
*
5151
</aries.osgi.import.pkg>
5252
<lastReleaseVersion>1.0.0</lastReleaseVersion>
53+
54+
<org.apache.aries.application.api.version>1.0.0</org.apache.aries.application.api.version>
55+
<org.apache.aries.application.modeller.version>1.0.0</org.apache.aries.application.modeller.version>
56+
<org.apache.aries.application.utils.version>1.0.0</org.apache.aries.application.utils.version>
57+
<org.apache.aries.testsupport.unit.version>1.0.0</org.apache.aries.testsupport.unit.version>
58+
<org.apache.aries.util.version>1.0.0</org.apache.aries.util.version>
5359
</properties>
5460

5561
<dependencies>
@@ -59,15 +65,15 @@
5965
property not set" error.
6066
-->
6167
<dependency>
62-
<groupId>org.osgi</groupId>
63-
<artifactId>org.osgi.core</artifactId>
64-
<scope>provided</scope>
68+
<groupId>org.osgi</groupId>
69+
<artifactId>org.osgi.core</artifactId>
70+
<scope>provided</scope>
6571
</dependency>
6672
<dependency>
6773
<groupId>org.apache.aries.testsupport</groupId>
6874
<artifactId>org.apache.aries.testsupport.unit</artifactId>
6975
<scope>test</scope>
70-
<version>1.0.0</version>
76+
<version>${org.apache.aries.testsupport.unit.version}</version>
7177
</dependency>
7278
<dependency>
7379
<groupId>junit</groupId>
@@ -77,12 +83,12 @@
7783
<dependency>
7884
<groupId>org.apache.aries.application</groupId>
7985
<artifactId>org.apache.aries.application.api</artifactId>
80-
<version>1.0.0</version>
86+
<version>${org.apache.aries.application.api.version}</version>
8187
</dependency>
8288
<dependency>
83-
<groupId>org.apache.aries</groupId>
84-
<artifactId>org.apache.aries.util</artifactId>
85-
<version>1.0.0</version>
89+
<groupId>org.apache.aries</groupId>
90+
<artifactId>org.apache.aries.util</artifactId>
91+
<version>${org.apache.aries.util.version}</version>
8692
</dependency>
8793
<dependency>
8894
<groupId>org.slf4j</groupId>
@@ -95,14 +101,14 @@
95101
<scope>test</scope>
96102
</dependency>
97103
<dependency>
98-
<groupId>org.apache.aries.application</groupId>
99-
<artifactId>org.apache.aries.application.utils</artifactId>
100-
<version>1.0.0</version>
104+
<groupId>org.apache.aries.application</groupId>
105+
<artifactId>org.apache.aries.application.utils</artifactId>
106+
<version>${org.apache.aries.application.utils.version}</version>
101107
</dependency>
102108
<dependency>
103109
<groupId>org.apache.aries.application</groupId>
104110
<artifactId>org.apache.aries.application.modeller</artifactId>
105-
<version>1.0.0</version>
111+
<version>${org.apache.aries.application.modeller.version}</version>
106112
</dependency>
107113
</dependencies>
108114

0 commit comments

Comments
 (0)