POM changes for Oxygen support

1. bumped up the TSDR version from 1.4.0 to 1.5.0
2. added a parent folder to serve as the
binding parent of all the projects

Change-Id: Ie8660809eeec9a8802878c1be06d4e752d269a9f
Signed-off-by: YuLing Chen <yulingchen54@gmail.com>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 54dc5180d2dfa6099fcf5310d7639e57bca6abd2..7ad4a8ba73810f5c3d3ee59b03c684a234e8fec2 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -13,13 +13,13 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>1.9.0</version>
+      <version>2.0.5</version>
       <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.tsdr</groupId>
     <artifactId>tsdr-artifacts</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <name>ODL :: tsdr :: ${project.artifactId}</name>
     <packaging>pom</packaging>
 
@@ -27,79 +27,81 @@
         <dependencies>
         <!-- TSDR modules -->
         <dependency>
-           <groupId>${project.groupId}</groupId>
-           <artifactId>tsdr-datastorage</artifactId>
-           <version>${project.version}</version>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>tsdr-datastorage</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
-           <groupId>${project.groupId}</groupId>
-           <artifactId>tsdr-datapurge</artifactId>
-           <version>${project.version}</version>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>tsdr-datapurge</artifactId>
+            <version>${project.version}</version>
         </dependency>
             <dependency>
-           <groupId>${project.groupId}</groupId>
-           <artifactId>tsdr-persistence-spi</artifactId>
-           <version>${project.version}</version>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>tsdr-persistence-spi</artifactId>
+            <version>${project.version}</version>
         </dependency>
             <dependency>
-           <groupId>${project.groupId}</groupId>
-           <artifactId>tsdr-dataquery</artifactId>
-           <version>${project.version}</version>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>tsdr-dataquery</artifactId>
+            <version>${project.version}</version>
         </dependency>
             <dependency>
-           <groupId>${project.groupId}</groupId>
-           <artifactId>tsdr-collector-spi</artifactId>
-           <version>${project.version}</version>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>tsdr-collector-spi</artifactId>
+            <version>${project.version}</version>
         </dependency>
             <dependency>
-           <groupId>${project.groupId}</groupId>
-           <artifactId>tsdr-persistence-hsqldb</artifactId>
-           <version>${project.version}</version>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>tsdr-persistence-hsqldb</artifactId>
+            <version>${project.version}</version>
         </dependency>
             <dependency>
-           <groupId>${project.groupId}</groupId>
-           <artifactId>tsdr-persistence-cassandra</artifactId>
-           <version>${project.version}</version>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>tsdr-persistence-cassandra</artifactId>
+            <version>${project.version}</version>
         </dependency>
             <dependency>
-           <groupId>${project.groupId}</groupId>
-           <artifactId>tsdr-persistence-hbase</artifactId>
-           <version>${project.version}</version>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>tsdr-persistence-hbase</artifactId>
+            <version>${project.version}</version>
         </dependency>
             <dependency>
-           <groupId>${project.groupId}</groupId>
-           <artifactId>tsdr-persistence-elasticsearch</artifactId>
-           <version>${project.version}</version>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>tsdr-persistence-elasticsearch</artifactId>
+            <version>${project.version}</version>
         </dependency>
             <dependency>
-           <groupId>${project.groupId}</groupId>
-           <artifactId>tsdr-persistence-elasticsearch</artifactId>
-           <version>${project.version}</version>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>tsdr-persistence-elasticsearch</artifactId>
+            <version>${project.version}</version>
         </dependency>
             <dependency>
-           <groupId>${project.groupId}</groupId>
-           <artifactId>tsdr-controller-metrics-collector</artifactId>
-           <version>${project.version}</version>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>tsdr-controller-metrics-collector</artifactId>
+            <version>${project.version}</version>
         </dependency>
             <dependency>
-           <groupId>${project.groupId}</groupId>
-           <artifactId>tsdr-netflow-statisctics-collector</artifactId>
-           <version>${project.version}</version>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>tsdr-netflow-statisctics-collector</artifactId>
+            <version>${project.version}</version>
         </dependency>
             <dependency>
            <groupId>${project.groupId}</groupId>
            <artifactId>tsdr-openflow-statisctics-collector</artifactId>
            <version>${project.version}</version>
         </dependency>
+<!--
             <dependency>
            <groupId>${project.groupId}</groupId>
            <artifactId>tsdr-syslog-collector</artifactId>
            <version>${project.version}</version>
         </dependency>
+-->
             <dependency>
-           <groupId>${project.groupId}</groupId>
-           <artifactId>tsdr-restconf-collector</artifactId>
-           <version>${project.version}</version>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>tsdr-restconf-collector</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <!-- TSDR Configuration -->
         <!-- TSDR Core -->
@@ -154,6 +156,7 @@
           <version>${project.version}</version>
           <type>cfg</type>
         </dependency>
+<!--
         <dependency>
           <groupId>org.opendaylight.tsdr</groupId>
           <artifactId>tsdr-syslog-collector</artifactId>
@@ -161,6 +164,7 @@
           <type>xml</type>
           <classifier>config</classifier>
         </dependency>
+-->
         <dependency>
           <groupId>org.opendaylight.tsdr</groupId>
           <artifactId>tsdr-netflow-statistics-collector</artifactId>
@@ -182,6 +186,7 @@
           <type>xml</type>
           <classifier>config</classifier>
        </dependency>
+<!--
        <dependency>
           <groupId>org.opendaylight.tsdr</groupId>
           <artifactId>tsdr-syslog-collector</artifactId>
@@ -189,6 +194,7 @@
           <type>xml</type>
           <classifier>config</classifier>
        </dependency>
+-->
        <!-- TSDR datastores -->
       <dependency>
           <groupId>org.opendaylight.tsdr</groupId>
