Disable SFT test in Java 9 JVM

We are using karaf-4.1.x, which means we are not JVM-9 ready,
hence running SFT should be disabled. This also fixes compilation
with JDK9, so that odlparent will pass 'mvn clean install'.

Change-Id: I86a88e60b4f75ffe1504c0837f0b09db578f8d4c
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/feature-repo-parent/pom.xml b/feature-repo-parent/pom.xml
index 80ede9be3791666a9e14f620446af2a9e16e4ae1..c6f9a53257d04409ea4f9eb19a3450b6172f8b97 100644 (file)
--- a/feature-repo-parent/pom.xml
+++ b/feature-repo-parent/pom.xml
@@ -102,6 +102,30 @@
                 <configuration>
                     <enableGeneration>true</enableGeneration>
                 </configuration>
+
+                <dependencies>
+                    <!-- These are required to make the plugin work with JDK 9. 4.2.x should not need these. -->
+                    <dependency>
+                        <groupId>javax.xml.bind</groupId>
+                        <artifactId>jaxb-api</artifactId>
+                        <version>2.2.11</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>com.sun.xml.bind</groupId>
+                        <artifactId>jaxb-core</artifactId>
+                        <version>2.2.11</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>com.sun.xml.bind</groupId>
+                        <artifactId>jaxb-impl</artifactId>
+                        <version>2.2.11</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>javax.activation</groupId>
+                        <artifactId>activation</artifactId>
+                        <version>1.1.1</version>
+                    </dependency>
+                </dependencies>
             </plugin>
         </plugins>
         <pluginManagement>
@@ -134,21 +158,4 @@
           </plugins>
         </pluginManagement>
     </build>
