Bump yangtools to 2.0.5

[mdsal.git] / binding / binding-parent / pom.xml

diff --git a/binding/binding-parent/pom.xml b/binding/binding-parent/pom.xml
index b5b1585e70cfd498fe5393ca0bd8a7a506ace861..6da69430ce0c29e9b062e32fbbd4d69cc6f0e8a7 100644 (file)
--- a/binding/binding-parent/pom.xml
+++ b/binding/binding-parent/pom.xml
@@ -12,33 +12,33 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>3.1.0</version>
         <relativePath/>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>0.10.0-SNAPSHOT</version>
+    <version>0.12.2-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>
-        <yangtools.version>1.1.0-SNAPSHOT</yangtools.version>
-        <mdsal.version>2.2.0-SNAPSHOT</mdsal.version>
-        <mdsalmodel.version>0.10.0-SNAPSHOT</mdsalmodel.version>
-        <salGeneratorPath>target/generated-sources/mdsal-binding</salGeneratorPath>
+        <salGeneratorPath>${project.build.directory}/generated-sources/mdsal-binding</salGeneratorPath>
     </properties>
 
     <build>
-      <!-- https://bugs.opendaylight.org/show_bug.cgi?id=6252 -->
-      <resources>
-        <resource>
-          <directory>target/generated-sources/spi/</directory>
-        </resource>
-        <resource>
-          <directory>target/generated-sources/yang</directory>
-        </resource>
-      </resources>
+        <!-- https://bugs.opendaylight.org/show_bug.cgi?id=6252 -->
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+            </resource>
+            <resource>
+                <directory>${project.build.directory}/generated-sources/spi</directory>
+            </resource>
+            <resource>
+                <directory>${project.build.directory}/generated-sources/yang</directory>
+            </resource>
+        </resources>
     </build>
 
     <dependencyManagement>
@@ -46,23 +46,23 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>${yangtools.version}</version>
+                <version>2.0.5</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>${mdsal.version}</version>
+                <version>2.4.2-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
-              <groupId>org.opendaylight.mdsal.model</groupId>
-              <artifactId>mdsal-model-artifacts</artifactId>
-              <version>${mdsalmodel.version}</version>
-              <type>pom</type>
-              <scope>import</scope>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>mdsal-model-artifacts</artifactId>
+                <version>0.12.2-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -86,12 +86,12 @@
                         <plugin>
                             <groupId>org.opendaylight.yangtools</groupId>
                             <artifactId>yang-maven-plugin</artifactId>
-                            <version>${yangtools.version}</version>
+                            <version>2.0.5</version>
                             <dependencies>
                                 <dependency>
                                     <groupId>org.opendaylight.mdsal</groupId>
                                     <artifactId>maven-sal-api-gen-plugin</artifactId>
-                                    <version>0.10.0-SNAPSHOT</version>
+                                    <version>0.12.2-SNAPSHOT</version>
                                     <type>jar</type>
                                 </dependency>
                             </dependencies>
@@ -104,8 +104,9 @@
                                     <configuration>
                                         <codeGenerators>
                                             <generator>
-                                                <codeGeneratorClass>org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass>
+                                                <codeGeneratorClass>org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass>
                                                 <outputBaseDir>${salGeneratorPath}</outputBaseDir>
+                                                <resourceBaseDir>${project.build.directory}/generated-sources/spi</resourceBaseDir>
                                             </generator>
                                         </codeGenerators>
                                         <inspectDependencies>true</inspectDependencies>
@@ -180,21 +181,4 @@
             </build>
         </profile>
     </profiles>
-
-  <!--
-      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>