From: Michael Vorburger <vorburger@redhat.com>
Date: Mon, 12 Jun 2017 12:45:43 +0000 (+0200)
Subject: yang-test POM simplification
X-Git-Tag: release/nitrogen~119
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=9dd99568ffecade36887a5d4266e4acfe8c70ff4

yang-test POM simplification

Motivated by review https://git.opendaylight.org/gerrit/#/c/58714/, and
realizing that the odl-license version in this POM will cause issues
everytime we'll upgrade odplarent (which may be more frequent, soon).

This is effectively a counter proposal to c/58714, as on looking at this
it seems instead of bumping that version, we can remove most of what's
causing this (without loosing anything; CS still runs, not that we
care), becaues most of this is is inherited in Maven, the point of that
configuration is just to skip the VS validation which this project for
some reason exceptionally gen. into src/main instead of into target/.

The ${lifecycle.mapping.version} is replaced by fixed 1.0.0

Change-Id: Ic78c35a940dc7ee5fe25f3527529591e5c5214f7
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
---

diff --git a/opendaylight/config/yang-test/pom.xml b/opendaylight/config/yang-test/pom.xml
index ba74fa1d8a..2cb247dc20 100644
--- a/opendaylight/config/yang-test/pom.xml
+++ b/opendaylight/config/yang-test/pom.xml
@@ -27,10 +27,6 @@
       <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-inet-types-2013-07-15</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>config-manager</artifactId>
@@ -42,11 +38,6 @@
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>config-util</artifactId>
@@ -60,7 +51,7 @@
         <plugin>
           <groupId>org.eclipse.m2e</groupId>
           <artifactId>lifecycle-mapping</artifactId>
-          <version>${lifecycle.mapping.version}</version>
+          <version>1.0.0</version>
           <configuration>
             <lifecycleMappingMetadata>
               <pluginExecutions>
@@ -88,19 +79,6 @@
     <plugins>
       <plugin>
         <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>${checkstyle.version}</version>
-        <dependencies>
-          <dependency>
-            <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>checkstyle</artifactId>
-            <version>${odl.checkstyle.version}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>odl-license</artifactId>
-            <version>0.3.0-SNAPSHOT</version>
-          </dependency>
-        </dependencies>
         <executions>
           <execution>
             <id>check-license</id>
@@ -109,18 +87,10 @@
             </goals>
             <phase>process-sources</phase>
             <configuration>
-              <configLocation>check-license.xml</configLocation>
-              <includeResources>false</includeResources>
-              <includeTestResources>false</includeTestResources>
-              <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
               <excludes>
                 org/opendaylight/yang/gen/**,
-                **/protobuff/messages/**,
-                **/thrift/gen/*.java,
                 **/config/yang/test/**
               </excludes>
-              <failsOnError>false</failsOnError>
-              <consoleOutput>true</consoleOutput>
             </configuration>
           </execution>
         </executions>
@@ -133,7 +103,6 @@
           <execution>
             <goals>
               <goal>delete-sources</goal>
-
               <goal>process-sources</goal>
             </goals>
           </execution>