-
-    <!--
-        Maven Site Configuration
-
-        The following configuration is necessary for maven-site-plugin to
-        correctly identify the correct deployment path for OpenDaylight Maven
-        sites.
-    -->
-    <url>${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/</url>
-
-    <distributionManagement>
-        <site>
-            <id>opendaylight-site</id>
-            <url>${nexus.site.url}/${project.artifactId}/</url>
-        </site>
-    </distributionManagement>
-
 </project>

diff --git a/features-test/pom.xml b/features-test/pom.xml
index 2850c3dbcef88a139ba77461fa4c46b39e562c34..348f1a72099f13bab721e16a9df26492770d38d8 100644 (file)
--- a/features-test/pom.xml
+++ b/features-test/pom.xml
@@ -128,6 +128,29 @@
           <artifactId>guava</artifactId>
           <scope>compile</scope>
         </dependency>
+
+        <!-- These are required to make the plugin work with JDK 9. 4.2.x should not need these. -->
+        <dependency>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+          <version>2.2.11</version>
+        </dependency>
+        <dependency>
+          <groupId>com.sun.xml.bind</groupId>
+          <artifactId>jaxb-core</artifactId>
+          <version>2.2.11</version>
+        </dependency>
+        <dependency>
+          <groupId>com.sun.xml.bind</groupId>
+          <artifactId>jaxb-impl</artifactId>
+          <version>2.2.11</version>
+        </dependency>
+        <dependency>
+          <groupId>javax.activation</groupId>
+          <artifactId>activation</artifactId>
+          <version>1.1.1</version>
+        </dependency>
+
         <!-- The following, which are just transitive dependencies of bundles4-test,
              have to be repeated here so that the Embed-Dependency below for maven-bundle-plugin works: -->
         <dependency>
@@ -196,20 +219,4 @@
             </plugin>
         </plugins>
     </build>
-
-  <!--
-    Maven Site Configuration
-
-    The following configuration is necessary for maven-site-plugin to
-    correctly identify the correct deployment path for OpenDaylight Maven
-    sites.
-  -->
-  <url>${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/</url>
-
-  <distributionManagement>
-    <site>
-      <id>opendaylight-site</id>
-      <url>${nexus.site.url}/${project.artifactId}/</url>
-    </site>
-  </distributionManagement>
 </project>

diff --git a/karaf-plugin/pom.xml b/karaf-plugin/pom.xml
index edb4eac6485f5ac32a025e2f19150e92cf3833ef..102d6a8b0b2d88d93a1156c57a834eec6df141d7 100644 (file)
--- a/karaf-plugin/pom.xml
+++ b/karaf-plugin/pom.xml
@@ -65,6 +65,28 @@
       <artifactId>org.osgi.core</artifactId>
       <scope>runtime</scope>
     </dependency>
+
+    <!-- These are required to make the plugin work with JDK 9. 4.2.x should not need these. -->
+    <dependency>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+      <version>2.2.11</version>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-core</artifactId>
+      <version>2.2.11</version>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-impl</artifactId>
+      <version>2.2.11</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.activation</groupId>
+      <artifactId>activation</artifactId>
+      <version>1.1.1</version>
+    </dependency>
   </dependencies>
 
   <build>
@@ -155,20 +177,4 @@
       </build>
     </profile>
   </profiles>
-
-  <!--
-    Maven Site Configuration
-
-    The following configuration is necessary for maven-site-plugin to
-    correctly identify the correct deployment path for OpenDaylight Maven
-    sites.
-  -->
-  <url>${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/</url>
-
-  <distributionManagement>
-    <site>
-      <id>opendaylight-site</id>
-      <url>${nexus.site.url}/${project.artifactId}/</url>
-    </site>
-  </distributionManagement>
 </project>

diff --git a/karaf/karaf4-parent/pom.xml b/karaf/karaf4-parent/pom.xml
index 716cc0d1a06ccd45f84e6f31e42c11b80d49791a..24432e185bf0d021135b160d4795d1aa8718aab3 100644 (file)
--- a/karaf/karaf4-parent/pom.xml
+++ b/karaf/karaf4-parent/pom.xml
@@ -306,6 +306,30 @@
                     <archiveTarGz>${karaf.archiveTarGz}</archiveTarGz>
                     <archiveZip>${karaf.archiveZip}</archiveZip>
                 </configuration>
+
+                <!-- These are required to make the plugin work with JDK 9. 4.2.x should not need these. -->
+                <dependencies>
+                    <dependency>
+                        <groupId>javax.xml.bind</groupId>
+                        <artifactId>jaxb-api</artifactId>
+                        <version>2.2.11</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>com.sun.xml.bind</groupId>
+                        <artifactId>jaxb-core</artifactId>
+                        <version>2.2.11</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>com.sun.xml.bind</groupId>
+                        <artifactId>jaxb-impl</artifactId>
+                        <version>2.2.11</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>javax.activation</groupId>
+                        <artifactId>activation</artifactId>
+                        <version>1.1.1</version>
+                    </dependency>
+                </dependencies>
             </plugin>
         </plugins>
     </build>

diff --git a/karaf/opendaylight-karaf-resources/pom.xml b/karaf/opendaylight-karaf-resources/pom.xml
index 0a2006ab3111a7b078ced46d94aa5c0d21d0426e..976fcee41afb8a60ab889e3c553df0a9ac83584b 100644 (file)
--- a/karaf/opendaylight-karaf-resources/pom.xml
+++ b/karaf/opendaylight-karaf-resources/pom.xml
@@ -206,7 +206,31 @@ mvn\:org.apache.aries.blueprint/org.apache.aries.blueprint.core.compatibility/1.
               <goal>assembly</goal>
             </goals>
           </execution>
-      </executions>
+        </executions>
+
+        <!-- These are required to make the plugin work with JDK 9. 4.2.x should not need these. -->
+        <dependencies>
+          <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.2.11</version>
+          </dependency>
+          <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-core</artifactId>
+            <version>2.2.11</version>
+          </dependency>
+          <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <version>2.2.11</version>
+          </dependency>
+          <dependency>
+            <groupId>javax.activation</groupId>
+            <artifactId>activation</artifactId>
+            <version>1.1.1</version>
+          </dependency>
+        </dependencies>
       </plugin>
       <!-- This needs to execute before patching, otherwise the feature will be left unpatched -->
       <plugin>

diff --git a/single-feature-parent/pom.xml b/single-feature-parent/pom.xml
index 73897cf2237841af5fa24101a4c83bb497db183e..a0b2ea155bd3cf076cabba16e158023531845044 100644 (file)
--- a/single-feature-parent/pom.xml
+++ b/single-feature-parent/pom.xml
@@ -117,20 +117,17 @@
         </plugins>
     </build>
 
-    <!--
-        Maven Site Configuration
-
-        The following configuration is necessary for maven-site-plugin to
-        correctly identify the correct deployment path for OpenDaylight Maven
-        sites.
-    -->
-    <url>${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/</url>
-
-    <distributionManagement>
-        <site>
-            <id>opendaylight-site</id>
-            <url>${nexus.site.url}/${project.artifactId}/</url>
-        </site>
-    </distributionManagement>
+    <profiles>
+        <profile>
+            <id>sft-on-jdk8-only</id>
+            <activation>
+                <jdk>[9,)</jdk>
+            </activation>
 
+            <properties>
+                <!-- Karaf 4.1.x does not suppert JVM 9+ and will fail, hence we disable SFT by default -->
+                <skip.karaf.featureTest>true</skip.karaf.featureTest>
+            </properties>
+        </profile>
+    </profiles>
 </project>

diff --git a/untested-single-feature-parent/pom.xml b/untested-single-feature-parent/pom.xml
index 2c970f67dfaa4d33189066cff45abc94f2232075..81a8506b83f711e759bce1d34d3aa7aef658a05c 100644 (file)
--- a/untested-single-feature-parent/pom.xml
+++ b/untested-single-feature-parent/pom.xml
@@ -85,6 +85,30 @@
                         <excludedArtifactId>bcpkix-jdk15on</excludedArtifactId>
                     </excludedArtifactIds>
                 </configuration>
+
+                <!-- These are required to make the plugin work with JDK 9. 4.2.x should not need these. -->
+                <dependencies>
+                    <dependency>
+                        <groupId>javax.xml.bind</groupId>
+                        <artifactId>jaxb-api</artifactId>
+                        <version>2.2.11</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>com.sun.xml.bind</groupId>
+                        <artifactId>jaxb-core</artifactId>
+                        <version>2.2.11</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>com.sun.xml.bind</groupId>
+                        <artifactId>jaxb-impl</artifactId>
+                        <version>2.2.11</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>javax.activation</groupId>
+                        <artifactId>activation</artifactId>
+                        <version>1.1.1</version>
+                    </dependency>
+                </dependencies>
             </plugin>
         </plugins>
         <pluginManagement>
@@ -117,21 +141,4 @@
           </plugins>
         </pluginManagement>
     </build>
-
-    <!--
-        Maven Site Configuration
-
-        The following configuration is necessary for maven-site-plugin to
-        correctly identify the correct deployment path for OpenDaylight Maven
-        sites.
-    -->
-    <url>${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/</url>
-
-    <distributionManagement>
-        <site>
-            <id>opendaylight-site</id>
-            <url>${nexus.site.url}/${project.artifactId}/</url>
-        </site>
-    </distributionManagement>
-
 </project>