Bump versions by x.y.(z+1)

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

diff --git a/binding/binding-parent/pom.xml b/binding/binding-parent/pom.xml
index 7b747aa1a3376eb684dc39de7e8c59a83d7322db..9aebd1d8fbeaf4f4873dd53f78d3c28d841cbb16 100644 (file)
--- a/binding/binding-parent/pom.xml
+++ b/binding/binding-parent/pom.xml
@@ -12,23 +12,38 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.8.2-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>0.9.0-SNAPSHOT</version>
+    <version>0.10.2-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>
-        <yangtools.version>1.0.0-SNAPSHOT</yangtools.version>
-        <mdsal.version>2.1.0-SNAPSHOT</mdsal.version>
-        <mdsalmodel.version>0.9.0-SNAPSHOT</mdsalmodel.version>
-        <salGeneratorPath>target/generated-sources/mdsal-binding</salGeneratorPath>
+        <yangtools.version>1.1.2-SNAPSHOT</yangtools.version>
+        <mdsal.version>2.2.2-SNAPSHOT</mdsal.version>
+        <mdsalmodel.version>0.10.2-SNAPSHOT</mdsalmodel.version>
+        <salGeneratorPath>${project.build.directory}/generated-sources/mdsal-binding</salGeneratorPath>
     </properties>
 
+    <build>
+        <!-- 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>
         <dependencies>
             <dependency>
@@ -79,7 +94,7 @@
                                 <dependency>
                                     <groupId>org.opendaylight.mdsal</groupId>
                                     <artifactId>maven-sal-api-gen-plugin</artifactId>
-                                    <version>0.9.0-SNAPSHOT</version>
+                                    <version>0.10.2-SNAPSHOT</version>
                                     <type>jar</type>
                                 </dependency>
                             </dependencies>
@@ -92,8 +107,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>
@@ -126,13 +142,33 @@
                                     </goals>
                                     <configuration>
                                         <sources>
-                                            <source>src/main/yang</source>
                                             <source>${salGeneratorPath}</source>
                                         </sources>
                                     </configuration>
                                 </execution>
                             </executions>
                         </plugin>
+
+                        <!-- This has to match the definition in odlparent and exists only
+                             because for some reason PMD does not understand wildcards. -->
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-pmd-plugin</artifactId>
+                            <executions>
+                                <execution>
+                                    <id>cpd</id>
+                                    <phase>process-sources</phase>
+                                    <goals>
+                                        <goal>cpd-check</goal>
+                                    </goals>
+                                    <configuration>
+                                        <excludeRoots>
+                                            <excludeRoot>${salGeneratorPath}</excludeRoot>
+                                        </excludeRoots>
+                                    </configuration>
+                                </execution>
+                            </executions>
+                        </plugin>
                     </plugins>
                 </pluginManagement>
                 <plugins>