X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=common%2Fparent%2Fpom.xml;h=bf9661b4c665edbaf0fccb1f0e1223da0a73c557;hb=564120a9eb5d77b947187468f255353fa70ab4df;hp=45a840f5098afc10fbbe4b5352454d6a90a49145;hpb=0ff0c8df3c29b49323f72ed8fdd80fb760746913;p=mdsal.git

diff --git a/common/parent/pom.xml b/common/parent/pom.xml
index 45a840f509..bf9661b4c6 100644
--- 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.7.0-SNAPSHOT</version>
+        <version>1.7.1-SNAPSHOT</version>
         <relativePath></relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>mdsal-parent</artifactId>
     <groupId>org.opendaylight.mdsal</groupId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>
-        <yangtools.version>1.0.0-SNAPSHOT</yangtools.version>
+        <yangtools.version>1.0.1-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.1-SNAPSHOT</version>
+                 <type>pom</type>
+                 <scope>import</scope>
+            </dependency>
             <dependency>
                  <groupId>org.opendaylight.mdsal</groupId>
                  <artifactId>mdsal-artifacts</artifactId>
-                 <version>2.1.0-SNAPSHOT</version>
+                 <version>2.1.1-SNAPSHOT</version>
                  <type>pom</type>
                  <scope>import</scope>
             </dependency>
             <dependency>
                  <groupId>org.opendaylight.yangtools</groupId>
                  <artifactId>yangtools-artifacts</artifactId>
-                 <version>1.0.0-SNAPSHOT</version>
+                 <version>1.0.1-SNAPSHOT</version>
                  <type>pom</type>
                  <scope>import</scope>
             </dependency>
@@ -76,22 +83,6 @@
                 <artifactId>maven-plugin-api</artifactId>
                 <version>3.3.3</version>
             </dependency>
-            <dependency>
-                <groupId>org.eclipse.xtend</groupId>
-                <artifactId>org.eclipse.xtend.lib</artifactId>
-                <version>2.8.4</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.xtend</groupId>
-                <artifactId>org.eclipse.xtend.lib.macro</artifactId>
-                <version>2.8.4</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.xtext</groupId>
-                <artifactId>org.eclipse.xtext.xbase.lib</artifactId>
-                <version>2.8.4</version>
-            </dependency>
-
             <dependency>
                 <groupId>org.glassfish.jersey.ext</groupId>
                 <artifactId>jersey-proxy-client</artifactId>
@@ -230,19 +221,6 @@
                                          <ignore/>
                                      </action>
                                  </pluginExecution>
-                                 <pluginExecution>
-                                    <pluginExecutionFilter>
-                                        <groupId>org.apache.maven.plugins</groupId>
-                                        <artifactId>maven-checkstyle-plugin</artifactId>
-                                        <versionRange>[2.12,)</versionRange>
-                                        <goals>
-                                            <goal>check</goal>
-                                        </goals>
-                                     </pluginExecutionFilter>
-                                     <action>
-                                         <execute/>
-                                     </action>
-                                 </pluginExecution>
                             </pluginExecutions>
                         </lifecycleMappingMetadata>
                     </configuration>
@@ -250,7 +228,7 @@
                 <plugin>
                     <groupId>org.opendaylight.yangtools</groupId>
                     <artifactId>yang-maven-plugin</artifactId>
-                    <version>0.9.0-SNAPSHOT</version>
+                    <version>0.9.1-SNAPSHOT</version>
                     <executions>
                         <execution>
                             <goals>
@@ -284,7 +262,7 @@
                         <dependency>
                             <groupId>org.opendaylight.mdsal</groupId>
                             <artifactId>maven-sal-api-gen-plugin</artifactId>
-                            <version>0.9.0-SNAPSHOT</version>
+                            <version>0.9.1-SNAPSHOT</version>
                             <type>jar</type>
                         </dependency>
                     </dependencies>
@@ -338,27 +316,11 @@
                                 <sources>
                                     <source>target/generated-sources/parser</source>
                                     <source>${salGeneratorPath}</source>
-                                    <source>${basedir}/src/main/xtend-gen</source>
                                 </sources>
                             </configuration>
                         </execution>
                     </executions>
                 </plugin>
-                <plugin>
-                    <groupId>org.eclipse.xtend</groupId>
-                    <artifactId>xtend-maven-plugin</artifactId>
-                    <version>2.8.4</version>
-                    <executions>
-                        <execution>
-                            <goals>
-                                <goal>compile</goal>
-                            </goals>
-                            <configuration>
-                                <outputDirectory>${basedir}/src/main/xtend-gen</outputDirectory>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
                 <plugin>
                     <groupId>org.apache.servicemix.tooling</groupId>
                     <artifactId>depends-maven-plugin</artifactId>
@@ -395,20 +357,6 @@
                 </executions>
                 -->
             </plugin>
-
-            <plugin>
-                <artifactId>maven-clean-plugin</artifactId>
-                <configuration>
-                    <filesets>
-                        <fileset>
-                            <directory>${basedir}/src/main/xtend-gen</directory>
-                            <includes>
-                                <include>**</include>
-                            </includes>
-                        </fileset>
-                    </filesets>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
@@ -427,4 +375,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>