X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=common%2Fparent%2Fpom.xml;h=3b7899721468ec5f8d0bc61d3a0ea62eb0c9b5fe;hb=2575b1934616725ce5033d34f5821974a47565af;hp=e4430ec45bbc93eda6f15a465ffaffda91e4a64c;hpb=65d7b01d373eb6736e55ff96846fff76af5a1adf;p=mdsal.git

diff --git a/common/parent/pom.xml b/common/parent/pom.xml
index e4430ec45b..3b78997214 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.7.0-SNAPSHOT</version>
+        <version>1.8.3-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.2.3-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>
-        <yangtools.version>1.0.0-SNAPSHOT</yangtools.version>
-        <salGeneratorPath>target/generated-sources/sal</salGeneratorPath>
+        <yangtools.version>1.1.3-SNAPSHOT</yangtools.version>
+        <salGeneratorPath>${project.build.directory}/generated-sources/sal</salGeneratorPath>
 
         <!-- FIXME: these will be upstreamed -->
         <maven.depends.version>1.2</maven.depends.version>
@@ -36,21 +36,21 @@
             <dependency>
                  <groupId>org.opendaylight.odlparent</groupId>
                  <artifactId>odlparent-artifacts</artifactId>
-                 <version>1.7.0-SNAPSHOT</version>
+                 <version>1.8.3-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.2.3-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.1.3-SNAPSHOT</version>
                  <type>pom</type>
                  <scope>import</scope>
             </dependency>
@@ -73,11 +73,6 @@
                 <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>
@@ -107,128 +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>
-                            </pluginExecutions>
-                        </lifecycleMappingMetadata>
-                    </configuration>
-                </plugin>
                 <plugin>
                     <groupId>org.opendaylight.yangtools</groupId>
                     <artifactId>yang-maven-plugin</artifactId>
-                    <version>0.9.0-SNAPSHOT</version>
+                    <version>0.10.3-SNAPSHOT</version>
                     <executions>
                         <execution>
                             <goals>
@@ -239,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>
@@ -262,7 +140,7 @@
                         <dependency>
                             <groupId>org.opendaylight.mdsal</groupId>
                             <artifactId>maven-sal-api-gen-plugin</artifactId>
-                            <version>0.9.0-SNAPSHOT</version>
+                            <version>0.10.3-SNAPSHOT</version>
                             <type>jar</type>
                         </dependency>
                     </dependencies>
@@ -283,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>
@@ -314,7 +191,7 @@
                             </goals>
                             <configuration>
                                 <sources>
-                                    <source>target/generated-sources/parser</source>
+                                    <source>${project.build.directory}/generated-sources/parser</source>
                                     <source>${salGeneratorPath}</source>
                                 </sources>
                             </configuration>