Skip to content

Commit

Permalink
[MAINTENANCE] Extract dependency versions to properties - versioning
Browse files Browse the repository at this point in the history
  • Loading branch information
@alien11689
alien11689 committed Jan 11, 2025
1 parent 2e8939c commit ca338fd
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 19 deletions.
19 changes: 12 additions & 7 deletions versioning/versioning-checker/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
<version>2.1.1</version>
<relativePath />
<relativePath/>
</parent>

<groupId>org.apache.aries.versioning</groupId>
Expand Down Expand Up @@ -59,20 +59,25 @@
</aries.osgi.private.pkg>
<lastReleaseVersion>0.2.0</lastReleaseVersion>
<aries.skip.version.check>true</aries.skip.version.check>

<asm.version>9.6</asm.version>
<maven-release-plugin.version>2.5.2</maven-release-plugin.version>
<org.apache.aries.testsupport.unit.version>1.0.0</org.apache.aries.testsupport.unit.version>
<org.apache.aries.util.version>1.1.0</org.apache.aries.util.version>
</properties>

<dependencies>
<!-- Dependency on other Aries module bundles -->
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
<version>1.1.0</version>
<version>${org.apache.aries.util.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
<scope>test</scope>
<version>1.0.0</version>
<version>${org.apache.aries.testsupport.unit.version}</version>
</dependency>

<!--External dependencies. Versions may be specified in default parent -->
Expand All @@ -85,13 +90,13 @@
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<optional>true</optional>
<version>9.6</version>
<version>${asm.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-commons</artifactId>
<optional>true</optional>
<version>9.6</version>
<version>${asm.version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Expand All @@ -114,7 +119,7 @@
<plugins>
<plugin>
<artifactId>maven-release-plugin</artifactId>
<version>2.5.2</version>
<version>${maven-release-plugin.version}</version>
</plugin>
</plugins>
</build>
Expand Down
37 changes: 25 additions & 12 deletions versioning/versioning-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
<version>2.1.1</version>
<relativePath />
<relativePath/>
</parent>

<groupId>org.apache.aries.versioning</groupId>
Expand All @@ -39,12 +39,25 @@
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/aries.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=aries.git;a=summary</url>
</scm>


<properties>
<maven-artifact-resolver.version>1.0</maven-artifact-resolver.version>
<maven-artifact.version>3.0.3</maven-artifact.version>
<maven-common-artifact-filters.version>1.4</maven-common-artifact-filters.version>
<maven-compat.version>3.0.3</maven-compat.version>
<maven-core.version>3.0.3</maven-core.version>
<maven-plugin-annotations.version>3.2</maven-plugin-annotations.version>
<maven-plugin-api.version>3.0.3</maven-plugin-api.version>
<maven-plugin-plugin.version>3.3</maven-plugin-plugin.version>
<maven-release-plugin.version>2.5.2</maven-release-plugin.version>
<org.apache.aries.versioning.checker.version>0.3.2-SNAPSHOT</org.apache.aries.versioning.checker.version>
</properties>

<dependencies>
<dependency>
<groupId>org.apache.aries.versioning</groupId>
<artifactId>org.apache.aries.versioning.checker</artifactId>
<version>0.3.2-SNAPSHOT</version>
<version>${org.apache.aries.versioning.checker.version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Expand All @@ -61,22 +74,22 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>3.0.3</version>
<version>${maven-plugin-api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>3.0.3</version>
<version>${maven-artifact.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>3.0.3</version>
<version>${maven-core.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-compat</artifactId>
<version>3.0.3</version>
<version>${maven-compat.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand All @@ -87,27 +100,27 @@
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<version>3.2</version>
<version>${maven-plugin-annotations.version}</version>
<scope>provided</scope>
</dependency>
<!-- maven shared -->
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-artifact-resolver</artifactId>
<version>1.0</version>
<version>${maven-artifact-resolver.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-common-artifact-filters</artifactId>
<version>1.4</version>
<version>${maven-common-artifact-filters.version}</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<artifactId>maven-plugin-plugin</artifactId>
<version>3.3</version>
<version>${maven-plugin-plugin.version}</version>
<configuration>
<goalPrefix>asv</goalPrefix>
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
Expand All @@ -123,7 +136,7 @@
</plugin>
<plugin>
<artifactId>maven-release-plugin</artifactId>
<version>2.5.2</version>
<version>${maven-release-plugin.version}</version>
</plugin>
</plugins>
</build>
Expand Down

0 comments on commit ca338fd

Please sign in to comment.