X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=common%2Fparent%2Fpom.xml;h=417400b58732341b236aefc9380b8b07cbeb9b0c;hb=a1cdbb8a1b68358d965d4a2138a87eabde30c520;hp=f40144db867b96f66c270988c1543cf44958d476;hpb=403072390b3a70a3bc6cd0071adc574ee97a3f66;p=mdsal.git

diff --git a/common/parent/pom.xml b/common/parent/pom.xml
index f40144db86..417400b587 100644
--- a/common/parent/pom.xml
+++ b/common/parent/pom.xml
@@ -13,19 +13,19 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>2.0.0</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.3.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>
-        <yangtools.version>0.8.0-SNAPSHOT</yangtools.version>
-        <salGeneratorPath>target/generated-sources/sal</salGeneratorPath>
+        <yangtools.version>1.2.0-SNAPSHOT</yangtools.version>
+        <salGeneratorPath>${project.build.directory}/generated-sources/sal</salGeneratorPath>
 
         <!-- FIXME: these will be upstreamed -->
         <maven.depends.version>1.2</maven.depends.version>
@@ -33,17 +33,24 @@
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                 <groupId>org.opendaylight.odlparent</groupId>
+                 <artifactId>odlparent-artifacts</artifactId>
+                 <version>2.0.0</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.3.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.2.0-SNAPSHOT</version>
                  <type>pom</type>
                  <scope>import</scope>
             </dependency>
@@ -66,32 +73,11 @@
                 <version>2.4.5</version>
                 <scope>test</scope>
             </dependency>
-            <dependency>
-                <groupId>org.apache.maven</groupId>
-                <artifactId>maven-core</artifactId>
-                <version>3.3.3</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.maven</groupId>
                 <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>
@@ -102,11 +88,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>
 
@@ -121,141 +102,10 @@
     <build>
         <pluginManagement>
             <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-jar-plugin</artifactId>
-                    <version>${maven.jar.version}</version>
-                    <configuration>
-                        <archive>
-                            <!--
-                                 Bundle OSGi Manifest created by maven-bundle-plugin
-                                 into a jar file
-                                 -->
-                            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
-                        </archive>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>maven-bundle-plugin</artifactId>
-                    <extensions>true</extensions>
-                    <executions>
-                        <execution>
-                            <id>bundle-manifest</id>
-                            <phase>process-classes</phase>
-                            <goals>
-                                <goal>manifest</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.eclipse.m2e</groupId>
-                    <artifactId>lifecycle-mapping</artifactId>
-                    <version>1.0.0</version>
-                    <configuration>
-                        <lifecycleMappingMetadata>
-                            <pluginExecutions>
-                                <pluginExecution>
-                                    <pluginExecutionFilter>
-                                        <groupId>org.apache.felix</groupId>
-                                        <artifactId>maven-bundle-plugin</artifactId>
-                                        <versionRange>[1.0,)</versionRange>
-                                        <goals>
-                                            <goal>manifest</goal>
-                                        </goals>
-                                    </pluginExecutionFilter>
-                                    <action>
-                                        <execute />
-                                    </action>
-                                </pluginExecution>
-                                <pluginExecution>
-                                    <pluginExecutionFilter>
-                                        <groupId>org.apache.maven.plugins</groupId>
-                                        <artifactId>maven-antrun-plugin</artifactId>
-                                        <versionRange>[1.0,)</versionRange>
-                                        <goals>
-                                            <goal>run</goal>
-                                        </goals>
-                                    </pluginExecutionFilter>
-                                    <action>
-                                        <execute/>
-                                    </action>
-                                </pluginExecution>
-                                <pluginExecution>
-                                    <pluginExecutionFilter>
-                                        <groupId>org.opendaylight.yangtools</groupId>
-                                        <artifactId>yang-maven-plugin</artifactId>
-                                        <versionRange>[0.5,)</versionRange>
-                                        <goals>
-                                            <goal>generate-sources</goal>
-                                        </goals>
-                                     </pluginExecutionFilter>
-                                     <action>
-                                         <execute/>
-                                     </action>
-                                 </pluginExecution>
-                                 <pluginExecution>
-                                    <pluginExecutionFilter>
-                                        <groupId>org.codehaus.mojo</groupId>
-                                        <artifactId>properties-maven-plugin</artifactId>
-                                        <versionRange>1.0-alpha-2</versionRange>
-                                        <goals>
-                                            <goal>write-project-properties</goal>
-                                        </goals>
-                                     </pluginExecutionFilter>
-                                     <action>
-                                         <ignore />
-                                     </action>
-                                 </pluginExecution>
-                                 <pluginExecution>
-                                    <pluginExecutionFilter>
-                                        <groupId>org.ops4j.pax.exam</groupId>
-                                        <artifactId>maven-paxexam-plugin</artifactId>
-                                        <versionRange>1.2.4</versionRange>
-                                        <goals>
-                                            <goal>generate-depends-file</goal>
-                                        </goals>
-                                     </pluginExecutionFilter>
-                                     <action>
-                                         <ignore />
-                                     </action>
-                                 </pluginExecution>
-                                 <pluginExecution>
-                                    <pluginExecutionFilter>
-                                        <groupId>org.jacoco</groupId>
-                                        <artifactId>jacoco-maven-plugin</artifactId>
-                                        <versionRange>[0.6,)</versionRange>
-                                        <goals>
-                                            <goal>prepare-agent</goal>
-                                        </goals>
-                                     </pluginExecutionFilter>
-                                     <action>
-                                         <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>
-                </plugin>
                 <plugin>
                     <groupId>org.opendaylight.yangtools</groupId>
                     <artifactId>yang-maven-plugin</artifactId>
