Bump versions by x.y.(z+1)

[yangtools.git] / common / pom.xml

diff --git a/common/pom.xml b/common/pom.xml
index cfaf16e46c117908001352ead8f76481a0334404..0229a3b4369a14aacbd19adf96c9300945616857 100644 (file)
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -10,44 +10,43 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>yangtools</artifactId>
-        <version>0.6.2-SNAPSHOT</version>
+      <groupId>org.opendaylight.odlparent</groupId>
+      <artifactId>odlparent-lite</artifactId>
+      <version>1.8.5-SNAPSHOT</version>
+      <relativePath/>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>common-parent</artifactId>
+    <groupId>org.opendaylight.yangtools</groupId>
+    <artifactId>common-aggregator</artifactId>
+    <version>1.1.5-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>
+        <module>artifacts</module>
         <module>checkstyle-logging</module>
         <module>concepts</module>
-        <module>feature</module>
         <module>mockito-configuration</module>
         <module>object-cache-api</module>
         <module>object-cache-guava</module>
         <module>object-cache-noop</module>
         <module>util</module>
+        <module>testutils</module>
     </modules>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>object-cache-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>object-cache-guava</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>object-cache-noop</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
+  <!--
+      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>