Bump versions to 13.1.0-SNAPSHOT

[odlparent.git] / abstract-feature-parent / pom.xml

diff --git a/abstract-feature-parent/pom.xml b/abstract-feature-parent/pom.xml
index 14424e53df074e3b99318aef1ca3803bd1c3d219..d81de74927028d37b84191089824a58711ab615c 100644 (file)
--- a/abstract-feature-parent/pom.xml
+++ b/abstract-feature-parent/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>10.0.0-SNAPSHOT</version>
+        <version>13.1.0-SNAPSHOT</version>
         <relativePath>../odlparent</relativePath>
     </parent>
 
@@ -43,7 +43,7 @@
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
             <artifactId>features-test</artifactId>
-            <version>10.0.0-SNAPSHOT</version>
+            <version>13.1.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -63,12 +63,6 @@
             <artifactId>slf4j-api</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <!-- required due to https://jira.opendaylight.org/browse/ODLPARENT-136 -->
-            <artifactId>osgi.cmpn</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
@@ -79,10 +73,34 @@
                 <groupId>org.apache.servicemix.tooling</groupId>
                 <artifactId>depends-maven-plugin</artifactId>
             </plugin>
+            <plugin>
+                <!-- Lists feature dependencies defined in test scope to be pre-installed in karaf when SFT is executed.
+                     Resolved dependencies also include absolute path to artifacts within local repository so
+                     feature names (required for feature:install) can be retrieved. -->
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <!-- execute before test phase -->
+                        <phase>test-compile</phase>
+                        <goals>
+                            <goal>list</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <skip>${skip.karaf.featureTest}</skip>
+                    <includeClassifiers>features</includeClassifiers>
+                    <includeTypes>xml</includeTypes>
+                    <excludeScope>compile</excludeScope>
+                    <!-- exclude SFT's own dependency features -->
+                    <excludeGroupIds>org.apache.karaf.features</excludeGroupIds>
+                    <outputAbsoluteArtifactFilename>true</outputAbsoluteArtifactFilename>
+                    <outputFile>${project.build.directory}/test-features</outputFile>
+                </configuration>
+            </plugin>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <!-- Overridden to have TCP channel support -->
-                <version>3.0.0-M5</version>
                 <configuration>
                     <!-- Overridden to fix corruption with SFT, where the process would hang after test -->
                     <forkNode implementation="org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory"/>
@@ -96,6 +114,8 @@
                     <systemPropertyVariables>
                         <!-- Use the same repository for Pax Exam as is used for Maven -->
                         <org.ops4j.pax.url.mvn.localRepository>${settings.localRepository}</org.ops4j.pax.url.mvn.localRepository>
+                        <!-- Test scope features resolved by maven-dependency-plugin (above) -->
+                        <featureTest.dependencies.list>${project.build.directory}/test-features</featureTest.dependencies.list>
                     </systemPropertyVariables>
 
                     <!-- Disable argLine if present, but pass it to SFT -->
@@ -117,8 +137,8 @@
         <profile>
             <id>disable-sft</id>
             <activation>
-                <!-- Karaf does not have jre.properties for JDK18+ just yet -->
-                <jdk>[18,)</jdk>
+                <!-- Karaf does not have jre.properties for JDK22+ just yet -->
+                <jdk>[22,)</jdk>
             </activation>
 
             <properties>
@@ -138,7 +158,7 @@
                                 </goals>
                                 <phase>test</phase>
                                 <configuration>
-                                    <message>Running on JDK newer than 17, which is not supported. Skipping feature tests.</message>
+                                    <message>Running on JDK newer than 18, which is not supported. Skipping feature tests.</message>
                                 </configuration>
                             </execution>
                         </executions>