Bump versions to 13.0.10-SNAPSHOT

[odlparent.git] / karaf-util / pom.xml

diff --git a/karaf-util/pom.xml b/karaf-util/pom.xml
index 82bf29a33286a10342ede0e750df1c259f108045..db0b92e46b1d0d8d26b62bbf18e71e670f40e123 100644 (file)
--- a/karaf-util/pom.xml
+++ b/karaf-util/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>13.0.10-SNAPSHOT</version>
         <relativePath>../bundle-parent</relativePath>
     </parent>
 
@@ -38,8 +38,15 @@
         <dependency>
             <groupId>org.apache.maven.wagon</groupId>
             <artifactId>wagon-http</artifactId>
-            <version>2.10</version>
+            <version>3.2.0</version>
             <scope>compile</scope>
+            <exclusions>
+              <exclusion>
+                <!-- because it conflicts with org.slf4j:jcl-over-slf4j -->
+                <groupId>commons-logging</groupId>
+                <artifactId>commons-logging</artifactId>
+              </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.url</groupId>
@@ -48,7 +55,7 @@
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <artifactId>org.osgi.service.url</artifactId>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -62,9 +69,6 @@
         <plugins>
             <plugin>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <configuration>
-                    <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
-                </configuration>
                 <executions>
                     <execution>
                         <id>check-license</id>
@@ -80,19 +84,4 @@
         </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>