Eliminate unneeded declarations

yangtools.version is not really useful, as are the plugin
declarations, which we are inheriting from elsewhere.

Change-Id: I78ca9db9bb0341237fca05d251a801efab95266b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/concepts/pom.xml b/concepts/pom.xml
index 1c55e91bcd7f1aa23d321bf790e29f034acdf65c..6ba92fd2ca7c040e816dc5922459ec0404126441 100644 (file)
--- a/concepts/pom.xml
+++ b/concepts/pom.xml
@@ -20,9 +20,9 @@
     </scm>
     <parent>
         <groupId>org.opendaylight.bgpcep</groupId>
-        <artifactId>bgpcep-parent</artifactId>
+        <artifactId>binding-parent</artifactId>
         <version>0.9.0-SNAPSHOT</version>
-        <relativePath>../parent</relativePath>
+        <relativePath>../binding-parent</relativePath>
     </parent>
 
     <artifactId>concepts</artifactId>
@@ -78,23 +78,4 @@
             <artifactId>hamcrest-core</artifactId>
         </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

diff --git a/data-change-counter/pom.xml b/data-change-counter/pom.xml
index b278f2ac24e45a00bd706d2fbe675025aeae8d1d..15031481bde7ad7e40bfb617fd8d879417eb771e 100644 (file)
--- a/data-change-counter/pom.xml
+++ b/data-change-counter/pom.xml
@@ -10,9 +10,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.bgpcep</groupId>
-        <artifactId>bgpcep-parent</artifactId>
+        <artifactId>config-parent</artifactId>
         <version>0.9.0-SNAPSHOT</version>
-        <relativePath>../parent</relativePath>
+        <relativePath>../config-parent</relativePath>
     </parent>
     <artifactId>data-change-counter</artifactId>
     <packaging>bundle</packaging>
@@ -113,23 +113,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

diff --git a/dependency-version-management/pom.xml b/dependency-version-management/pom.xml
index d28bb205d07fa31261ecd1f7b888388bd6c2a989..f880624dffa9c586519f1af00bff7f5e2ce9d782 100644 (file)
--- a/dependency-version-management/pom.xml
+++ b/dependency-version-management/pom.xml
@@ -22,8 +22,6 @@
         <controller.mdsal.version>1.7.0-SNAPSHOT</controller.mdsal.version>
         <mdsal.common.version>2.4.0-SNAPSHOT</mdsal.common.version>
         <mdsal.model.version>0.12.0-SNAPSHOT</mdsal.model.version>
-        <yangtools.version>2.0.1</yangtools.version>
-        <odlparent.version>3.0.2</odlparent.version>
         <config.version>0.8.0-SNAPSHOT</config.version>
         <netconf.version>1.7.0-SNAPSHOT</netconf.version>
     </properties>
@@ -49,7 +47,7 @@
             <dependency>
                 <groupId>org.opendaylight.odlparent</groupId>
                 <artifactId>odlparent-artifacts</artifactId>
-                <version>${odlparent.version}</version>
+                <version>3.0.2</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -57,7 +55,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>${yangtools.version}</version>
+                <version>2.0.1</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

diff --git a/parent/pom.xml b/parent/pom.xml
index ffbc66a7f2496967b2dd2db0ba3c0fc4b0ac23a8..46c11d3300f7e59328da8306cd90ce710cadf85a 100644 (file)
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -43,9 +43,6 @@
 
         <maven.info.reports.version>2.7</maven.info.reports.version>
 
-        <!-- YANG tools artifacts -->
-        <yangtools.version>2.0.1</yangtools.version>
-
         <!-- MD-SAL artifacts -->
         <mdsal.version>2.4.0-SNAPSHOT</mdsal.version>
         <mdsal.model.version>0.12.0-SNAPSHOT</mdsal.model.version>
@@ -72,7 +69,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>${yangtools.version}</version>
+                <version>2.0.1</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -221,7 +218,8 @@
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>checkstyle-logging</artifactId>
-                        <version>${yangtools.version}</version>
+                        <!-- FIXME: remove this declaration when bumping to 2.0.2 -->
+                        <version>2.0.1</version>
                     </dependency>
                 </dependencies>
                 <executions>
@@ -258,19 +256,6 @@
                                         <ignore/>
                                     </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.jacoco</groupId>
@@ -301,71 +286,6 @@
                         </lifecycleMappingMetadata>
                     </configuration>
                 </plugin>
-
-                <!-- Our YANG->DTO generation plugin -->
-                <plugin>
-                    <groupId>org.opendaylight.yangtools</groupId>
-                    <artifactId>yang-maven-plugin</artifactId>
-                    <version>${yangtools.version}</version>
-                    <executions>
-                        <execution>
-                            <goals>
-                                <goal>generate-sources</goal>
-                            </goals>
-                            <configuration>
-                                <yangFilesRootDir>src/main/yang</yangFilesRootDir>
-                                <codeGenerators>
-                                    <generator>
-                                        <codeGeneratorClass>
-                                            org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl
-                                        </codeGeneratorClass>
-                                        <outputBaseDir>
-                                            target/generated-sources/sal
-                                        </outputBaseDir>
-                                    </generator>
-                                    <generator>
-                                        <codeGeneratorClass>
-                                            org.opendaylight.mdsal.binding.yang.unified.doc.generator.maven.DocumentationGeneratorImpl
-                                        </codeGeneratorClass>
-                                        <outputBaseDir>target/site</outputBaseDir>
-                                    </generator>
-                                    <generator>
-                                        <codeGeneratorClass>
-                                            org.opendaylight.mdsal.binding.yang.wadl.generator.maven.WadlGenerator
-                                        </codeGeneratorClass>
-                                        <outputBaseDir>target/site</outputBaseDir>
-                                    </generator>
-                                    <generator>
-                                        <codeGeneratorClass>
-                                            org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-                                        </codeGeneratorClass>
-                                        <outputBaseDir>${project.build.directory}/generated-sources/config
-                                        </outputBaseDir>
-                                        <additionalConfiguration>
-                                            <namespaceToPackage1>
-                                                urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang
-                                            </namespaceToPackage1>
-                                        </additionalConfiguration>
-                                    </generator>
-                                </codeGenerators>
-                                <inspectDependencies>true</inspectDependencies>
-                            </configuration>
-                        </execution>
-                    </executions>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.opendaylight.mdsal</groupId>
-                            <artifactId>maven-sal-api-gen-plugin</artifactId>
-                            <version>${mdsal.model.version}</version>
-                            <type>jar</type>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.opendaylight.controller</groupId>
-                            <artifactId>yang-jmx-generator-plugin</artifactId>
-                            <version>${controller.config.version}</version>
-                        </dependency>
-                    </dependencies>
-                </plugin>
             </plugins>
         </pluginManagement>
     </build>