@@ -229,21 +235,21 @@
       </dependency>
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>features4-tsdr</artifactId>
+        <artifactId>odl-tsdr-core</artifactId>
         <version>${project.version}</version>
         <classifier>features</classifier>
         <type>xml</type>
       </dependency>
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>odl-tsdr-core</artifactId>
+        <artifactId>odl-tsdr-hsqldb</artifactId>
         <version>${project.version}</version>
         <classifier>features</classifier>
         <type>xml</type>
       </dependency>
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>odl-tsdr-hsqldb</artifactId>
+        <artifactId>odl-tsdr-hsqldb-all</artifactId>
         <version>${project.version}</version>
         <classifier>features</classifier>
         <type>xml</type>
@@ -290,6 +296,7 @@
         <classifier>features</classifier>
         <type>xml</type>
       </dependency>
+<!--
       <dependency>
         <groupId>${project.groupId}</groupId>
         <artifactId>odl-tsdr-syslog-collector</artifactId>
@@ -297,8 +304,8 @@
         <classifier>features</classifier>
         <type>xml</type>
       </dependency>
+-->
    </dependencies>
  </dependencyManagement>
-
 </project>
 

diff --git a/collectors/collector-spi/pom.xml b/collectors/collector-spi/pom.xml
index 1789460700e5fa44f4b3cf791256c528be18e75e..11ca75c7b90467c72acd3d2850d02a5ebe678042 100644 (file)
--- a/collectors/collector-spi/pom.xml
+++ b/collectors/collector-spi/pom.xml
@@ -2,11 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>tsdr</artifactId>
-        <groupId>org.opendaylight.tsdr</groupId>
-        <version>1.4.0-SNAPSHOT</version>
-        <relativePath>../..</relativePath>
+       <artifactId>tsdr-parent</artifactId>
+       <groupId>org.opendaylight.tsdr</groupId>
+       <version>1.5.0-SNAPSHOT</version>
+       <relativePath>../../parent</relativePath>
     </parent>
+
     <artifactId>tsdr-collector-spi</artifactId>
     <packaging>bundle</packaging>
     <!-- <name> formatting is used by autorelease to parse and notify projects on

diff --git a/collectors/controller-metrics-collector/pom.xml b/collectors/controller-metrics-collector/pom.xml
index 069d61ae5236959146c6db134c1b02ad88ad044e..fb7c5f490c98ff3c1c253d4a19a03f1157cd6933 100644 (file)
--- a/collectors/controller-metrics-collector/pom.xml
+++ b/collectors/controller-metrics-collector/pom.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <artifactId>tsdr</artifactId>
-        <groupId>org.opendaylight.tsdr</groupId>
-        <version>1.4.0-SNAPSHOT</version>
-        <relativePath>../..</relativePath>
+   <parent>
+       <artifactId>tsdr-parent</artifactId>
+       <groupId>org.opendaylight.tsdr</groupId>
+       <version>1.5.0-SNAPSHOT</version>
+       <relativePath>../../parent</relativePath>
     </parent>
+
     <artifactId>tsdr-controller-metrics-collector</artifactId>
     <packaging>bundle</packaging>
     <!-- <name> formatting is used by autorelease to parse and notify projects on

diff --git a/collectors/external-collector-service/pom.xml b/collectors/external-collector-service/pom.xml
index 002db5169c29bb0b9b69400b966b2b3987420ac4..9cb97847c26b0161c91f02f5e8d9b3d04a63f0ab 100644 (file)
--- a/collectors/external-collector-service/pom.xml
+++ b/collectors/external-collector-service/pom.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <artifactId>tsdr</artifactId>
-        <groupId>org.opendaylight.tsdr</groupId>
-        <version>1.4.0-SNAPSHOT</version>
-        <relativePath>../..</relativePath>
+
+   <parent>
+       <artifactId>tsdr-parent</artifactId>
+       <groupId>org.opendaylight.tsdr</groupId>
+       <version>1.5.0-SNAPSHOT</version>
+       <relativePath>../../parent</relativePath>
     </parent>
+
     <artifactId>tsdr-external-collector-service</artifactId>
     <packaging>bundle</packaging>
     <!-- <name> formatting is used by autorelease to parse and notify projects on

diff --git a/collectors/netflow-statistics-collector/pom.xml b/collectors/netflow-statistics-collector/pom.xml
index bef630f062dbc578dda221e9f0a8a6a026c50c95..ff77ab3fceb9b56ff1df611d51d9684364764b9f 100644 (file)
--- a/collectors/netflow-statistics-collector/pom.xml
+++ b/collectors/netflow-statistics-collector/pom.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <artifactId>tsdr</artifactId>
-        <groupId>org.opendaylight.tsdr</groupId>
-        <version>1.4.0-SNAPSHOT</version>
-        <relativePath>../..</relativePath>
+   <parent>
+       <artifactId>tsdr-parent</artifactId>
+       <groupId>org.opendaylight.tsdr</groupId>
+       <version>1.5.0-SNAPSHOT</version>
+       <relativePath>../../parent</relativePath>
     </parent>
+
     <artifactId>tsdr-netflow-statistics-collector</artifactId>
     <packaging>bundle</packaging>
     <!-- <name> formatting is used by autorelease to parse and notify projects on

diff --git a/collectors/openflow-statistics-collector/pom.xml b/collectors/openflow-statistics-collector/pom.xml
index be1dac5f0174c1331a56b19a41f672d1155162c4..bfda59b54ce59de75806d03d27d6d7b86a2834d8 100644 (file)
--- a/collectors/openflow-statistics-collector/pom.xml
+++ b/collectors/openflow-statistics-collector/pom.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <artifactId>tsdr</artifactId>
-        <groupId>org.opendaylight.tsdr</groupId>
-        <version>1.4.0-SNAPSHOT</version>
-        <relativePath>../..</relativePath>
+   <parent>
+       <artifactId>tsdr-parent</artifactId>
+       <groupId>org.opendaylight.tsdr</groupId>
+       <version>1.5.0-SNAPSHOT</version>
+       <relativePath>../../parent</relativePath>
     </parent>
