Bump version to 6.0.1-SNAPSHOT

[odlparent.git] / untested-single-feature-parent / pom.xml

diff --git a/untested-single-feature-parent/pom.xml b/untested-single-feature-parent/pom.xml
index 0790220ec0dcf23e5c181950a63d93edcf9e4083..9b9368e17208fa063255079831596d449bedd6d9 100644 (file)
--- 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>4.0.0-SNAPSHOT</version>
+        <version>6.0.1-SNAPSHOT</version>
         <relativePath>../odlparent</relativePath>
     </parent>
 
@@ -67,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>
@@ -83,6 +81,11 @@
                         <excludedArtifactId>bcprov-jdk15on</excludedArtifactId>
                         <excludedArtifactId>bcprov-ext-jdk15on</excludedArtifactId>
                         <excludedArtifactId>bcpkix-jdk15on</excludedArtifactId>
+                        <!-- JAXB -->
+                        <excludedArtifactId>jaxb-api</excludedArtifactId>
+                        <excludedArtifactId>jaxb-runtime</excludedArtifactId>
+                        <!-- javax.annotation -->
+                        <excludedArtifactId>activation</excludedArtifactId>
                     </excludedArtifactIds>
                 </configuration>
             </plugin>
@@ -118,20 +121,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>