Bump to yangtools-2.0.0 and odlparent-3.0.2

Also upgrades jline version to 3.5.0, to be aligned with karaf.

Change-Id: I2e244fd1cf8fd6056813ba8626a049a44de6f24e
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/.gitignore b/.gitignore
index 1b0f4c840110c692804e3cea018572804473a231..815931ac3819b4e7087dd8d856a05eb9dd07c558 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ target/
 target-ide/
 .checkstyle
 .fbExcludeFilterFile
+.factorypath
 
 # OpenDaylight
 yang-gen-sal/

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 7ad4a8ba73810f5c3d3ee59b03c684a234e8fec2..3ade1f4c1af004624338505b84765aa1c9655197 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -13,7 +13,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>2.0.5</version>
+      <version>3.0.2</version>
       <relativePath/>
     </parent>
 

diff --git a/collectors/openflow-statistics-collector/src/main/java/org/opendaylight/tsdr/osc/TSDROpenflowCollector.java b/collectors/openflow-statistics-collector/src/main/java/org/opendaylight/tsdr/osc/TSDROpenflowCollector.java
index 206cf0d3fd40f255217871a732bb58705a0954c7..e88582374e1755a123e74771a028efd19d188142 100644 (file)
--- a/collectors/openflow-statistics-collector/src/main/java/org/opendaylight/tsdr/osc/TSDROpenflowCollector.java
+++ b/collectors/openflow-statistics-collector/src/main/java/org/opendaylight/tsdr/osc/TSDROpenflowCollector.java
@@ -108,7 +108,7 @@ public class TSDROpenflowCollector implements TsdrOpenflowStatisticsCollectorSer
     private final TsdrCollectorSpiService collectorSPIService;
 
     private final ExecutorService storeMetricsExecutor = SpecialExecutors.newBoundedSingleThreadExecutor(
-            1000, "TSDR Openflow Storing Thread");
+            1000, "TSDR Openflow Storing Thread", TSDROpenflowCollector.class);
 
     private final ScheduledExecutorService scheduledExecutor = Executors.newScheduledThreadPool(
             1, new ThreadFactoryBuilder().setNameFormat("TSDR Openflow Poller-%d").build());

diff --git a/collectors/restconf-collector/src/main/java/org/opendaylight/tsdr/restconf/collector/TSDRRestconfCollectorFilter.java b/collectors/restconf-collector/src/main/java/org/opendaylight/tsdr/restconf/collector/TSDRRestconfCollectorFilter.java
index 9aa075167eb251b5d1d5a9017f4e603b43b336f5..dd039125cd306d94b58035fe3215ae3b7fd37299 100644 (file)
--- a/collectors/restconf-collector/src/main/java/org/opendaylight/tsdr/restconf/collector/TSDRRestconfCollectorFilter.java
+++ b/collectors/restconf-collector/src/main/java/org/opendaylight/tsdr/restconf/collector/TSDRRestconfCollectorFilter.java
@@ -21,6 +21,7 @@ import java.util.regex.Pattern;
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;
 import javax.servlet.FilterConfig;
+import javax.servlet.ReadListener;
 import javax.servlet.ServletException;
 import javax.servlet.ServletInputStream;
 import javax.servlet.ServletRequest;
@@ -246,5 +247,19 @@ public class TSDRRestconfCollectorFilter implements Filter {
         public int read(byte[] buf, int off, int len) {
             return this.bais.read(buf, off, len);
         }
+
+        @Override
+        public boolean isFinished() {
+            return true;
+        }
+
+        @Override
+        public boolean isReady() {
+            return true;
+        }
+
+        @Override
+        public void setReadListener(ReadListener arg0) {
+        }
     }
 }