+
     <artifactId>tsdr-openflow-statistics-collector</artifactId>
     <packaging>bundle</packaging>
     <!-- <name> formatting is used by autorelease to parse and notify projects on

diff --git a/collectors/restconf-collector/pom.xml b/collectors/restconf-collector/pom.xml
index 1effd2609d1f45e7e6a0c6a4998d1ad8b119730a..9a8c396c3ee3b7b44df1979ec2d81cfd8743ee3b 100644 (file)
--- a/collectors/restconf-collector/pom.xml
+++ b/collectors/restconf-collector/pom.xml
@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <artifactId>tsdr</artifactId>
-        <groupId>org.opendaylight.tsdr</groupId>
-        <version>1.4.0-SNAPSHOT</version>
-        <relativePath>../..</relativePath>
+   <parent>
+       <artifactId>tsdr-parent</artifactId>
+       <groupId>org.opendaylight.tsdr</groupId>
+       <version>1.5.0-SNAPSHOT</version>
+       <relativePath>../../parent</relativePath>
     </parent>
+
     <artifactId>tsdr-restconf-collector</artifactId>
     <packaging>bundle</packaging>
     <name>ODL :: tsdr :: ${project.artifactId}</name>
     <properties>
         <yang.jmx.generator.plugin.version>0.7.0-SNAPSHOT</yang.jmx.generator.plugin.version>
-        <javax.servlet.api.version>3.0.1</javax.servlet.api.version>
-        <org.osgi.core.version>4.3.0</org.osgi.core.version>
         <org.osgi.compendium.version>1.4.0</org.osgi.compendium.version>
     </properties>
     <build>

diff --git a/collectors/sflow-statistics-collector/pom.xml b/collectors/sflow-statistics-collector/pom.xml
index f021a26036d357f0e2ae6fef42025fcd3bf3df0a..5ce662f8240c550a828460f6817412aab59e077b 100644 (file)
--- a/collectors/sflow-statistics-collector/pom.xml
+++ b/collectors/sflow-statistics-collector/pom.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <artifactId>tsdr</artifactId>
+  <parent>
+        <artifactId>tsdr-parent</artifactId>
         <groupId>org.opendaylight.tsdr</groupId>
-        <version>1.4.0-SNAPSHOT</version>
-        <relativePath>../..</relativePath>
+        <version>1.5.0-SNAPSHOT</version>
+        <relativePath>../../parent</relativePath>
     </parent>
+
     <artifactId>tsdr-sflow-statistics-collector</artifactId>
     <packaging>bundle</packaging>
     <!-- <name> formatting is used by autorelease to parse and notify projects on

diff --git a/collectors/snmp-data-collector/pom.xml b/collectors/snmp-data-collector/pom.xml
index b0d97c3c42de64bf908b6814a74c59f4867fa676..c0f682d2c763dc360ae6d31f97c251fdf4dc5928 100755 (executable)
--- a/collectors/snmp-data-collector/pom.xml
+++ b/collectors/snmp-data-collector/pom.xml
@@ -2,11 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>tsdr</artifactId>
+        <artifactId>tsdr-parent</artifactId>
         <groupId>org.opendaylight.tsdr</groupId>
-        <version>1.4.0-SNAPSHOT</version>
-    <relativePath>../..</relativePath>
+        <version>1.5.0-SNAPSHOT</version>
+        <relativePath>../../parent</relativePath>
     </parent>
+
     <artifactId>tsdr-snmp-data-collector</artifactId>
     <packaging>bundle</packaging>
     <!-- <name> formatting is used by autorelease to parse and notify projects on
@@ -52,7 +53,7 @@
          <dependency>
             <groupId>org.opendaylight.snmp</groupId>
             <artifactId>snmp</artifactId>
-            <version>1.4.0-SNAPSHOT</version>
+            <version>${snmp.version}</version>
         </dependency>
          <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>

diff --git a/collectors/syslog-collector/pom.xml b/collectors/syslog-collector/pom.xml
index 3fac09f2792b24cf097af620008641c2214b5b36..2fe06784596377c6ce093c2436c32ea553e3582b 100644 (file)
--- a/collectors/syslog-collector/pom.xml
+++ b/collectors/syslog-collector/pom.xml
@@ -2,11 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>tsdr</artifactId>
+        <artifactId>tsdr-parent</artifactId>
         <groupId>org.opendaylight.tsdr</groupId>
-        <version>1.4.0-SNAPSHOT</version>
-        <relativePath>../..</relativePath>
+        <version>1.5.0-SNAPSHOT</version>
+        <relativePath>../../parent</relativePath>
     </parent>
+
     <artifactId>tsdr-syslog-collector</artifactId>
     <packaging>bundle</packaging>
     <!-- <name> formatting is used by autorelease to parse and notify projects on

diff --git a/datapurge/pom.xml b/datapurge/pom.xml
index 282c1b0103dba1961abc93c99889d19ec9a81a20..61e3c5a0cc312989885bb1000e41e524a521af0b 100644 (file)
--- a/datapurge/pom.xml
+++ b/datapurge/pom.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+
     <parent>
-        <artifactId>tsdr</artifactId>
+        <artifactId>tsdr-parent</artifactId>
         <groupId>org.opendaylight.tsdr</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
     </parent>
+
     <artifactId>tsdr-datapurge</artifactId>
     <packaging>bundle</packaging>
     <!-- <name> formatting is used by autorelease to parse and notify projects on