-                    <version>0.8.0-SNAPSHOT</version>
+                    <version>0.11.0-SNAPSHOT</version>
                     <executions>
                         <execution>
                             <goals>
@@ -266,19 +116,20 @@
                                 <codeGenerators>
                                     <generator>
                                         <codeGeneratorClass>
-                                            org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl
+                                            org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl
                                         </codeGeneratorClass>
                                         <outputBaseDir>
                                             ${salGeneratorPath}
                                         </outputBaseDir>
+                                        <resourceBaseDir>${project.build.directory}/generated-sources/spi</resourceBaseDir>
                                     </generator>
                                     <generator>
-                                        <codeGeneratorClass>org.opendaylight.yangtools.yang.unified.doc.generator.maven.DocumentationGeneratorImpl</codeGeneratorClass>
-                                        <outputBaseDir>target/site/models</outputBaseDir>
+                                        <codeGeneratorClass>org.opendaylight.mdsal.binding.yang.unified.doc.generator.maven.DocumentationGeneratorImpl</codeGeneratorClass>
+                                        <outputBaseDir>${project.build.directory}/site/models</outputBaseDir>
                                     </generator>
                                     <generator>
-                                        <codeGeneratorClass>org.opendaylight.yangtools.yang.wadl.generator.maven.WadlGenerator</codeGeneratorClass>
-                                        <outputBaseDir>target/site/models</outputBaseDir>
+                                        <codeGeneratorClass>org.opendaylight.mdsal.binding.yang.wadl.generator.maven.WadlGenerator</codeGeneratorClass>
+                                        <outputBaseDir>${project.build.directory}/site/models</outputBaseDir>
                                     </generator>
                                 </codeGenerators>
                                 <inspectDependencies>true</inspectDependencies>
@@ -289,7 +140,7 @@
                         <dependency>
                             <groupId>org.opendaylight.mdsal</groupId>
                             <artifactId>maven-sal-api-gen-plugin</artifactId>
-                            <version>0.8.0-SNAPSHOT</version>
+                            <version>0.11.0-SNAPSHOT</version>
                             <type>jar</type>
                         </dependency>
                     </dependencies>
@@ -310,7 +161,6 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>${maven.javadoc.version}</version>
                     <configuration>
                         <stylesheetfile>stylesheet.css</stylesheetfile>
                     </configuration>
@@ -341,29 +191,13 @@
                             </goals>
                             <configuration>
                                 <sources>
-                                    <source>target/generated-sources/parser</source>
+                                    <source>${project.build.directory}/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>
@@ -400,20 +234,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>
@@ -432,4 +252,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>