Prepare NEWS.rst for 12.0.6

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

diff --git a/abstract-feature-parent/pom.xml b/abstract-feature-parent/pom.xml
index 02857e604f1a4c5c7aca9d758b19fc4cb1defd6a..38640a833c06a0811243ff0db2c9403d18c095d1 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>11.0.0-SNAPSHOT</version>
+        <version>12.0.6-SNAPSHOT</version>
         <relativePath>../odlparent</relativePath>
     </parent>
 
@@ -43,7 +43,7 @@
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
             <artifactId>features-test</artifactId>
-            <version>11.0.0-SNAPSHOT</version>
+            <version>12.0.6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -63,12 +63,12 @@
             <artifactId>slf4j-api</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
+        <!-- required due to https://jira.opendaylight.org/browse/ODLPARENT-136 -->
+        <!--dependency>
             <groupId>org.osgi</groupId>
-            <!-- required due to https://jira.opendaylight.org/browse/ODLPARENT-136 -->
             <artifactId>osgi.cmpn</artifactId>
             <scope>test</scope>
-        </dependency>
+        </dependency-->
     </dependencies>
 
     <build>
@@ -115,8 +115,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 JDK19+ just yet -->
+                <jdk>[19,)</jdk>
             </activation>
 
             <properties>
@@ -136,7 +136,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>