diff --git a/dataquery/pom.xml b/dataquery/pom.xml
index 9759a539026ea7a13a1e9a76e9dc88727c3d9a4d..805444327de57f49cf5ed3762beffff7af2a8b6f 100644 (file)
--- a/dataquery/pom.xml
+++ b/dataquery/pom.xml
@@ -2,10 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>tsdr</artifactId>
+        <artifactId>tsdr-parent</artifactId>
         <groupId>org.opendaylight.tsdr</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
     </parent>
+
     <artifactId>tsdr-dataquery</artifactId>
     <packaging>bundle</packaging>
     <!-- <name> formatting is used by autorelease to parse and notify projects on

diff --git a/datastorage/pom.xml b/datastorage/pom.xml
index 35d08289420ed746016badf85ce868db21eda7df..5df0e96ef53c026103272323ba631e015800777f 100644 (file)
--- a/datastorage/pom.xml
+++ b/datastorage/pom.xml
@@ -2,10 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>tsdr</artifactId>
+        <artifactId>tsdr-parent</artifactId>
         <groupId>org.opendaylight.tsdr</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
     </parent>
+
     <artifactId>tsdr-datastorage</artifactId>
     <packaging>bundle</packaging>
     <!-- <name> formatting is used by autorelease to parse and notify projects on

diff --git a/features/features-tsdr/pom.xml b/features/features-tsdr/pom.xml
index fcdcfb5308181b15a3716c75e6a9837cb6b99945..22012c77cd27352cacbc5d17029dce1977a22c37 100644 (file)
--- a/features/features-tsdr/pom.xml
+++ b/features/features-tsdr/pom.xml
@@ -14,17 +14,29 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>2.0.4</version>
+        <version>2.0.5</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.tsdr</groupId>
     <artifactId>features-tsdr</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <packaging>feature</packaging>
     <!-- <name> formatting is used by autorelease to parse and notify projects on
          build failure. Please do not modify this unless you have a good reason. -->
     <name>ODL :: tsdr :: ${project.artifactId}</name>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.tsdr</groupId>
+                <artifactId>tsdr-artifacts</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
 
     <dependencies>
         <dependency>
@@ -55,7 +67,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-<!--
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-tsdr-hbase</artifactId>
@@ -63,7 +74,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
--->
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-tsdr-elasticsearch</artifactId>
@@ -71,6 +81,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+<!--
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-tsdr-syslog-collector</artifactId>
@@ -78,6 +89,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+-->
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-tsdr-openflow-statistics-collector</artifactId>

diff --git a/features/odl-hbaseclient/pom.xml b/features/odl-hbaseclient/pom.xml
index a96d73c1fc89f830a2cdfedd3f1e31124abf5624..7237c60a6f494074c16586bd356b94ebe53c3f11 100644 (file)
--- a/features/odl-hbaseclient/pom.xml
+++ b/features/odl-hbaseclient/pom.xml
@@ -14,13 +14,13 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.4</version>
+        <version>2.0.5</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.tsdr</groupId>
     <artifactId>odl-hbaseclient</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ODL :: tsdr :: ${project.artifactId}</name>

diff --git a/features/odl-tsdr-cassandra/pom.xml b/features/odl-tsdr-cassandra/pom.xml
index 4cbe7ac38491c536ef229afd1a75a4fa615e1feb..63e4d06e28077d9abafac6b4184705b9bb628438 100644 (file)
--- a/features/odl-tsdr-cassandra/pom.xml
+++ b/features/odl-tsdr-cassandra/pom.xml
@@ -7,13 +7,13 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.4</version>
+        <version>2.0.5</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.tsdr</groupId>
     <artifactId>odl-tsdr-cassandra</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <packaging>feature</packaging>
     <!-- <name> formatting is used by autorelease to parse and notify projects on
          build failure. Please do not modify this unless you have a good reason. -->

diff --git a/features/odl-tsdr-controller-metrics-collector/pom.xml b/features/odl-tsdr-controller-metrics-collector/pom.xml
index 0f6a5b255242fe12bc90cafe884943712496e2da..b9e68490d9aa7524b0a37c6d677a2535016c5776 100644 (file)
--- a/features/odl-tsdr-controller-metrics-collector/pom.xml
+++ b/features/odl-tsdr-controller-metrics-collector/pom.xml
@@ -7,13 +7,13 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.4</version>
+        <version>2.0.5</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.tsdr</groupId>
     <artifactId>odl-tsdr-controller-metrics-collector</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ODL :: tsdr :: controller collector</name>

diff --git a/features/odl-tsdr-core/pom.xml b/features/odl-tsdr-core/pom.xml
index bb9053956b3a3b8d88acaabda752f256404e96e1..27d303224b704b8322ea5633706073c35fff5d06 100644 (file)
--- a/features/odl-tsdr-core/pom.xml
+++ b/features/odl-tsdr-core/pom.xml
@@ -7,23 +7,23 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.4</version>
+        <version>2.0.5</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.tsdr</groupId>
     <artifactId>odl-tsdr-core</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <packaging>feature</packaging>
     <!-- <name> formatting is used by autorelease to parse and notify projects on
          build failure. Please do not modify this unless you have a good reason. -->
     <name>ODL :: tsdr :: core</name>
     <properties>
-        <openflowplugin.version>0.5.0-SNAPSHOT</openflowplugin.version>
-        <mdsal.model.version>0.11.0-SNAPSHOT</mdsal.model.version>
-        <mdsal.common.version>2.3.0-SNAPSHOT</mdsal.common.version>
-        <restconf.version>1.6.0-SNAPSHOT</restconf.version>
-        <controller.mdsal.version>1.6.0-SNAPSHOT</controller.mdsal.version>
+        <openflowplugin.version>0.6.0-SNAPSHOT</openflowplugin.version>
+        <mdsal.model.version>0.12.0-SNAPSHOT</mdsal.model.version>
+        <mdsal.common.version>2.4.0-SNAPSHOT</mdsal.common.version>
+        <restconf.version>1.7.0-SNAPSHOT</restconf.version>
+        <controller.mdsal.version>1.7.0-SNAPSHOT</controller.mdsal.version>
     </properties>
  
 

