X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=untested-single-feature-parent%2Fpom.xml;h=33a11a9739b585ab2b8e33a555e1e2f6d78d465d;hb=0abfd2fbd4e4151e7dc2f9f561a2524fca4ad2a4;hp=be950d2b806c2d4dc5339112ad50f588178d3361;hpb=ce4d6808ade7ba4257c23ae885539512a0cdc653;p=odlparent.git

diff --git a/untested-single-feature-parent/pom.xml b/untested-single-feature-parent/pom.xml
index be950d2b8..33a11a973 100644
--- a/untested-single-feature-parent/pom.xml
+++ b/untested-single-feature-parent/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>3.0.2-SNAPSHOT</version>
+        <version>8.0.2-SNAPSHOT</version>
         <relativePath>../odlparent</relativePath>
     </parent>
 
@@ -46,7 +46,7 @@
             <plugin>
                 <groupId>org.apache.karaf.tooling</groupId>
                 <artifactId>karaf-maven-plugin</artifactId>
-                <version>${karaf.plugin.version}</version>
+                <version>${karaf.version}</version>
                 <extensions>true</extensions>
                 <configuration combine.children="append">
                     <enableGeneration>true</enableGeneration>
@@ -55,7 +55,8 @@
                     <logDependencyChanges>true</logDependencyChanges>
                     <failOnDependencyChange>${failOnDependencyChange}</failOnDependencyChange>
                     <excludedArtifactIds>
-                        <!-- These artifacts are provided by our Karaf distribution -->
+                        <!-- These artifacts are provided by our Karaf distribution. -->
+                        <!-- Keep in synch with karaf parent minimal bootFeatures. -->
                         <!-- Aries Blueprint -->
                         <excludedArtifactId>org.apache.aries.blueprint.api</excludedArtifactId>
                         <excludedArtifactId>org.apache.aries.blueprint.core</excludedArtifactId>
@@ -66,8 +67,6 @@
                         <!-- SLF4J -->
                         <excludedArtifactId>slf4j-api</excludedArtifactId>
                         <excludedArtifactId>jcl-over-slf4j</excludedArtifactId>
-                        <!-- sshd -->
-                        <excludedArtifactId>sshd-core</excludedArtifactId>
                         <!-- Karaf artifacts -->
                         <!-- TODO Rework this once Karaf supports wildcards here -->
                         <excludedArtifactId>org.apache.karaf.jaas.config</excludedArtifactId>
@@ -82,6 +81,21 @@
                         <excludedArtifactId>bcprov-jdk15on</excludedArtifactId>
                         <excludedArtifactId>bcprov-ext-jdk15on</excludedArtifactId>
                         <excludedArtifactId>bcpkix-jdk15on</excludedArtifactId>
+                        <!-- JAXB -->
+                        <excludedArtifactId>jaxb-api</excludedArtifactId>
+                        <excludedArtifactId>jaxb-runtime</excludedArtifactId>
+                        <excludedArtifactId>jakarta.xml.bind-api</excludedArtifactId>
+                        <!-- javax.annotation -->
+                        <excludedArtifactId>activation</excludedArtifactId>
+                        <excludedArtifactId>jakarta.activation-api</excludedArtifactId>
+
+                        <!-- Guava's annotations -->
+                        <excludedArtifactId>error_prone_annotations</excludedArtifactId>
+                        <excludedArtifactId>j2objc-annotations</excludedArtifactId>
+                        <excludedArtifactId>listenablefuture</excludedArtifactId>
+
+                        <!-- Our slf4j logging markers -->
+                        <excludedArtifactId>logging-markers</excludedArtifactId>
                     </excludedArtifactIds>
                 </configuration>
             </plugin>
@@ -100,7 +114,7 @@
                       <pluginExecutionFilter>
                         <groupId>org.apache.karaf.tooling</groupId>
                         <artifactId>karaf-maven-plugin</artifactId>
-                        <versionRange>[4.1.3,)</versionRange>
+                        <versionRange>[4.1.5,)</versionRange>
                         <goals>
                           <goal>verify</goal>
                         </goals>
@@ -117,20 +131,4 @@
         </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>