Do not use compile dependency for embedded code

[mdsal.git] / common / parent / pom.xml

diff --git a/common/parent/pom.xml b/common/parent/pom.xml
index f40144db867b96f66c270988c1543cf44958d476..781f7cc0f1bc604fa55a36b03f220ae172b9ae4e 100644 (file)
--- a/common/parent/pom.xml
+++ b/common/parent/pom.xml
@@ -13,18 +13,18 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.7.0-SNAPSHOT</version>
         <relativePath></relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>mdsal-parent</artifactId>
     <groupId>org.opendaylight.mdsal</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>
-        <yangtools.version>0.8.0-SNAPSHOT</yangtools.version>
+        <yangtools.version>1.0.0-SNAPSHOT</yangtools.version>
         <salGeneratorPath>target/generated-sources/sal</salGeneratorPath>
 
         <!-- FIXME: these will be upstreamed -->
@@ -33,17 +33,24 @@
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                 <groupId>org.opendaylight.odlparent</groupId>
+                 <artifactId>odlparent-artifacts</artifactId>
+                 <version>1.7.0-SNAPSHOT</version>
+                 <type>pom</type>
+                 <scope>import</scope>
+            </dependency>
             <dependency>
                  <groupId>org.opendaylight.mdsal</groupId>
                  <artifactId>mdsal-artifacts</artifactId>
-                 <version>2.0.0-SNAPSHOT</version>
+                 <version>2.1.0-SNAPSHOT</version>
                  <type>pom</type>
                  <scope>import</scope>
             </dependency>
             <dependency>
                  <groupId>org.opendaylight.yangtools</groupId>
                  <artifactId>yangtools-artifacts</artifactId>
-                 <version>0.8.0-SNAPSHOT</version>
+                 <version>1.0.0-SNAPSHOT</version>
                  <type>pom</type>
                  <scope>import</scope>
             </dependency>
@@ -102,11 +109,6 @@
                 <artifactId>jersey-client</artifactId>
                 <version>2.0</version>
             </dependency>
-            <dependency>
-              <groupId>com.lmax</groupId>
-              <artifactId>disruptor</artifactId>
-              <version>3.3.2</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -255,7 +257,7 @@
                 <plugin>
                     <groupId>org.opendaylight.yangtools</groupId>
                     <artifactId>yang-maven-plugin</artifactId>
-                    <version>0.8.0-SNAPSHOT</version>
+                    <version>0.9.0-SNAPSHOT</version>
                     <executions>
                         <execution>
                             <goals>
@@ -289,7 +291,7 @@
                         <dependency>
                             <groupId>org.opendaylight.mdsal</groupId>
                             <artifactId>maven-sal-api-gen-plugin</artifactId>
-                            <version>0.8.0-SNAPSHOT</version>
+                            <version>0.9.0-SNAPSHOT</version>
                             <type>jar</type>
                         </dependency>
                     </dependencies>
@@ -363,6 +365,13 @@
                             </configuration>
                         </execution>
                     </executions>
+                    <dependencies>
+                        <dependency>
+                            <groupId>com.google.guava</groupId>
+                            <artifactId>guava</artifactId>
+                            <version>14.0.1</version>
+                        </dependency>
+                    </dependencies>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.servicemix.tooling</groupId>
@@ -432,4 +441,21 @@
             </plugin>
         </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>