diff --git a/features/odl-tsdr-elasticsearch/pom.xml b/features/odl-tsdr-elasticsearch/pom.xml
index 3ce4248d5a5cc30cd7746ba7c7e398718b398f74..939e3a4e4ab83ce962d3defda321fe6e2fcf4933 100644 (file)
--- a/features/odl-tsdr-elasticsearch/pom.xml
+++ b/features/odl-tsdr-elasticsearch/pom.xml
@@ -7,13 +7,13 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.4</version>
+        <version>2.0.5</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.tsdr</groupId>
     <artifactId>odl-tsdr-elasticsearch</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ODL :: tsdr :: elasticsearch</name>

diff --git a/features/odl-tsdr-hbase/pom.xml b/features/odl-tsdr-hbase/pom.xml
index 395b4095fc11d8bc5330c126a3b01c104fd6b20c..ea79242b25855fb78468f0a4e4457c1cb6e299c1 100644 (file)
--- a/features/odl-tsdr-hbase/pom.xml
+++ b/features/odl-tsdr-hbase/pom.xml
@@ -7,13 +7,13 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.4</version>
+        <version>2.0.5</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.tsdr</groupId>
     <artifactId>odl-tsdr-hbase</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ODL :: tsdr :: hbase</name>

diff --git a/features/odl-tsdr-hsqldb-all/pom.xml b/features/odl-tsdr-hsqldb-all/pom.xml
index b2536719544e4461a65acc4283f8531b28a94d9c..3505b3e130a160c1213832cfae2c16c650fc2b25 100644 (file)
--- a/features/odl-tsdr-hsqldb-all/pom.xml
+++ b/features/odl-tsdr-hsqldb-all/pom.xml
@@ -7,13 +7,13 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.4</version>
+        <version>2.0.5</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.tsdr</groupId>
     <artifactId>odl-tsdr-hsqldb-all</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <packaging>feature</packaging>
     <!-- <name> formatting is used by autorelease to parse and notify projects on
          build failure. Please do not modify this unless you have a good reason. -->

diff --git a/features/odl-tsdr-hsqldb/pom.xml b/features/odl-tsdr-hsqldb/pom.xml
index 03bcd057ccf7ac832dfb5034486fb4673b56c462..b8e8b1d0929bb15661cdea6aecc2bfca6cfefa5d 100644 (file)
--- a/features/odl-tsdr-hsqldb/pom.xml
+++ b/features/odl-tsdr-hsqldb/pom.xml
@@ -7,13 +7,13 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.4</version>
+        <version>2.0.5</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.tsdr</groupId>
     <artifactId>odl-tsdr-hsqldb</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <packaging>feature</packaging>
     <!-- <name> formatting is used by autorelease to parse and notify projects on
          build failure. Please do not modify this unless you have a good reason. -->

diff --git a/features/odl-tsdr-netflow-statistics-collector/pom.xml b/features/odl-tsdr-netflow-statistics-collector/pom.xml
index e49af9f4087cbfaa1980b2d874eac4b2e18afe81..e9249fce34ea9cab840e0bac790409eefa80f9c6 100644 (file)
--- a/features/odl-tsdr-netflow-statistics-collector/pom.xml
+++ b/features/odl-tsdr-netflow-statistics-collector/pom.xml
@@ -7,19 +7,18 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.4</version>
+        <version>2.0.5</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.tsdr</groupId>
     <artifactId>odl-tsdr-netflow-statistics-collector</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ODL :: tsdr :: netflow statistics collector</name>
     <properties>
-          <mdsal.version>1.6.0-SNAPSHOT</mdsal.version>
-          <l2switch.version>0.6.0-SNAPSHOT</l2switch.version>
+          <l2switch.version>0.7.0-SNAPSHOT</l2switch.version>
     </properties>
 
  <dependencyManagement>

diff --git a/features/odl-tsdr-openflow-statistics-collector/pom.xml b/features/odl-tsdr-openflow-statistics-collector/pom.xml
index e6b0d6977f21490dbf547a95618a8627e4b46ddb..c08306d67b6b686455abfa6906b7129726ba5514 100644 (file)
--- a/features/odl-tsdr-openflow-statistics-collector/pom.xml
+++ b/features/odl-tsdr-openflow-statistics-collector/pom.xml
@@ -7,18 +7,18 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.4</version>
+        <version>2.0.5</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.tsdr</groupId>
     <artifactId>odl-tsdr-openflow-statistics-collector</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ODL :: tsdr :: openflowcollector</name>
     <properties>
-          <l2switch.version>0.6.0-SNAPSHOT</l2switch.version>
+          <l2switch.version>0.7.0-SNAPSHOT</l2switch.version>
     </properties>
 
     <dependencyManagement>

diff --git a/features/odl-tsdr-restconf-collector/pom.xml b/features/odl-tsdr-restconf-collector/pom.xml
index 90b0911cdac6d9b622b8eced3e65789f5a2dffe6..37f290eb0d6a7b27898aa1e26044b5b159e00bc0 100644 (file)
--- a/features/odl-tsdr-restconf-collector/pom.xml
+++ b/features/odl-tsdr-restconf-collector/pom.xml
@@ -7,19 +7,19 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.4</version>
+        <version>2.0.5</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.tsdr</groupId>
     <artifactId>odl-tsdr-restconf-collector</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ODL :: tsdr :: restconfcollector</name>
     <properties>
