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 a73f0836c6080aab664cc8f14f0f3a4112a1f981..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>2.0.0-SNAPSHOT</version>
+        <version>6.0.1-SNAPSHOT</version>
         <relativePath>../odlparent</relativePath>
     </parent>
 
@@ -46,15 +46,17 @@
             <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>
                     <simplifyBundleDependencies>true</simplifyBundleDependencies>
                     <checkDependencyChange>${checkDependencyChange}</checkDependencyChange>
                     <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>
@@ -65,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>
@@ -77,26 +77,48 @@
                         <excludedArtifactId>org.osgi.compendium</excludedArtifactId>
                         <excludedArtifactId>org.osgi.core</excludedArtifactId>
                         <excludedArtifactId>org.osgi.enterprise</excludedArtifactId>
+                        <!-- Bouncy Castle -->
+                        <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>
         </plugins>
+        <pluginManagement>
+          <plugins>
+            <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+            <plugin>
+              <groupId>org.eclipse.m2e</groupId>
+              <artifactId>lifecycle-mapping</artifactId>
+              <version>1.0.0</version>
+              <configuration>
+                <lifecycleMappingMetadata>
+                  <pluginExecutions>
+                    <pluginExecution>
+                      <pluginExecutionFilter>
+                        <groupId>org.apache.karaf.tooling</groupId>
+                        <artifactId>karaf-maven-plugin</artifactId>
+                        <versionRange>[4.1.5,)</versionRange>
+                        <goals>
+                          <goal>verify</goal>
+                        </goals>
+                      </pluginExecutionFilter>
+                      <action>
+                        <ignore></ignore>
+                      </action>
+                    </pluginExecution>
+                  </pluginExecutions>
+                </lifecycleMappingMetadata>
+              </configuration>
+            </plugin>
+          </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>