This is an automated email from the ASF dual-hosted git repository. amichair pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/aries-rsa.git
commit 43dba1cfa60fbd00f11b3753a100de56f08d9678 Author: Amichai Rothman <[email protected]> AuthorDate: Thu Apr 30 11:40:56 2026 +0300 Move dependency versions to parent dependencyManagement --- discovery/command/pom.xml | 1 - discovery/local/pom.xml | 9 -- discovery/mdns/pom.xml | 4 - discovery/tcp/pom.xml | 3 - discovery/zookeeper/pom.xml | 2 - features/pom.xml | 1 - itests/felix/pom.xml | 1 - itests/pom.xml | 10 -- parent/pom.xml | 230 ++++++++++++++++++++++++++++++-------------- provider/fastbin/pom.xml | 2 - provider/tcp/pom.xml | 1 - 11 files changed, 160 insertions(+), 104 deletions(-) diff --git a/discovery/command/pom.xml b/discovery/command/pom.xml index f06d9fbe..e85b899c 100644 --- a/discovery/command/pom.xml +++ b/discovery/command/pom.xml @@ -46,7 +46,6 @@ <dependency> <groupId>org.apache.karaf.shell</groupId> <artifactId>org.apache.karaf.shell.core</artifactId> - <version>4.4.10</version> <scope>provided</scope> </dependency> </dependencies> diff --git a/discovery/local/pom.xml b/discovery/local/pom.xml index 217488f4..b6100de5 100644 --- a/discovery/local/pom.xml +++ b/discovery/local/pom.xml @@ -47,7 +47,6 @@ <dependency> <groupId>xmlunit</groupId> <artifactId>xmlunit</artifactId> - <version>1.6</version> <scope>test</scope> </dependency> @@ -66,14 +65,6 @@ <plugin> <groupId>org.jvnet.jaxb</groupId> <artifactId>jaxb-maven-plugin</artifactId> - <version>4.0.12</version> - <executions> - <execution> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/discovery/mdns/pom.xml b/discovery/mdns/pom.xml index 6308e5bb..4791cf77 100644 --- a/discovery/mdns/pom.xml +++ b/discovery/mdns/pom.xml @@ -24,23 +24,19 @@ <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.service.component.annotations</artifactId> - <version>1.5.1</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.service.jaxrs</artifactId> - <version>1.0.1</version> </dependency> <dependency> <groupId>jakarta.ws.rs</groupId> <artifactId>jakarta.ws.rs-api</artifactId> - <version>2.1.6</version> </dependency> <dependency> <groupId>org.jmdns</groupId> <artifactId>jmdns</artifactId> - <version>3.6.3</version> </dependency> </dependencies> </project> \ No newline at end of file diff --git a/discovery/tcp/pom.xml b/discovery/tcp/pom.xml index a96b7811..bb08cdcd 100644 --- a/discovery/tcp/pom.xml +++ b/discovery/tcp/pom.xml @@ -48,14 +48,11 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>5.23.0</version> <scope>test</scope> </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.service.remoteserviceadmin</artifactId> - <version>1.1.0</version> - <scope>compile</scope> </dependency> </dependencies> diff --git a/discovery/zookeeper/pom.xml b/discovery/zookeeper/pom.xml index 67ccb1db..ad44a358 100644 --- a/discovery/zookeeper/pom.xml +++ b/discovery/zookeeper/pom.xml @@ -93,13 +93,11 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>5.23.0</version> <scope>test</scope> </dependency> <dependency> <groupId>org.hamcrest</groupId> <artifactId>hamcrest-all</artifactId> - <version>1.3</version> <scope>test</scope> </dependency> <dependency> diff --git a/features/pom.xml b/features/pom.xml index 6f3110b3..9c107239 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -153,7 +153,6 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> - <version>3.6.1</version> <executions> <execution> <id>attach-artifacts</id> diff --git a/itests/felix/pom.xml b/itests/felix/pom.xml index df3db818..e9dd8763 100644 --- a/itests/felix/pom.xml +++ b/itests/felix/pom.xml @@ -63,7 +63,6 @@ <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.util.promise</artifactId> - <version>1.3.0</version> </dependency> <dependency> <groupId>org.osgi</groupId> diff --git a/itests/pom.xml b/itests/pom.xml index c802567f..4385152b 100644 --- a/itests/pom.xml +++ b/itests/pom.xml @@ -43,11 +43,6 @@ <dependencyManagement> <dependencies> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-atinject_1.0_spec</artifactId> - <version>1.2</version> - </dependency> <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam-junit4</artifactId> @@ -78,11 +73,6 @@ <artifactId>pax-exam-link-mvn</artifactId> <version>${exam.version}</version> </dependency> - <dependency> - <groupId>org.ops4j.pax.url</groupId> - <artifactId>pax-url-aether</artifactId> - <version>3.0.3</version> - </dependency> </dependencies> </dependencyManagement> diff --git a/parent/pom.xml b/parent/pom.xml index 294a2ece..f9cc6267 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -162,6 +162,18 @@ <version>4.13.2</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>5.23.0</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-all</artifactId> + <version>1.3</version> + <scope>test</scope> + </dependency> <dependency> <groupId>org.easymock</groupId> <artifactId>easymock</artifactId> @@ -175,77 +187,138 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.servicemix.bundles</groupId> - <artifactId>org.apache.servicemix.bundles.zookeeper</artifactId> - <version>${zookeeper.version}</version> - <exclusions> - <exclusion> - <groupId>com.sun.jdmk</groupId> - <artifactId>jmxtools</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jmx</groupId> - <artifactId>jmxri</artifactId> - </exclusion> - <exclusion> - <artifactId>slf4j-log4j12</artifactId> - <groupId>org.slf4j</groupId> - </exclusion> - <exclusion> - <artifactId>jline</artifactId> - <groupId>jline</groupId> - </exclusion> - <exclusion> - <artifactId>netty</artifactId> - <groupId>io.netty</groupId> - </exclusion> - <exclusion> - <artifactId>log4j</artifactId> - <groupId>log4j</groupId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>io.dropwizard.metrics</groupId> - <artifactId>metrics-core</artifactId> - <version>4.2.38</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.xerial.snappy</groupId> - <artifactId>snappy-java</artifactId> - <version>1.1.10.8</version> - </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.converter</artifactId> - <version>1.0.18</version> - </dependency> + <groupId>org.apache.servicemix.bundles</groupId> + <artifactId>org.apache.servicemix.bundles.zookeeper</artifactId> + <version>${zookeeper.version}</version> + <exclusions> + <exclusion> + <groupId>com.sun.jdmk</groupId> + <artifactId>jmxtools</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jmx</groupId> + <artifactId>jmxri</artifactId> + </exclusion> + <exclusion> + <artifactId>slf4j-log4j12</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + <exclusion> + <artifactId>jline</artifactId> + <groupId>jline</groupId> + </exclusion> + <exclusion> + <artifactId>netty</artifactId> + <groupId>io.netty</groupId> + </exclusion> + <exclusion> + <artifactId>log4j</artifactId> + <groupId>log4j</groupId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>io.dropwizard.metrics</groupId> + <artifactId>metrics-core</artifactId> + <version>4.2.38</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.xerial.snappy</groupId> + <artifactId>snappy-java</artifactId> + <version>1.1.10.8</version> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.converter</artifactId> + <version>1.0.18</version> + </dependency> + + <dependency> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> + <version>4.0.5</version> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-osgi</artifactId> + <version>4.0.5</version> + </dependency> + <dependency> + <groupId>jakarta.activation</groupId> + <artifactId>jakarta.activation-api</artifactId> + <version>2.1.4</version> + </dependency> + + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.service.remoteserviceadmin</artifactId> + <version>1.1.0</version> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.util.promise</artifactId> + <version>1.3.0</version> + </dependency> + + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.service.component.annotations</artifactId> + <version>1.5.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.service.jaxrs</artifactId> + <version>1.0.1</version> + </dependency> + <dependency> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> + <version>2.1.6</version> + </dependency> + + <dependency> + <groupId>org.jmdns</groupId> + <artifactId>jmdns</artifactId> + <version>3.6.3</version> + </dependency> + + <dependency> + <groupId>org.apache.karaf.shell</groupId> + <artifactId>org.apache.karaf.shell.core</artifactId> + <version>4.4.10</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>xmlunit</groupId> + <artifactId>xmlunit</artifactId> + <version>1.6</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-atinject_1.0_spec</artifactId> + <version>1.2</version> + </dependency> + + <dependency> + <groupId>org.ops4j.pax.url</groupId> + <artifactId>pax-url-aether</artifactId> + <version>3.0.3</version> + </dependency> - <dependency> - <groupId>jakarta.xml.bind</groupId> - <artifactId>jakarta.xml.bind-api</artifactId> - <version>4.0.5</version> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-osgi</artifactId> - <version>4.0.5</version> - </dependency> - <dependency> - <groupId>jakarta.activation</groupId> - <artifactId>jakarta.activation-api</artifactId> - <version>2.1.4</version> - </dependency> </dependencies> </dependencyManagement> @@ -281,6 +354,23 @@ <doclint>none</doclint> </configuration> </plugin> + <plugin> + <groupId>org.jvnet.jaxb</groupId> + <artifactId>jaxb-maven-plugin</artifactId> + <version>4.0.12</version> + <executions> + <execution> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>3.6.1</version> + </plugin> </plugins> </pluginManagement> diff --git a/provider/fastbin/pom.xml b/provider/fastbin/pom.xml index 95905e03..dbcf8658 100644 --- a/provider/fastbin/pom.xml +++ b/provider/fastbin/pom.xml @@ -60,7 +60,6 @@ <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.util.promise</artifactId> - <version>1.3.0</version> <optional>true</optional> </dependency> </dependencies> @@ -85,7 +84,6 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> - <version>3.6.1</version> <executions> <execution> <id>add-test-source</id> diff --git a/provider/tcp/pom.xml b/provider/tcp/pom.xml index 306808f5..2d8ef252 100644 --- a/provider/tcp/pom.xml +++ b/provider/tcp/pom.xml @@ -45,7 +45,6 @@ <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.util.promise</artifactId> - <version>1.3.0</version> </dependency> <dependency> <groupId>org.apache.felix</groupId>