-          <aaa.version>0.6.0-SNAPSHOT</aaa.version>
-          <restconf.version>1.6.0-SNAPSHOT</restconf.version>
+          <aaa.version>0.7.0-SNAPSHOT</aaa.version>
+          <restconf.version>1.7.0-SNAPSHOT</restconf.version>
     </properties>
 
     <dependencyManagement>

diff --git a/features/odl-tsdr-syslog-collector/pom.xml b/features/odl-tsdr-syslog-collector/pom.xml
index 2959e50f74983eaa6c410730a967d77c6995e7ae..9a54b5aab877fa9cb8cb76310da2065211d8d31e 100644 (file)
--- a/features/odl-tsdr-syslog-collector/pom.xml
+++ b/features/odl-tsdr-syslog-collector/pom.xml
@@ -13,16 +13,10 @@
 
     <groupId>org.opendaylight.tsdr</groupId>
     <artifactId>odl-tsdr-syslog-collector</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ODL :: tsdr :: syslogcollector</name>
-    <properties>
-         <mdsal.version>1.6.0-SNAPSHOT</mdsal.version>
-         <config.version>0.7.0-SNAPSHOT</config.version>
-         <sigar.version>1.6.4</sigar.version>
-         <io.netty4.version>4.0.33.Final</io.netty4.version>
-    </properties>
 
      <dependencyManagement>
         <dependencies>

diff --git a/features/pom.xml b/features/pom.xml
index 7ad22e30fe5aea034efee04e4fc2892e1ab6cc5b..12e0deeabd58b041f7a8ec1c024c2ed848c3a7ad 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -5,32 +5,34 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.0.4</version>
+        <version>2.0.5</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.tsdr</groupId>
     <artifactId>features-tsdr-aggregator</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <!-- <name> formatting is used by autorelease to parse and notify projects on
          build failure. Please do not modify this unless you have a good reason. -->
     <name>ODL :: tsdr :: ${project.artifactId}</name>
     <packaging>pom</packaging>
 
     <modules>
-      <module>odl-hbaseclient</module>
+      <module>features-tsdr</module>
       <module>odl-tsdr-core</module>
       <module>odl-tsdr-openflow-statistics-collector</module>
       <module>odl-tsdr-elasticsearch</module>
       <module>odl-tsdr-netflow-statistics-collector</module>
+<!--
       <module>odl-tsdr-syslog-collector</module>
+-->
       <module>odl-tsdr-restconf-collector</module>
       <module>odl-tsdr-controller-metrics-collector</module>
       <module>odl-tsdr-cassandra</module>
       <module>odl-tsdr-hsqldb</module>
       <module>odl-tsdr-hsqldb-all</module>
+      <module>odl-hbaseclient</module>
       <module>odl-tsdr-hbase</module>
-      <module>features-tsdr</module>
     </modules>
 </project>
 