diff --git a/collectors/snmp-data-collector/pom.xml b/collectors/snmp-data-collector/pom.xml
index 0fae31fff9c1b4cbdaf0d687fa70665b9fa94327..b151871d6ea03eecd6ae1c54a56ce42c549709f5 100755 (executable)
--- a/collectors/snmp-data-collector/pom.xml
+++ b/collectors/snmp-data-collector/pom.xml
@@ -46,6 +46,10 @@
     </plugins>
   </build>
   <dependencies>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.compendium</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.tsdr</groupId>
       <artifactId>tsdr-collector-spi</artifactId>
@@ -79,10 +83,10 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </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> -->
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-binding-broker-impl</artifactId>

diff --git a/collectors/snmp-data-collector/src/main/java/org/opendaylight/tsdr/sdc/SNMPDataCollector.java b/collectors/snmp-data-collector/src/main/java/org/opendaylight/tsdr/sdc/SNMPDataCollector.java
index 6ec7c739eab267e40491d70b95eb16a793e40c11..01f90d357585eb6bf9a724e320a2d6f52aa5aec1 100755 (executable)
--- a/collectors/snmp-data-collector/src/main/java/org/opendaylight/tsdr/sdc/SNMPDataCollector.java
+++ b/collectors/snmp-data-collector/src/main/java/org/opendaylight/tsdr/sdc/SNMPDataCollector.java
@@ -77,7 +77,8 @@ public class SNMPDataCollector implements AutoCloseable {
         this.collectorConfig = collectorConfig;
 
         storeMetricsExecutor = SpecialExecutors.newBoundedSingleThreadExecutor(
-                collectorConfig.getStoreMetricsExecutorQueueSize().intValue(), "TSDR SNMP Storing Thread");
+                collectorConfig.getStoreMetricsExecutorQueueSize().intValue(), "TSDR SNMP Storing Thread",
+                SNMPDataCollector.class);
     }
 
     public void init() {

diff --git a/datastorage/pom.xml b/datastorage/pom.xml
index a776e166ba618df32e495a9cd66a85fa7bfa8559..a7e0259074aaa6ffda00e9bd2e2acd879d995460 100644 (file)
--- a/datastorage/pom.xml
+++ b/datastorage/pom.xml
@@ -40,6 +40,10 @@
   </build>
 
   <dependencies>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.compendium</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.tsdr</groupId>
       <artifactId>tsdr-persistence-spi</artifactId>

diff --git a/features/features-tsdr/pom.xml b/features/features-tsdr/pom.xml
index 22012c77cd27352cacbc5d17029dce1977a22c37..222808f132924bbce51eda25cd866af72ce10f6b 100644 (file)
--- a/features/features-tsdr/pom.xml
+++ b/features/features-tsdr/pom.xml
@@ -14,7 +14,7 @@ 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.5</version>
+        <version>3.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-hbaseclient/pom.xml b/features/odl-hbaseclient/pom.xml
index 7237c60a6f494074c16586bd356b94ebe53c3f11..a0abd41aa1594197648fd4e3705576ae83dc52b9 100644 (file)
--- a/features/odl-hbaseclient/pom.xml
+++ b/features/odl-hbaseclient/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-tsdr-cassandra/pom.xml b/features/odl-tsdr-cassandra/pom.xml
index 63e4d06e28077d9abafac6b4184705b9bb628438..3ff48681d6918f232acdcf7aa8dc9ab300ee6eaf 100644 (file)
--- a/features/odl-tsdr-cassandra/pom.xml
+++ b/features/odl-tsdr-cassandra/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-tsdr-controller-metrics-collector/pom.xml b/features/odl-tsdr-controller-metrics-collector/pom.xml
index b9e68490d9aa7524b0a37c6d677a2535016c5776..be3c519d316eefa0e2f6512f84d030a7ad6f6fce 100644 (file)
--- a/features/odl-tsdr-controller-metrics-collector/pom.xml
+++ b/features/odl-tsdr-controller-metrics-collector/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-tsdr-core/pom.xml b/features/odl-tsdr-core/pom.xml
index 27d303224b704b8322ea5633706073c35fff5d06..852be86b22ac334c0fb6bafdcc3f6e61be7204ce 100644 (file)
--- a/features/odl-tsdr-core/pom.xml
+++ b/features/odl-tsdr-core/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-tsdr-elasticsearch/pom.xml b/features/odl-tsdr-elasticsearch/pom.xml
index 939e3a4e4ab83ce962d3defda321fe6e2fcf4933..ea008e1be4d9effa24a1847bf8c548d28dbca7c5 100644 (file)
--- a/features/odl-tsdr-elasticsearch/pom.xml
+++ b/features/odl-tsdr-elasticsearch/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-tsdr-hbase/pom.xml b/features/odl-tsdr-hbase/pom.xml
index ea79242b25855fb78468f0a4e4457c1cb6e299c1..6e9108816f69379c68e4d27b8663675f5fadcd72 100644 (file)
--- a/features/odl-tsdr-hbase/pom.xml
+++ b/features/odl-tsdr-hbase/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-tsdr-hsqldb-all/pom.xml b/features/odl-tsdr-hsqldb-all/pom.xml
index 3505b3e130a160c1213832cfae2c16c650fc2b25..1de68d981106cfc26ffca23fb0c3324c15edbf6c 100644 (file)
--- a/features/odl-tsdr-hsqldb-all/pom.xml
+++ b/features/odl-tsdr-hsqldb-all/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-tsdr-hsqldb/pom.xml b/features/odl-tsdr-hsqldb/pom.xml
index b8e8b1d0929bb15661cdea6aecc2bfca6cfefa5d..2a9c7b83af07b0f975753d441993387046aa8405 100644 (file)
--- a/features/odl-tsdr-hsqldb/pom.xml
+++ b/features/odl-tsdr-hsqldb/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-tsdr-netflow-statistics-collector/pom.xml b/features/odl-tsdr-netflow-statistics-collector/pom.xml
index e9249fce34ea9cab840e0bac790409eefa80f9c6..02dca9322afa1654eee5ca5454808101dc478b52 100644 (file)
--- a/features/odl-tsdr-netflow-statistics-collector/pom.xml
+++ b/features/odl-tsdr-netflow-statistics-collector/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-tsdr-openflow-statistics-collector/pom.xml b/features/odl-tsdr-openflow-statistics-collector/pom.xml
index c08306d67b6b686455abfa6906b7129726ba5514..9c518797349b593f299ca907d857f0d7028fff74 100644 (file)
--- a/features/odl-tsdr-openflow-statistics-collector/pom.xml
+++ b/features/odl-tsdr-openflow-statistics-collector/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-tsdr-restconf-collector/pom.xml b/features/odl-tsdr-restconf-collector/pom.xml
index 87e9826c810107a47621f9dd53015bd815d5687a..77e6f6d5858fd58577c44562608b86b4d644197a 100644 (file)
--- a/features/odl-tsdr-restconf-collector/pom.xml
+++ b/features/odl-tsdr-restconf-collector/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-tsdr-syslog-collector/pom.xml b/features/odl-tsdr-syslog-collector/pom.xml
index 6a7f14ed1fb1d5b26349e2025fff3ea934b1d15c..8841a7b2d57679bcbdf3b56641973c9e9a44452c 100644 (file)
--- a/features/odl-tsdr-syslog-collector/pom.xml
+++ b/features/odl-tsdr-syslog-collector/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/pom.xml b/features/pom.xml
index 3d0c53a871c9d42f1c73611ea2e69ad3e475cb8d..a5f63bc57f48931d50416c669d696e5b1c86ee7f 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/persistence-h2/pom.xml b/persistence-h2/pom.xml
index 0754f1bec2062fb9e981f0ca1a2ecaf182ee8710..9d487b997b355e1d7f9db4a3c2f918f14aae3a7d 100644 (file)
--- a/persistence-h2/pom.xml
+++ b/persistence-h2/pom.xml
@@ -53,8 +53,6 @@
                                 org.hibernate.proxy,
                                 javassist.util.proxy,
                                 javax.persistence,
-                                org.apache.karaf.shell.commands;version="[3.0.0,4.1)",
-                                org.apache.karaf.shell.console;version="[3.0.0,4.1)",
                                 *
 
                             </ImportPackage>

diff --git a/persistence-hbase/src/test/java/org/opendaylight/tsdr/persistence/hbase/TsdrRHBasePersistenceServiceImplTest.java b/persistence-hbase/src/test/java/org/opendaylight/tsdr/persistence/hbase/TsdrRHBasePersistenceServiceImplTest.java
index 53c5d4a74314f8ab7482bbfc222eaf2ecdf5f9ea..6e345c5b9589d5ffe00bab83f3c017ed193a7849 100755 (executable)
--- a/persistence-hbase/src/test/java/org/opendaylight/tsdr/persistence/hbase/TsdrRHBasePersistenceServiceImplTest.java
+++ b/persistence-hbase/src/test/java/org/opendaylight/tsdr/persistence/hbase/TsdrRHBasePersistenceServiceImplTest.java
@@ -24,8 +24,8 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.concurrent.ScheduledFuture;
-import jline.internal.ShutdownHooks.Task;
 import junit.framework.Assert;
+import org.jline.utils.ShutdownHooks.Task;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

diff --git a/persistence-spi/pom.xml b/persistence-spi/pom.xml
index 86cd6b1b4b50389a9e1465688001af485e24d2f7..4eedc00df37b3be0e8ea79c074a09cdd36e52afa 100644 (file)
--- a/persistence-spi/pom.xml
+++ b/persistence-spi/pom.xml
@@ -13,26 +13,6 @@
          build failure. Please do not modify this unless you have a good reason. -->
     <name>ODL :: tsdr :: ${project.artifactId}</name>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>${bundle.plugin.version}</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-Name>org.opendaylight.tsdr.spi</Bundle-Name>
-                        <!-- This bundle works with Karaf 3 and 4.0 -->
-                        <Import-Package>
-                             org.apache.karaf.shell.*;version="[3.0.0,4.1)",
-                             *
-                         </Import-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
     <dependencies>
         <dependency>
             <groupId>org.apache.karaf.shell</groupId>
@@ -45,10 +25,16 @@
             <version>${karaf.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jline</groupId>
+            <artifactId>jline</artifactId>
+            <version>3.5.0</version>
+        </dependency>
         <dependency>
             <groupId>org.jledit</groupId>
             <artifactId>core</artifactId>
             <version>0.2.1</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>

diff --git a/persistence-spi/src/main/java/org/opendaylight/tsdr/spi/util/DataEncrypter.java b/persistence-spi/src/main/java/org/opendaylight/tsdr/spi/util/DataEncrypter.java
index e3ed70ba3738caefba9b0c88df10da24cd6dbd77..e6bab2fd9853166d096e51953830ce923a972396 100644 (file)
--- a/persistence-spi/src/main/java/org/opendaylight/tsdr/spi/util/DataEncrypter.java
+++ b/persistence-spi/src/main/java/org/opendaylight/tsdr/spi/util/DataEncrypter.java
@@ -30,7 +30,7 @@ import javax.crypto.NoSuchPaddingException;
 import javax.crypto.spec.SecretKeySpec;
 import javax.xml.bind.DatatypeConverter;
 import javax.xml.transform.stream.StreamSource;
-import jline.internal.Log;
+import org.jline.utils.Log;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/pom.xml b/pom.xml
index db3ee1a54ac172cabc0e7d99a1234800293bc595..a5fa5fcf05132846c6f88e99bce79a5ea9cce6f2 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
    <parent>
      <groupId>org.opendaylight.odlparent</groupId>
      <artifactId>odlparent-lite</artifactId>
-     <version>2.0.5</version>
+     <version>3.0.2</version>
      <relativePath></relativePath>
    </parent>