This is an automated email from the ASF dual-hosted git repository. alien11689 pushed a commit to branch extract-dependency-versions-to-properties in repository https://gitbox.apache.org/repos/asf/aries.git
commit ab55adba380dcfe0b2c2fb6424244d88e28790d0 Author: Dominik Przybysz <[email protected]> AuthorDate: Sat Jan 11 20:48:04 2025 +0100 [MAINTENANCE] Extract dependency versions to properties - async --- async/async-all-index/pom.xml | 18 ++++++++------- async/async-all/pom.xml | 47 +++++++++++++++++++++----------------- async/async-api/pom.xml | 7 ++++-- async/async-impl/pom.xml | 52 +++++++++++++++++++++++++------------------ async/async-index/pom.xml | 17 +++++++------- async/promise-api/pom.xml | 6 +++-- 6 files changed, 84 insertions(+), 63 deletions(-) diff --git a/async/async-all-index/pom.xml b/async/async-all-index/pom.xml index cc9d572f8..b62703226 100644 --- a/async/async-all-index/pom.xml +++ b/async/async-all-index/pom.xml @@ -25,7 +25,7 @@ <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> <version>2.0.0</version> - <relativePath>../parent/pom.xml</relativePath> + <relativePath>../../parent/pom.xml</relativePath> </parent> <groupId>org.apache.aries.async</groupId> @@ -34,7 +34,7 @@ <packaging>pom</packaging> <version>1.1.0-SNAPSHOT</version> <description> - An index for the Apache Aries Async Service (all-in-one) + An index for the Apache Aries Async Service (all-in-one) </description> <scm> @@ -43,12 +43,14 @@ <url>https://gitbox.apache.org/repos/asf?p=aries.git;a=summary</url> </scm> - <properties> <local.url.policy>REQUIRED</local.url.policy> + + <bnd-indexer-maven-plugin.version>3.1.0</bnd-indexer-maven-plugin.version> + <org.apache.aries.async.version>1.1.0-SNAPSHOT</org.apache.aries.async.version> </properties> - - + + <profiles> <profile> <id>apache-release</id> @@ -63,13 +65,13 @@ </properties> </profile> </profiles> - + <dependencies> <dependency> <groupId>org.apache.aries.async</groupId> <artifactId>org.apache.aries.async</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>${org.apache.aries.async.version}</version> </dependency> </dependencies> @@ -78,7 +80,7 @@ <plugin> <groupId>biz.aQute.bnd</groupId> <artifactId>bnd-indexer-maven-plugin</artifactId> - <version>3.1.0</version> + <version>${bnd-indexer-maven-plugin.version}</version> <configuration> <localURLs>${local.url.policy}</localURLs> </configuration> diff --git a/async/async-all/pom.xml b/async/async-all/pom.xml index 273b40fa0..1a415df84 100644 --- a/async/async-all/pom.xml +++ b/async/async-all/pom.xml @@ -44,7 +44,7 @@ </scm> <properties> - <aries.osgi.activator>org.apache.aries.async.impl.Activator</aries.osgi.activator> + <aries.osgi.activator>org.apache.aries.async.impl.Activator</aries.osgi.activator> <!-- Export package versions are maintained in packageinfo files --> <aries.osgi.export.pkg> org.apache.aries.async.promise, @@ -55,8 +55,8 @@ org.osgi.service.log </aries.osgi.export.pkg> <aries.osgi.private.pkg> - org.apache.aries.async.impl, - org.osgi.util.tracker, + org.apache.aries.async.impl, + org.osgi.util.tracker, net.sf.cglib.* </aries.osgi.private.pkg> <aries.osgi.import.pkg> @@ -71,37 +71,44 @@ * </aries.osgi.import.pkg> <lastReleaseVersion>1.0.1</lastReleaseVersion> + + <cglib-nodep.version>3.2.4</cglib-nodep.version> + <org.apache.aries.async.api.version>1.0.2-SNAPSHOT</org.apache.aries.async.api.version> + <org.apache.aries.async.impl.version>1.1.0-SNAPSHOT</org.apache.aries.async.impl.version> + <org.apache.aries.async.promise.api.version>1.1.0-SNAPSHOT</org.apache.aries.async.promise.api.version> + <org.osgi.service.log.version>1.3.0</org.osgi.service.log.version> + <org.osgi.util.tracker.version>1.5.1</org.osgi.util.tracker.version> </properties> <dependencies> <dependency> <groupId>org.apache.aries.async</groupId> <artifactId>org.apache.aries.async.promise.api</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>${org.apache.aries.async.promise.api.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.aries.async</groupId> <artifactId>org.apache.aries.async.api</artifactId> - <version>1.0.2-SNAPSHOT</version> + <version>${org.apache.aries.async.api.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.aries.async</groupId> <artifactId>org.apache.aries.async.impl</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>${org.apache.aries.async.impl.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.service.log</artifactId> - <version>1.3.0</version> + <version>${org.osgi.service.log.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.util.tracker</artifactId> - <version>1.5.1</version> + <version>${org.osgi.util.tracker.version}</version> <scope>provided</scope> </dependency> <dependency> @@ -110,10 +117,10 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>cglib</groupId> - <artifactId>cglib-nodep</artifactId> - <version>3.2.4</version> - <scope>provided</scope> + <groupId>cglib</groupId> + <artifactId>cglib-nodep</artifactId> + <version>${cglib-nodep.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> @@ -138,14 +145,14 @@ </executions> </plugin> <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Provide-Capability>osgi.service;objectClass:List<String>=org.osgi.service.async.Async;uses:=org.osgi.service.async,osgi.implementation;osgi.implementation=osgi.async;version:Version=1.0.0;uses:="org.osgi.service.async,org.osgi.service.async.delegate"</Provide-Capability> - </instructions> - </configuration> - </plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <configuration> + <instructions> + <Provide-Capability>osgi.service;objectClass:List<String>=org.osgi.service.async.Async;uses:=org.osgi.service.async,osgi.implementation;osgi.implementation=osgi.async;version:Version=1.0.0;uses:="org.osgi.service.async,org.osgi.service.async.delegate"</Provide-Capability> + </instructions> + </configuration> + </plugin> </plugins> </build> diff --git a/async/async-api/pom.xml b/async/async-api/pom.xml index 297868b90..1d1912142 100644 --- a/async/async-api/pom.xml +++ b/async/async-api/pom.xml @@ -56,13 +56,16 @@ * </aries.osgi.import.pkg> <lastReleaseVersion>1.0.1</lastReleaseVersion> + + <org.apache.aries.async.promise.api.version>1.1.0-SNAPSHOT</org.apache.aries.async.promise.api.version> + <osgi.annotation.version>6.0.1</osgi.annotation.version> </properties> <dependencies> <dependency> <groupId>org.apache.aries.async</groupId> <artifactId>org.apache.aries.async.promise.api</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>${org.apache.aries.async.promise.api.version}</version> </dependency> <dependency> <groupId>org.osgi</groupId> @@ -72,7 +75,7 @@ <dependency> <groupId>org.osgi</groupId> <artifactId>osgi.annotation</artifactId> - <version>6.0.1</version> + <version>${osgi.annotation.version}</version> <scope>provided</scope> </dependency> </dependencies> diff --git a/async/async-impl/pom.xml b/async/async-impl/pom.xml index eb210c196..9b77544c1 100644 --- a/async/async-impl/pom.xml +++ b/async/async-impl/pom.xml @@ -44,13 +44,13 @@ </scm> <properties> - <aries.osgi.activator>org.apache.aries.async.impl.Activator</aries.osgi.activator> + <aries.osgi.activator>org.apache.aries.async.impl.Activator</aries.osgi.activator> <!-- Export package versions are maintained in packageinfo files --> <aries.osgi.export.pkg> </aries.osgi.export.pkg> <aries.osgi.private.pkg> - org.apache.aries.async.impl, - net.sf.cglib.* + org.apache.aries.async.impl, + net.sf.cglib.* </aries.osgi.private.pkg> <aries.osgi.import.pkg> !net.sf.cglib.asm.util, @@ -58,28 +58,36 @@ * </aries.osgi.import.pkg> <lastReleaseVersion>1.0.1</lastReleaseVersion> + + <cglib-nodep.version>3.2.4</cglib-nodep.version> + <mockito-all.version>1.9.5</mockito-all.version> + <org.apache.aries.async.api.version>1.0.2-SNAPSHOT</org.apache.aries.async.api.version> + <org.apache.aries.async.promise.api.version>1.1.0-SNAPSHOT</org.apache.aries.async.promise.api.version> + <org.osgi.service.log.version>1.3.0</org.osgi.service.log.version> + <org.osgi.util.tracker.version>1.5.1</org.osgi.util.tracker.version> + <osgi.annotation.version>6.0.1</osgi.annotation.version> </properties> <dependencies> <dependency> <groupId>org.apache.aries.async</groupId> <artifactId>org.apache.aries.async.promise.api</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>${org.apache.aries.async.promise.api.version}</version> </dependency> <dependency> <groupId>org.apache.aries.async</groupId> <artifactId>org.apache.aries.async.api</artifactId> - <version>1.0.2-SNAPSHOT</version> + <version>${org.apache.aries.async.api.version}</version> </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.service.log</artifactId> - <version>1.3.0</version> + <version>${org.osgi.service.log.version}</version> </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.util.tracker</artifactId> - <version>1.5.1</version> + <version>${org.osgi.util.tracker.version}</version> </dependency> <dependency> <groupId>org.osgi</groupId> @@ -89,14 +97,14 @@ <dependency> <groupId>org.osgi</groupId> <artifactId>osgi.annotation</artifactId> - <version>6.0.1</version> + <version>${osgi.annotation.version}</version> <scope>provided</scope> </dependency> <dependency> - <groupId>cglib</groupId> - <artifactId>cglib-nodep</artifactId> - <version>3.2.4</version> - <scope>provided</scope> + <groupId>cglib</groupId> + <artifactId>cglib-nodep</artifactId> + <version>${cglib-nodep.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>junit</groupId> @@ -106,7 +114,7 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-all</artifactId> - <version>1.9.5</version> + <version>${mockito-all.version}</version> <scope>test</scope> </dependency> </dependencies> @@ -126,15 +134,15 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Provide-Capability>osgi.service;objectClass:List<String>=org.osgi.service.async.Async;uses:=org.osgi.service.async,osgi.implementation;osgi.implementation=osgi.async;version:Version=1.0.0;uses:="org.osgi.service.async,org.osgi.service.async.delegate"</Provide-Capability> - </instructions> - </configuration> - </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <configuration> + <instructions> + <Provide-Capability>osgi.service;objectClass:List<String>=org.osgi.service.async.Async;uses:=org.osgi.service.async,osgi.implementation;osgi.implementation=osgi.async;version:Version=1.0.0;uses:="org.osgi.service.async,org.osgi.service.async.delegate"</Provide-Capability> + </instructions> + </configuration> + </plugin> </plugins> </build> diff --git a/async/async-index/pom.xml b/async/async-index/pom.xml index dd42d6d22..27ad62a22 100644 --- a/async/async-index/pom.xml +++ b/async/async-index/pom.xml @@ -25,7 +25,7 @@ <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> <version>2.0.1</version> - <relativePath>../parent/pom.xml</relativePath> + <relativePath>../../parent/pom.xml</relativePath> </parent> <groupId>org.apache.aries.async</groupId> @@ -34,7 +34,7 @@ <packaging>pom</packaging> <version>1.1.0-SNAPSHOT</version> <description> - An index for the Apache Aries Async Service + An index for the Apache Aries Async Service </description> <scm> @@ -43,12 +43,13 @@ <url>https://gitbox.apache.org/repos/asf?p=aries.git;a=summary</url> </scm> - <properties> <local.url.policy>REQUIRED</local.url.policy> + + <bnd-indexer-maven-plugin.version>3.1.0</bnd-indexer-maven-plugin.version> + <org.apache.aries.async.impl.version>1.1.0-SNAPSHOT</org.apache.aries.async.impl.version> </properties> - - + <profiles> <profile> <id>apache-release</id> @@ -63,13 +64,12 @@ </properties> </profile> </profiles> - <dependencies> <dependency> <groupId>org.apache.aries.async</groupId> <artifactId>org.apache.aries.async.impl</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>${org.apache.aries.async.impl.version}</version> </dependency> </dependencies> @@ -78,7 +78,7 @@ <plugin> <groupId>biz.aQute.bnd</groupId> <artifactId>bnd-indexer-maven-plugin</artifactId> - <version>3.1.0</version> + <version>${bnd-indexer-maven-plugin.version}</version> <configuration> <localURLs>${local.url.policy}</localURLs> </configuration> @@ -94,6 +94,5 @@ </plugins> </build> - </project> diff --git a/async/promise-api/pom.xml b/async/promise-api/pom.xml index 48d95341c..40b3cd88f 100644 --- a/async/promise-api/pom.xml +++ b/async/promise-api/pom.xml @@ -50,20 +50,22 @@ org.osgi.util.promise;provide:=true, org.apache.aries.async.promise </aries.osgi.export.pkg> - <aries.osgi.private.pkg /> + <aries.osgi.private.pkg/> <aries.osgi.import.pkg> org.osgi.util.function, org.osgi.util.promise, * </aries.osgi.import.pkg> <lastReleaseVersion>1.0.1</lastReleaseVersion> + + <osgi.annotation.version>6.0.1</osgi.annotation.version> </properties> <dependencies> <dependency> <groupId>org.osgi</groupId> <artifactId>osgi.annotation</artifactId> - <version>6.0.1</version> + <version>${osgi.annotation.version}</version> <scope>provided</scope> </dependency> <dependency>