diff --git a/parent/pom.xml b/parent/pom.xml
new file mode 100755 (executable)
index 0000000..df78657
--- /dev/null
+++ b/parent/pom.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright (c) 2014-2015 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>binding-parent</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+      <relativePath/>
+  </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.opendaylight.tsdr</groupId>
+    <artifactId>tsdr-parent</artifactId>
+    <version>1.5.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>ODL :: tsdr :: ${project.artifactId}</name>
+
+    <properties>
+        <mdsal.java.binding.version>0.12.0-SNAPSHOT</mdsal.java.binding.version>
+        <mdsal.model.version>0.12.0-SNAPSHOT</mdsal.model.version>
+        <config.version>0.8.0-SNAPSHOT</config.version>
+        <controller.mdsal.version>1.7.0-SNAPSHOT</controller.mdsal.version>
+        <snmp.version>1.5.0-SNAPSHOT</snmp.version>
+        <guava.old.version>19.0</guava.old.version>
+        <felix.version>4.3.0</felix.version>
+        <hbase.version>0.94.15</hbase.version>
+        <hadoop.version>1.2.0</hadoop.version>
+        <ietf-inet-types.version>1.3.0-SNAPSHOT</ietf-inet-types.version>
+        <ietf-yang-types.version>2013.07.15.11.0-SNAPSHOT</ietf-yang-types.version>
+        <model.flow.statistics>0.6.0-SNAPSHOT</model.flow.statistics>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <protobuf.version>2.4.1</protobuf.version>
+        <com.codahale.metrics.version>3.0.2</com.codahale.metrics.version>
+        <io.netty.version>3.9.0.Final</io.netty.version>
+        <io.netty4.version>4.0.33.Final</io.netty4.version>
+        <com.datastax.cassandra.version>2.2.0-rc3</com.datastax.cassandra.version>
+        <sigar.version>1.6.4</sigar.version>
+        <hsqldb.version>1.8.0.10</hsqldb.version>
+        <gson.version>2.5</gson.version>
+        <jest.version>2.0.3</jest.version>
+    </properties>
+
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>${controller.mdsal.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.core</artifactId>
+    </dependency>
+
+    <!-- Testing Dependencies -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+<!--
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <configuration>
+          <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+-->
+</project>

diff --git a/persistence-cassandra/pom.xml b/persistence-cassandra/pom.xml
index ae67351cbbd1600614d13d26f1ad03faa6261e12..3caef94b7a783f0996ffb60f16edc3df250b815d 100644 (file)
--- a/persistence-cassandra/pom.xml
+++ b/persistence-cassandra/pom.xml
@@ -2,10 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>tsdr</artifactId>
+        <artifactId>tsdr-parent</artifactId>
         <groupId>org.opendaylight.tsdr</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
     </parent>
+
     <artifactId>tsdr-persistence-cassandra</artifactId>
     <packaging>bundle</packaging>
     <!-- <name> formatting is used by autorelease to parse and notify projects on
@@ -87,9 +89,9 @@
         <artifactId>cassandra-driver-core</artifactId>
         <version>${com.datastax.cassandra.version}</version>
      </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.dependencymanager</artifactId>
-        </dependency>
+     <dependency>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>org.apache.felix.dependencymanager</artifactId>
+     </dependency>
     </dependencies>
 </project>

diff --git a/persistence-elasticsearch/pom.xml b/persistence-elasticsearch/pom.xml
index d61504bbd5c0fc77a26275ae9a0e25980ad69dfb..3c432407a5026a5e616a8a574e5a8458701d44ef 100644 (file)
--- a/persistence-elasticsearch/pom.xml
+++ b/persistence-elasticsearch/pom.xml
@@ -4,10 +4,12 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>tsdr</artifactId>
+        <artifactId>tsdr-parent</artifactId>
         <groupId>org.opendaylight.tsdr</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
     </parent>
+
     <artifactId>tsdr-persistence-elasticsearch</artifactId>
     <packaging>bundle</packaging>
     <!-- <name> formatting is used by autorelease to parse and notify projects on
@@ -145,11 +147,13 @@
             <artifactId>powermock-api-mockito</artifactId>
             <scope>test</scope>
         </dependency>
+<!--
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
             <scope>test</scope>
         </dependency>
+-->
     </dependencies>
 
 </project>

diff --git a/persistence-h2/pom.xml b/persistence-h2/pom.xml
index ab32761238b115a5da7ded3986482d59f7945488..0754f1bec2062fb9e981f0ca1a2ecaf182ee8710 100644 (file)
--- a/persistence-h2/pom.xml
+++ b/persistence-h2/pom.xml
@@ -3,10 +3,12 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>tsdr</artifactId>
+        <artifactId>tsdr-parent</artifactId>
         <groupId>org.opendaylight.tsdr</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
     </parent>
+
     <artifactId>tsdr-persistence-h2</artifactId>
     <packaging>bundle</packaging>
     <!-- <name> formatting is used by autorelease to parse and notify projects on
@@ -62,6 +64,10 @@
 
                     </instructions>
                 </configuration>
+             <plugin>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yang-maven-plugin</artifactId>
+             </plugin>
             </plugin>
         </plugins>
     </build>

diff --git a/persistence-hbase/pom.xml b/persistence-hbase/pom.xml
index 44a6058fd66249ef4b0dc3652e87e44076aea5d7..316864ba0c5659f2929cb25f5e86669604ceede2 100644 (file)
--- a/persistence-hbase/pom.xml
+++ b/persistence-hbase/pom.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <artifactId>tsdr</artifactId>
+  <parent>
+        <artifactId>tsdr-parent</artifactId>
         <groupId>org.opendaylight.tsdr</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
     </parent>
+
     <artifactId>tsdr-persistence-hbase</artifactId>
     <packaging>bundle</packaging>
     <!-- <name> formatting is used by autorelease to parse and notify projects on
@@ -64,6 +66,14 @@
         <groupId>org.opendaylight.tsdr</groupId>
         <artifactId>tsdr-persistence-spi</artifactId>
         <version>${project.version}</version>
+    </dependency>
+    <dependency>
+        <groupId>com.google.code.gson</groupId>
+        <artifactId>gson</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>com.google.guava</groupId>
+        <artifactId>guava</artifactId>
     </dependency>
      <dependency>
       <groupId>junit</groupId>

diff --git a/persistence-hsqldb/pom.xml b/persistence-hsqldb/pom.xml
index b6110395c5f9b5e089ab08218d7e89ed0d82e321..14c0c30fbc79ebe070d46110bb6ee8e5e5daf217 100644 (file)
--- a/persistence-hsqldb/pom.xml
+++ b/persistence-hsqldb/pom.xml
@@ -2,10 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>tsdr</artifactId>
+        <artifactId>tsdr-parent</artifactId>
         <groupId>org.opendaylight.tsdr</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
     </parent>
+
     <artifactId>tsdr-persistence-hsqldb</artifactId>
     <packaging>bundle</packaging>
     <!-- <name> formatting is used by autorelease to parse and notify projects on
@@ -49,6 +51,10 @@
                     </instructions>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yang-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
     <dependencies>

diff --git a/persistence-spi/pom.xml b/persistence-spi/pom.xml
index b7a6785aaa9e9c5b0755443fe3782c1fcfeef9df..b38dae45e0ccec6d83867c4612b0457ade3b8c09 100644 (file)
--- a/persistence-spi/pom.xml
+++ b/persistence-spi/pom.xml
@@ -2,9 +2,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>tsdr</artifactId>
+        <artifactId>tsdr-parent</artifactId>
         <groupId>org.opendaylight.tsdr</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
     </parent>
     <artifactId>tsdr-persistence-spi</artifactId>
     <packaging>bundle</packaging>

diff --git a/pom.xml b/pom.xml
index 6065c5cf15a6deeadc218fe4d4ff48f92a8508f2..5fb302f4124cc927279d0c9cc2625a30f46b2273 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -2,209 +2,32 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
    <parent>
-     <groupId>org.opendaylight.mdsal</groupId>
-     <artifactId>binding-parent</artifactId>
-     <version>0.11.0-SNAPSHOT</version>
-     <relativePath/>
+     <groupId>org.opendaylight.odlparent</groupId>
+     <artifactId>odlparent-lite</artifactId>
+     <version>2.0.5</version>
+     <relativePath></relativePath>
    </parent>
 
 
-  <packaging>pom</packaging>
   <groupId>org.opendaylight.tsdr</groupId>
   <artifactId>tsdr</artifactId>
-  <version>1.4.0-SNAPSHOT</version>
-    <properties>
-        <guava.old.version>19.0</guava.old.version>
-        <felix.version>4.3.0</felix.version>
-        <hbase.version>0.94.15</hbase.version>
-        <hadoop.version>1.2.0</hadoop.version>
-        <ietf-inet-types.version>1.3.0-SNAPSHOT</ietf-inet-types.version>
-        <ietf-yang-types.version>2013.07.15.11.0-SNAPSHOT</ietf-yang-types.version>
-        <model.flow.statistics>0.5.0-SNAPSHOT</model.flow.statistics>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <protobuf.version>2.4.1</protobuf.version>
-<!--
-        <karaf.shell.command.version>3.0.1</karaf.shell.command.version>
--->
-        <!--
-        <hibernate.jpa.api.version>1.0.0.Final</hibernate.jpa.api.version>
-        <hibernate.entity.manager.version>4.3.6.Final</hibernate.entity.manager.version>
-        <hibernate.validator.version>4.3.1.Final</hibernate.validator.version>
-        <h2.store.version>1.3.174</h2.store.version>
-        -->
-        <com.codahale.metrics.version>3.0.2</com.codahale.metrics.version>
-        <io.netty.version>3.9.0.Final</io.netty.version>
-        <io.netty4.version>4.0.33.Final</io.netty4.version>
-<!--
-        <com.datastax.cassandra.version>2.1.2</com.datastax.cassandra.version>
--->
-        <com.datastax.cassandra.version>2.2.0-rc3</com.datastax.cassandra.version>
-        <sigar.version>1.6.4</sigar.version>
-        <hsqldb.version>1.8.0.10</hsqldb.version>
-        <gson.version>2.5</gson.version>
-        <jest.version>2.0.3</jest.version>
-    </properties>
-
+  <version>1.5.0-SNAPSHOT</version>
+  <name>tsdr</name>
+  <packaging>pom</packaging>
   <scm>
-      <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
-      <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
-      <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
+      <connection>scm:git:ssh://git.opendaylight.org:29418/tsdr.git</connection>
+      <developerConnection>scm:git:ssh://git.opendaylight.org:29418/tsdr.git</developerConnection>
+      <url>https://wiki.opendaylight.org/view/TSDR:Main</url>
       <tag>HEAD</tag>
   </scm>
 
-  <!--distributionManagement>
-    <repository>
-      <id>opendaylight-release</id>
-      <url>${nexusproxy}/repositories/opendaylight.release/</url>
-    </repository>
-    <snapshotRepository>
-      <id>opendaylight-snapshot</id>
-      <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
-    </snapshotRepository>
-    <site>
-      <id>website</id>
-      <url>${sitedeploy}</url>
-    </site>
-  </distributionManagement-->
 
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.opendaylight.mdsal.model</groupId>
-        <artifactId>mdsal-model-artifacts</artifactId>
-        <version>0.11.0-SNAPSHOT</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>mdsal-artifacts</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <build>
-    <pluginManagement>
-      <plugins>
-        <!-- Ignore/Execute plugin execution -->
-        <plugin>
-          <groupId>org.eclipse.m2e</groupId>
-          <artifactId>lifecycle-mapping</artifactId>
-          <version>1.0.0</version>
-          <configuration>
-            <lifecycleMappingMetadata>
-              <pluginExecutions>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>properties-maven-plugin</artifactId>
-                    <versionRange>[0.0,)</versionRange>
-                    <goals>
-                      <goal>set-system-properties</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <ignore/>
-                  </action>
-                </pluginExecution>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.jacoco</groupId>
-                    <artifactId>jacoco-maven-plugin</artifactId>
-                    <versionRange>[0.0,)</versionRange>
-                    <goals>
-                      <goal>prepare-agent</goal>
-                      <goal>pre-test</goal>
-                      <goal>post-test</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <ignore/>
-                  </action>
-                </pluginExecution>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.ops4j.pax.exam</groupId>
-                    <artifactId>maven-paxexam-plugin</artifactId>
-                    <versionRange>[1.2.4,)</versionRange>
-                    <goals>
-                      <goal>generate-depends-file</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <execute>
-                      <runOnIncremental>false</runOnIncremental>
-                    </execute>
-                  </action>
-                </pluginExecution>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-checkstyle-plugin</artifactId>
-                    <versionRange>[2.0,)</versionRange>
-                    <goals>
-                      <goal>check</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <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.codehaus.groovy.maven</groupId>
-                    <artifactId>gmaven-plugin</artifactId>
-                    <versionRange>1.0</versionRange>
-                    <goals>
-                      <goal>execute</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <ignore/>
-                  </action>
-                </pluginExecution>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-enforcer-plugin</artifactId>
-                    <versionRange>${enforcer.version}</versionRange>
-                    <goals>
-                      <goal>enforce</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <ignore/>
-                  </action>
-                </pluginExecution>
-              </pluginExecutions>
-            </lifecycleMappingMetadata>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
   <modules>
   <!--
     <module>configuration</module>
     -->
+    <module>parent</module>
     <module>persistence-spi</module>
-    <module>artifacts</module>
     <module>persistence-hbase</module>
     <module>persistence-cassandra</module>
     <module>persistence-hsqldb</module>
@@ -217,11 +40,49 @@
     <module>collectors/sflow-statistics-collector</module>
     <module>collectors/controller-metrics-collector</module>
     <module>collectors/collector-spi</module>
-<!--
     <module>collectors/snmp-data-collector</module>
--->
+<!--
     <module>collectors/syslog-collector</module>
+-->
     <module>collectors/restconf-collector</module>
     <module>features</module>
+    <module>artifacts</module>
   </modules>
+
+ <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-install-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </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}/</url>
+
+  <distributionManagement>
+    <site>
+      <id>opendaylight-site</id>
+      <url>${nexus.site.url}/</url>
+    </site>
+  </distributionManagement>
+
+
 </project>