Cleanup properties

Properties should not be used for versions, clean them up in parent
poms. Everything the users need is communicated via
dependency/pluginManagement.

Also ditches down-revisioned maven-depends-plugin, as that is already
provided by odlparent and removes unneeded site plugin configuration.

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

diff --git a/binding/binding-parent/pom.xml b/binding/binding-parent/pom.xml
index bb0374db5da15f83c48c78b7ea60c5e9a7fc2a06..c217dfde02924e7e9cc0d0824e737d1cb9198d7c 100644 (file)
--- a/binding/binding-parent/pom.xml
+++ b/binding/binding-parent/pom.xml
@@ -23,9 +23,6 @@
     <packaging>pom</packaging>
 
     <properties>
-        <yangtools.version>2.0.1</yangtools.version>
-        <mdsal.version>2.4.0-SNAPSHOT</mdsal.version>
-        <mdsalmodel.version>0.12.0-SNAPSHOT</mdsalmodel.version>
         <salGeneratorPath>${project.build.directory}/generated-sources/mdsal-binding</salGeneratorPath>
     </properties>
 
@@ -49,23 +46,23 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>${yangtools.version}</version>
+                <version>2.0.1</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.0-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.0-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -89,7 +86,7 @@
                         <plugin>
                             <groupId>org.opendaylight.yangtools</groupId>
                             <artifactId>yang-maven-plugin</artifactId>
-                            <version>${yangtools.version}</version>
+                            <version>2.0.1</version>
                             <dependencies>
                                 <dependency>
                                     <groupId>org.opendaylight.mdsal</groupId>
@@ -184,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>

diff --git a/binding2/mdsal-model-binding2-parent/pom.xml b/binding2/mdsal-model-binding2-parent/pom.xml
index 66eeb4cac333af6eb401af0bc3780116c8353d1b..83ec27638cf2c4b68ff111df798eb0a30f307f65 100644 (file)
--- a/binding2/mdsal-model-binding2-parent/pom.xml
+++ b/binding2/mdsal-model-binding2-parent/pom.xml
@@ -23,9 +23,6 @@
     <packaging>pom</packaging>
 
     <properties>
-        <yangtools.version>2.0.1</yangtools.version>
-        <mdsal.version>2.4.0-SNAPSHOT</mdsal.version>
-        <mdsalmodel.version>0.12.0-SNAPSHOT</mdsalmodel.version>
         <salGeneratorPath>${project.build.directory}/generated-sources/mdsal-binding2</salGeneratorPath>
     </properties>
 
@@ -49,21 +46,21 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>${yangtools.version}</version>
+                <version>2.0.1</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.0-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>
+              <version>0.12.0-SNAPSHOT</version>
               <type>pom</type>
               <scope>import</scope>
             </dependency>
@@ -90,7 +87,7 @@
                         <plugin>
                             <groupId>org.opendaylight.yangtools</groupId>
                             <artifactId>yang-maven-plugin</artifactId>
-                            <version>${yangtools.version}</version>
+                            <version>2.0.1</version>
                             <dependencies>
                                 <dependency>
                                     <groupId>org.opendaylight.mdsal</groupId>
@@ -163,21 +160,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>

diff --git a/common/parent/pom.xml b/common/parent/pom.xml
index 123bd8522fbf850c84e5c32c27bf094f1a05baa0..6d1d3f330484c61a28a4fe6a7affd67a6f7cdf27 100644 (file)
--- a/common/parent/pom.xml
+++ b/common/parent/pom.xml
@@ -24,11 +24,7 @@
     <packaging>pom</packaging>
 
     <properties>
-        <yangtools.version>2.0.1</yangtools.version>
         <salGeneratorPath>${project.build.directory}/generated-sources/sal</salGeneratorPath>
-
-        <!-- FIXME: these will be upstreamed -->
-        <maven.depends.version>1.2</maven.depends.version>
     </properties>
 
     <dependencyManagement>
@@ -201,7 +197,6 @@
                 <plugin>
                     <groupId>org.apache.servicemix.tooling</groupId>
                     <artifactId>depends-maven-plugin</artifactId>
-                    <version>${maven.depends.version}</version>
                     <executions>
                         <execution>
                             <id>generate-depends-file</id>
@@ -252,21 +247,4 @@
             </plugin>
         </plugins>
     </build>
-
-  <!--
-      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>