#1109 Manage dependencies and plugins in parent project

ops4j · Dec 14, 2023 · 64578c1 · 64578c1
1 parent 6a75516
commit 64578c1
Show file tree

Hide file tree

Showing 17 changed files with 153 additions and 59 deletions.
diff --git a/containers/pax-exam-container-forked/pom.xml b/containers/pax-exam-container-forked/pom.xml
@@ -95,7 +95,6 @@
         <dependency>
             <groupId>org.ops4j.pax.url</groupId>
             <artifactId>pax-url-reference</artifactId>
-            <version>${dependency.paxurl.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/itest/cdi/pom.xml b/itest/cdi/pom.xml
@@ -41,7 +41,6 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-invoker-plugin</artifactId>
-                        <version>1.5</version>
                         <configuration>
                             <streamLogs>true</streamLogs>
                         </configuration>

diff --git a/itest/javaee/pom.xml b/itest/javaee/pom.xml
@@ -40,7 +40,6 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-invoker-plugin</artifactId>
-                        <version>1.5</version>
                         <configuration>
                             <streamLogs>true</streamLogs>
                         </configuration>

diff --git a/itest/karaf/pom.xml b/itest/karaf/pom.xml
@@ -37,7 +37,6 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-invoker-plugin</artifactId>
-                        <version>1.5</version>
                         <configuration>
                             <streamLogs>true</streamLogs>
                         </configuration>

diff --git a/itest/osgi/pom.xml b/itest/osgi/pom.xml
@@ -66,7 +66,6 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-invoker-plugin</artifactId>
-                        <version>1.5</version>
                         <configuration>
                             <streamLogs>true</streamLogs>
                         </configuration>

diff --git a/itest/osgi/src/it/regression-maven-plugin/pom.xml b/itest/osgi/src/it/regression-maven-plugin/pom.xml
@@ -146,7 +146,6 @@
             <plugin>
                 <groupId>org.apache.servicemix.tooling</groupId>
                 <artifactId>depends-maven-plugin</artifactId>
-                <version>1.2</version>
                 <executions>
                     <execution>
                         <id>generate-depends-file</id>
@@ -161,7 +160,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>2.12</version>
                 <executions>
                     <execution>
                         <goals>

diff --git a/itest/osgi/src/it/regression-multi/pom.xml b/itest/osgi/src/it/regression-multi/pom.xml
@@ -23,40 +23,36 @@
     </properties>
 
     <dependencies>
+        <!-- javax/jakarta -->
         <dependency>
-            <groupId>org.ops4j.pax.exam.samples</groupId>
-            <artifactId>pax-exam-sample9-pde</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.ops4j.pax.exam.samples</groupId>
-            <artifactId>pax-exam-sample11-wab</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
+            <groupId>jakarta.transaction</groupId>
+            <artifactId>jakarta.transaction-api</artifactId>
+            <scope>provided</scope>
         </dependency>
-
+        <!-- Pax Exam -->
         <dependency>
-            <groupId>org.ops4j.pax.exam.samples</groupId>
-            <artifactId>pax-exam-sample8-ds</artifactId>
+            <groupId>org.ops4j.pax.exam</groupId>
+            <artifactId>pax-exam-junit4</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
-            <artifactId>pax-exam-junit4</artifactId>
+            <artifactId>pax-exam-link-assembly</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
             <artifactId>pax-exam-link-mvn</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
             <artifactId>pax-exam-cm</artifactId>
@@ -69,13 +65,13 @@
                 </exclusion>
             </exclusions>
         </dependency>
-
+        <!-- Apache Felix -->
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.configadmin</artifactId>
             <scope>test</scope>
         </dependency>
-
+        <!-- OPS4J -->
         <dependency>
             <groupId>org.ops4j.pax.tinybundles</groupId>
             <artifactId>tinybundles</artifactId>
@@ -86,8 +82,51 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <!--
+        <dependency>
+            <groupId>org.ops4j.base</groupId>
+            <artifactId>ops4j-base-exec</artifactId>
+            <scope>test</scope>
+        </dependency>
+        -->
+        <dependency>
+            <groupId>org.ops4j.base</groupId>
+            <artifactId>ops4j-base-lang</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.base</groupId>
+            <artifactId>ops4j-base-monitors</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.base</groupId>
+            <artifactId>ops4j-base-store</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.base</groupId>
+            <artifactId>ops4j-base-io</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.base</groupId>
+            <artifactId>ops4j-base-util-property</artifactId>
+            <scope>test</scope>
+        </dependency>
 
-        <!-- For sane logging -->
+        <dependency>
+            <groupId>org.ops4j.pax.swissbox</groupId>
+            <artifactId>pax-swissbox-framework</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.ops4j.pax.swissbox</groupId>
+            <artifactId>pax-swissbox-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <!-- logging -->
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-core</artifactId>
@@ -111,44 +150,46 @@
             <artifactId>jcl-over-slf4j</artifactId>
             <scope>test</scope>
         </dependency>
-
+        <!-- testing -->
         <dependency>
-            <groupId>org.ops4j.pax.swissbox</groupId>
-            <artifactId>pax-swissbox-framework</artifactId>
+            <groupId>org.glassfish.jersey.core</groupId>
+            <artifactId>jersey-client</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.ops4j.pax.swissbox</groupId>
-            <artifactId>pax-swissbox-core</artifactId>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
 
+        <!-- samples -->
         <dependency>
-            <groupId>org.glassfish.jersey.core</groupId>
-            <artifactId>jersey-client</artifactId>
+            <groupId>org.ops4j.pax.exam.samples</groupId>
+            <artifactId>pax-exam-sample9-pde</artifactId>
+            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
-
         <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
+            <groupId>org.ops4j.pax.exam.samples</groupId>
+            <artifactId>pax-exam-sample11-wab</artifactId>
+            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
-
         <dependency>
-            <groupId>jakarta.inject</groupId>
-            <artifactId>jakarta.inject-api</artifactId>
-            <scope>provided</scope>
+            <groupId>org.ops4j.pax.exam.samples</groupId>
+            <artifactId>pax-exam-sample8-ds</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
         </dependency>
 
+
     </dependencies>
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.servicemix.tooling</groupId>
                 <artifactId>depends-maven-plugin</artifactId>
-                <version>1.2</version>
                 <executions>
                     <execution>
                         <id>generate-depends-file</id>

diff --git a/itest/osgi/src/it/regression-plumbing/pom.xml b/itest/osgi/src/it/regression-plumbing/pom.xml
@@ -95,7 +95,6 @@
             <plugin>
                 <groupId>org.apache.servicemix.tooling</groupId>
                 <artifactId>depends-maven-plugin</artifactId>
-                <version>1.2</version>
                 <executions>
                     <execution>
                         <id>generate-depends-file</id>

diff --git a/itest/web/pom.xml b/itest/web/pom.xml
@@ -34,7 +34,6 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-invoker-plugin</artifactId>
-                        <version>1.5</version>
                         <configuration>
                             <streamLogs>true</streamLogs>
                         </configuration>

diff --git a/itest/web/src/it/regression-web-spring-userprobe/pom.xml b/itest/web/src/it/regression-web-spring-userprobe/pom.xml
@@ -131,7 +131,6 @@
             <plugin>
                 <groupId>org.apache.servicemix.tooling</groupId>
                 <artifactId>depends-maven-plugin</artifactId>
-                <version>1.2</version>
                 <executions>
                     <execution>
                         <id>generate-depends-file</id>

diff --git a/maven/exam-maven-plugin/pom.xml b/maven/exam-maven-plugin/pom.xml
@@ -56,12 +56,6 @@
                 <version>${dependency.maven.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.codehaus.plexus</groupId>
-                <artifactId>plexus-container-default</artifactId>
-                <version>1.5.5</version>
-            </dependency>
-
         </dependencies>
     </dependencyManagement>
 
@@ -75,7 +69,6 @@
         <dependency>
             <groupId>org.apache.maven.plugin-tools</groupId>
             <artifactId>maven-plugin-annotations</artifactId>
-            <version>3.3</version>
         </dependency>
 
         <dependency>
@@ -91,7 +84,6 @@
         <dependency>
             <groupId>org.apache.maven.shared</groupId>
             <artifactId>maven-common-artifact-filters</artifactId>
-            <version>1.4</version>
         </dependency>
 
         <dependency>
@@ -118,7 +110,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-plugin-plugin</artifactId>
-                <version>3.3</version>
                 <executions>
                     <execution>
                         <id>default-descriptor</id>