Neon MRI version bumps

Change-Id: I5189f2e61f19362306f53980c38eea9e9e88f2c2
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 7e6cca1ccdfa66a0651f69b7622841f09559c6a4..6ae280f08a9889369bc9286cb0d2b600a9da8468 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>3.1.3</version>
+      <version>4.0.2</version>
       <relativePath/>
     </parent>
 

diff --git a/collectors/collector-spi/src/main/java/org/opendaylight/tsdr/collector/spi/RPCFutures.java b/collectors/collector-spi/src/main/java/org/opendaylight/tsdr/collector/spi/RPCFutures.java
index c9d36802481489fc1b78bcc3514612f4d3f1c4c3..5ff6e6a3a83a147c3d5456cf978194730ac187b1 100644 (file)
--- a/collectors/collector-spi/src/main/java/org/opendaylight/tsdr/collector/spi/RPCFutures.java
+++ b/collectors/collector-spi/src/main/java/org/opendaylight/tsdr/collector/spi/RPCFutures.java
@@ -11,6 +11,7 @@ import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.slf4j.Logger;
 
@@ -23,6 +24,7 @@ public final class RPCFutures {
     private RPCFutures() {
     }
 
+    @SuppressFBWarnings("SLF4J_LOGGER_SHOULD_BE_PRIVATE")
     public static <T> void logResult(ListenableFuture<RpcResult<T>> future, String rpc, Logger logger) {
         Futures.addCallback(future, new FutureCallback<RpcResult<T>>() {
             @Override

diff --git a/collectors/collector-spi/src/main/resources/org/opendaylight/blueprint/collector-spi.xml b/collectors/collector-spi/src/main/resources/OSGI-INF/blueprint/collector-spi.xml
similarity index 100%
rename from collectors/collector-spi/src/main/resources/org/opendaylight/blueprint/collector-spi.xml
rename to collectors/collector-spi/src/main/resources/OSGI-INF/blueprint/collector-spi.xml

diff --git a/collectors/controller-metrics-collector/pom.xml b/collectors/controller-metrics-collector/pom.xml
index 3d49dfb87deb2a32597b77444d6d83230eaff088..c26e5866e26dc09bcb53d95fd25814cdbaf9f878 100644 (file)
--- a/collectors/controller-metrics-collector/pom.xml
+++ b/collectors/controller-metrics-collector/pom.xml
@@ -31,7 +31,7 @@
     <dependency>
       <groupId>org.fusesource</groupId>
       <artifactId>sigar</artifactId>
-      <version>${sigar.version}</version>
+      <version>1.6.4</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.tsdr</groupId>

diff --git a/collectors/controller-metrics-collector/src/main/resources/org/opendaylight/blueprint/controller-metrics-collector.xml b/collectors/controller-metrics-collector/src/main/resources/OSGI-INF/blueprint/controller-metrics-collector.xml
similarity index 100%
rename from collectors/controller-metrics-collector/src/main/resources/org/opendaylight/blueprint/controller-metrics-collector.xml
rename to collectors/controller-metrics-collector/src/main/resources/OSGI-INF/blueprint/controller-metrics-collector.xml

diff --git a/collectors/log-collector/pom.xml b/collectors/log-collector/pom.xml
index 5fb0380d7ee680104481f13d5c5f3c030b72707a..e434f6ad6607d37eef0cff94c44aeee4a1d8a137 100644 (file)
--- a/collectors/log-collector/pom.xml
+++ b/collectors/log-collector/pom.xml
@@ -15,11 +15,6 @@
          build failure. Please do not modify this unless you have a good reason. -->
   <name>ODL :: tsdr :: ${project.artifactId}</name>
   <dependencies>
-    <dependency>
-      <groupId>org.fusesource</groupId>
-      <artifactId>sigar</artifactId>
-      <version>${sigar.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.tsdr</groupId>
       <artifactId>tsdr-collector-spi</artifactId>

diff --git a/collectors/log-collector/src/main/resources/org/opendaylight/blueprint/log-collector.xml b/collectors/log-collector/src/main/resources/OSGI-INF/blueprint/log-collector.xml
similarity index 100%
rename from collectors/log-collector/src/main/resources/org/opendaylight/blueprint/log-collector.xml
rename to collectors/log-collector/src/main/resources/OSGI-INF/blueprint/log-collector.xml

diff --git a/collectors/netflow-statistics-collector/src/main/resources/org/opendaylight/blueprint/netflow-statistics-collector.xml b/collectors/netflow-statistics-collector/src/main/resources/OSGI-INF/blueprint/netflow-statistics-collector.xml
similarity index 100%
rename from collectors/netflow-statistics-collector/src/main/resources/org/opendaylight/blueprint/netflow-statistics-collector.xml
rename to collectors/netflow-statistics-collector/src/main/resources/OSGI-INF/blueprint/netflow-statistics-collector.xml

diff --git a/collectors/openflow-statistics-collector/pom.xml b/collectors/openflow-statistics-collector/pom.xml
index e6791959e31c9b0f95714353b812b1932bf0ad1c..ad40e57c795f412a518767be8d10299650c557e8 100644 (file)
--- a/collectors/openflow-statistics-collector/pom.xml
+++ b/collectors/openflow-statistics-collector/pom.xml
@@ -40,12 +40,12 @@
     <dependency>
       <groupId>org.opendaylight.openflowplugin.model</groupId>
       <artifactId>model-flow-service</artifactId>
-      <version>${model.flow.statistics}</version>
+      <version>0.8.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin.model</groupId>
       <artifactId>model-flow-statistics</artifactId>
-      <version>${model.flow.statistics}</version>
+      <version>0.8.0-SNAPSHOT</version>
      </dependency>
      <dependency>
        <groupId>org.mockito</groupId>

diff --git a/collectors/openflow-statistics-collector/src/main/resources/org/opendaylight/blueprint/openflow-statistics-collector.xml b/collectors/openflow-statistics-collector/src/main/resources/OSGI-INF/blueprint/openflow-statistics-collector.xml
similarity index 100%
rename from collectors/openflow-statistics-collector/src/main/resources/org/opendaylight/blueprint/openflow-statistics-collector.xml
rename to collectors/openflow-statistics-collector/src/main/resources/OSGI-INF/blueprint/openflow-statistics-collector.xml

diff --git a/collectors/openflow-statistics-collector/src/test/java/org/opendaylight/tsdr/datacollection/DataCollectionTest.java b/collectors/openflow-statistics-collector/src/test/java/org/opendaylight/tsdr/datacollection/DataCollectionTest.java
index 21dcb116564b4f26baefb6f2727fc8985f25177c..6d0fc1b63251ae05869b1f1ff93b2852e7ac2a40 100644 (file)
--- a/collectors/openflow-statistics-collector/src/test/java/org/opendaylight/tsdr/datacollection/DataCollectionTest.java
+++ b/collectors/openflow-statistics-collector/src/test/java/org/opendaylight/tsdr/datacollection/DataCollectionTest.java
@@ -10,7 +10,7 @@ package org.opendaylight.tsdr.datacollection;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.after;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.doReturn;
@@ -137,7 +137,7 @@ public class DataCollectionTest extends AbstractConcurrentDataBrokerTest {
         AtomicReference<CountDownLatch> storeMetricsLatchRef = new AtomicReference<>(new CountDownLatch(2));
         AtomicBoolean storeMetricsContinue = new AtomicBoolean();
         doAnswer(invocation -> {
-            metricRecords.addAll(invocation.getArgumentAt(0, InsertTSDRMetricRecordInput.class).getTSDRMetricRecord());
+            metricRecords.addAll(((InsertTSDRMetricRecordInput) invocation.getArgument(0)).getTSDRMetricRecord());
             CountDownLatch storeMetricsLatch = storeMetricsLatchRef.get();
             storeMetricsLatch.countDown();
             if (storeMetricsLatch.getCount() == 0) {

diff --git a/collectors/restconf-collector/src/main/resources/org/opendaylight/blueprint/restconf-collector.xml b/collectors/restconf-collector/src/main/resources/OSGI-INF/blueprint/restconf-collector.xml
similarity index 100%
rename from collectors/restconf-collector/src/main/resources/org/opendaylight/blueprint/restconf-collector.xml
rename to collectors/restconf-collector/src/main/resources/OSGI-INF/blueprint/restconf-collector.xml

diff --git a/collectors/snmp-data-collector/pom.xml b/collectors/snmp-data-collector/pom.xml
index 7624d5231c981a0c064d2559099785029d7cc520..173e1356c058b14e390f98e636202120befea325 100755 (executable)
--- a/collectors/snmp-data-collector/pom.xml
+++ b/collectors/snmp-data-collector/pom.xml
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>org.opendaylight.snmp</groupId>
       <artifactId>snmp</artifactId>
-      <version>${snmp.version}</version>
+      <version>1.7.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix.bundles</groupId>

diff --git a/collectors/snmp-data-collector/src/main/resources/org/opendaylight/blueprint/snmp-data-collector.xml b/collectors/snmp-data-collector/src/main/resources/OSGI-INF/blueprint/snmp-data-collector.xml
similarity index 100%
rename from collectors/snmp-data-collector/src/main/resources/org/opendaylight/blueprint/snmp-data-collector.xml
rename to collectors/snmp-data-collector/src/main/resources/OSGI-INF/blueprint/snmp-data-collector.xml

diff --git a/collectors/syslog-collector/src/main/resources/org/opendaylight/blueprint/syslog-collector.xml b/collectors/syslog-collector/src/main/resources/OSGI-INF/blueprint/syslog-collector.xml
similarity index 100%
rename from collectors/syslog-collector/src/main/resources/org/opendaylight/blueprint/syslog-collector.xml
rename to collectors/syslog-collector/src/main/resources/OSGI-INF/blueprint/syslog-collector.xml

diff --git a/datapurge/pom.xml b/datapurge/pom.xml
index c300b2f53859b28193042c5a01711fd37c110e47..5dfa76380960c85541a52a68bc37f08eb1ea476c 100644 (file)
--- a/datapurge/pom.xml
+++ b/datapurge/pom.xml
@@ -84,7 +84,7 @@
      <dependency>
        <groupId>com.google.protobuf</groupId>
        <artifactId>protobuf-java</artifactId>
-       <version>${protobuf.version}</version>
+       <version>2.4.1</version>
      </dependency>
       <dependency>
       <groupId>junit</groupId>

diff --git a/datapurge/src/main/java/org/opendaylight/tsdr/datapurge/PurgeDataTask.java b/datapurge/src/main/java/org/opendaylight/tsdr/datapurge/PurgeDataTask.java
index 0f5c720662bcaed8d12e9ad4e15201a0182ae806..17cc6e2c41a5154e41dd5d75904a6efd15e13e5d 100644 (file)
--- a/datapurge/src/main/java/org/opendaylight/tsdr/datapurge/PurgeDataTask.java
+++ b/datapurge/src/main/java/org/opendaylight/tsdr/datapurge/PurgeDataTask.java
@@ -61,7 +61,7 @@ public class PurgeDataTask implements Runnable {
         Futures.addCallback(future, new FutureCallback<RpcResult<PurgeAllTSDRRecordOutput>>() {
             @Override
             public void onSuccess(RpcResult<PurgeAllTSDRRecordOutput> result) {
-                LOG.debug("RPC purgeAllTSDRRecord returned result {]", result);
+                LOG.debug("RPC purgeAllTSDRRecord returned result {}", result);
             }
 
             @Override

diff --git a/datapurge/src/main/resources/org/opendaylight/blueprint/tsdr-datapurge.xml b/datapurge/src/main/resources/OSGI-INF/blueprint/tsdr-datapurge.xml
similarity index 100%
rename from datapurge/src/main/resources/org/opendaylight/blueprint/tsdr-datapurge.xml
rename to datapurge/src/main/resources/OSGI-INF/blueprint/tsdr-datapurge.xml

diff --git a/dataquery/pom.xml b/dataquery/pom.xml
index 08fc5927f2f3dfd90ddecfe4c7af6d5b2476c8fd..26220e3ba16d1969cfb37ade26334a191da87004 100644 (file)
--- a/dataquery/pom.xml
+++ b/dataquery/pom.xml
@@ -74,13 +74,11 @@
     <dependency>
       <groupId>org.glassfish.jersey.test-framework.providers</groupId>
       <artifactId>jersey-test-framework-provider-grizzly2</artifactId>
-      <version>2.6</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.glassfish.jersey.bundles.repackaged</groupId>
       <artifactId>jersey-guava</artifactId>
-      <version>2.6</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/dataquery/src/main/java/org/opendaylight/tsdr/dataquery/TSDRNbiServiceImpl.java b/dataquery/src/main/java/org/opendaylight/tsdr/dataquery/TSDRNbiServiceImpl.java
index 56cf9d0ca880a6115a8a00502a14be394bf01a94..023fa61ba5b526b7590b51c4b7c949fe5ec38cfc 100644 (file)
--- a/dataquery/src/main/java/org/opendaylight/tsdr/dataquery/TSDRNbiServiceImpl.java
+++ b/dataquery/src/main/java/org/opendaylight/tsdr/dataquery/TSDRNbiServiceImpl.java
@@ -44,7 +44,7 @@ import org.slf4j.LoggerFactory;
  */
 @Singleton
 public class TSDRNbiServiceImpl implements TSDRDataqueryImplService {
-    private static Logger LOG = LoggerFactory.getLogger(TSDRNbiServiceImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(TSDRNbiServiceImpl.class);
 
     private final TsdrMetricDataService metricDataService;
     private final TsdrLogDataService logDataService;
@@ -106,7 +106,7 @@ public class TSDRNbiServiceImpl implements TSDRDataqueryImplService {
         Futures.addCallback(future, new FutureCallback<RpcResult<T>>() {
             @Override
             public void onSuccess(RpcResult<T> result) {
-                LOG.debug("RPC {} returned result {]", rpc, result);
+                LOG.debug("RPC {} returned result {}", rpc, result);
             }
 
             @Override

diff --git a/dataquery/src/main/java/org/opendaylight/tsdr/dataquery/rest/query/TSDRLogQueryAPI.java b/dataquery/src/main/java/org/opendaylight/tsdr/dataquery/rest/query/TSDRLogQueryAPI.java
index 12493a5597bc8be7521790c15807c57767fdd3a2..93ba003e666ba8cf4bddcfd038bbc14d22bc7c16 100644 (file)
--- a/dataquery/src/main/java/org/opendaylight/tsdr/dataquery/rest/query/TSDRLogQueryAPI.java
+++ b/dataquery/src/main/java/org/opendaylight/tsdr/dataquery/rest/query/TSDRLogQueryAPI.java
@@ -77,7 +77,6 @@ public class TSDRLogQueryAPI {
             input.setStartTime(TSDRNbiRestAPI.getTimeFromString(fromString));
         } catch (NumberFormatException ex) {
             String errStr = "Invalid request format. Cannot parse start time == " + fromString;
-            LOG.error(errStr);
             return Response.status(Response.Status.BAD_REQUEST).entity(toJson(errStr)).build();
         }
 
@@ -85,7 +84,6 @@ public class TSDRLogQueryAPI {
             input.setEndTime(TSDRNbiRestAPI.getTimeFromString(untilString));
         } catch (NumberFormatException ex) {
             String errStr = "Invalid request format. Cannot parse end time == " + untilString;
-            LOG.error(errStr);
             return Response.status(Response.Status.BAD_REQUEST).entity(toJson(errStr)).build();
         }
 
@@ -93,7 +91,6 @@ public class TSDRLogQueryAPI {
 
         if (metric == null || !metric.get().isSuccessful()) {
             String errStr = "Error retrieving metrics from " + fromString + " to " + untilString;
-            LOG.error(errStr);
             return Response.status(Status.SERVICE_UNAVAILABLE).entity(errStr).build();
         }
 

diff --git a/dataquery/src/main/java/org/opendaylight/tsdr/dataquery/rest/query/TSDRMetricsQueryAPI.java b/dataquery/src/main/java/org/opendaylight/tsdr/dataquery/rest/query/TSDRMetricsQueryAPI.java
index cc4b7b0ee323d3b9ef796ff6b3a3f96ad8ba0902..827ef05fec675ada51de7515553fd9e31f8dd49d 100644 (file)
--- a/dataquery/src/main/java/org/opendaylight/tsdr/dataquery/rest/query/TSDRMetricsQueryAPI.java
+++ b/dataquery/src/main/java/org/opendaylight/tsdr/dataquery/rest/query/TSDRMetricsQueryAPI.java
@@ -84,7 +84,6 @@ public class TSDRMetricsQueryAPI {
             from = TSDRNbiRestAPI.getTimeFromString(fromString);
         } catch (NumberFormatException ex) {
             String errStr = "Invalid request format. Cannot parse start time == " + fromString;
-            LOG.error(errStr);
             return Response.status(Status.BAD_REQUEST).entity(toJson(errStr)).build();
         }
 
@@ -92,7 +91,6 @@ public class TSDRMetricsQueryAPI {
             until = TSDRNbiRestAPI.getTimeFromString(untilString);
         } catch (NumberFormatException ex) {
             String errStr = "Invalid request format. Cannot parse end time == " + untilString;
-            LOG.error(errStr);
             return Response.status(Status.BAD_REQUEST).entity(toJson(errStr)).build();
         }
 
@@ -103,7 +101,6 @@ public class TSDRMetricsQueryAPI {
                 maxDataPoints = Long.parseLong(request.getMaxDataPoints());
             } catch (NumberFormatException ex) {
                 String errStr = "Invalid request format. Cannot parse maxDataPoints == " + request.getMaxDataPoints();
-                LOG.error(errStr);
                 return Response.status(Status.BAD_REQUEST).entity(toJson(errStr)).build();
             }
 
@@ -119,7 +116,6 @@ public class TSDRMetricsQueryAPI {
 
             if (metric == null || !metric.get().isSuccessful()) {
                 String errStr = "Error retrieving aggregated metrics from " + fromString + " to " + untilString;
-                LOG.error(errStr);
                 return Response.status(Status.OK).entity(errStr).build();
             }
 
@@ -137,7 +133,6 @@ public class TSDRMetricsQueryAPI {
 
             if (metric == null || !metric.get().isSuccessful()) {
                 String errStr = "Error retrieving metrics from " + fromString + " to " + untilString;
-                LOG.error(errStr);
                 return Response.status(Status.BAD_REQUEST).entity(errStr).build();
             }
 

diff --git a/dataquery/src/main/resources/org/opendaylight/blueprint/tsdr-dataquery.xml b/dataquery/src/main/resources/OSGI-INF/blueprint/tsdr-dataquery.xml
similarity index 100%
rename from dataquery/src/main/resources/org/opendaylight/blueprint/tsdr-dataquery.xml
rename to dataquery/src/main/resources/OSGI-INF/blueprint/tsdr-dataquery.xml

diff --git a/datastorage/pom.xml b/datastorage/pom.xml
index e6a079643f963624f866328520665400bc7abea9..1c8bf7ca83be12b8107e1322a43ec0f612febfde 100644 (file)
--- a/datastorage/pom.xml
+++ b/datastorage/pom.xml
@@ -21,17 +21,6 @@
       </resource>
     </resources>
     <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <!--Export-Package>org.opendaylight.tsdr.datastorage.*,org.opendaylight.controller.config.yang.config.TSDR_datastorage.impl.*</Export-Package>
-            <Import-Package>*</Import-Package-->
-          </instructions>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.aries.blueprint</groupId>
         <artifactId>blueprint-maven-plugin</artifactId>

diff --git a/datastorage/src/main/resources/org/opendaylight/blueprint/tsdr-datastorage.xml b/datastorage/src/main/resources/OSGI-INF/blueprint/tsdr-datastorage.xml
similarity index 100%
rename from datastorage/src/main/resources/org/opendaylight/blueprint/tsdr-datastorage.xml
rename to datastorage/src/main/resources/OSGI-INF/blueprint/tsdr-datastorage.xml

diff --git a/features/features-tsdr/pom.xml b/features/features-tsdr/pom.xml
index aa3785dd3b9f2559f15ec0f521d72a0e6ee37db7..b347f655de095631122cba90171f118d6405ecbe 100644 (file)
--- a/features/features-tsdr/pom.xml
+++ b/features/features-tsdr/pom.xml
@@ -12,7 +12,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>3.1.3</version>
+        <version>4.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-hbaseclient/pom.xml b/features/odl-hbaseclient/pom.xml
index 3621ab5ab0588878d733574c803760c78b36ae11..3b3fa5216c3240c4cf77de90bd9559f1c8612cd7 100644 (file)
--- a/features/odl-hbaseclient/pom.xml
+++ b/features/odl-hbaseclient/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.3</version>
+        <version>4.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-tsdr-cassandra/pom.xml b/features/odl-tsdr-cassandra/pom.xml
index f840c2c5c3781b1e6df2e5f53170bd58fa04d756..8b65a6f2a84ebe476ba5274a43c5cdbe3542a16e 100644 (file)
--- a/features/odl-tsdr-cassandra/pom.xml
+++ b/features/odl-tsdr-cassandra/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.3</version>
+        <version>4.0.2</version>
         <relativePath/>
     </parent>
 
@@ -17,7 +17,6 @@
          build failure. Please do not modify this unless you have a good reason. -->
     <name>ODL :: tsdr :: Cassandra</name>
     <properties>
-        <com.datastax.cassandra.version>3.2.0</com.datastax.cassandra.version>
         <guava.old.version>19.0</guava.old.version>
     </properties>
 
@@ -57,14 +56,17 @@
         <dependency>
             <groupId>com.datastax.cassandra</groupId>
             <artifactId>cassandra-driver-core</artifactId>
-            <version>${com.datastax.cassandra.version}</version>
-     </dependency>
-     <dependency>
-        <groupId>com.google.guava</groupId>
-        <artifactId>guava</artifactId>
-        <version>${guava.old.version}</version>
-     </dependency>
-
-
+            <version>3.2.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm</artifactId>
+            <version>5.0.3</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>${guava.old.version}</version>
+         </dependency>
     </dependencies>
 </project>

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

diff --git a/features/odl-tsdr-core/pom.xml b/features/odl-tsdr-core/pom.xml
index 7b3dbf2d47ccec1306bd9b7d801e9d6a08dd70aa..7f04d4c3466e2f580378c3e5b9ae7c36de954950 100644 (file)
--- a/features/odl-tsdr-core/pom.xml
+++ b/features/odl-tsdr-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.3</version>
+        <version>4.0.2</version>
         <relativePath/>
     </parent>
 
@@ -16,13 +16,6 @@
     <!-- <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.8.0-SNAPSHOT</openflowplugin.version>
-        <mdsal.model.version>0.14.0-SNAPSHOT</mdsal.model.version>
-        <mdsal.common.version>2.6.0-SNAPSHOT</mdsal.common.version>
-        <restconf.version>1.9.0-SNAPSHOT</restconf.version>
-        <controller.mdsal.version>1.9.0-SNAPSHOT</controller.mdsal.version>
-    </properties>
 
     <dependencyManagement>
         <dependencies>
@@ -38,7 +31,7 @@
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>${controller.mdsal.version}</version>
+                <version>1.9.0-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -46,22 +39,15 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>${mdsal.common.version}</version>
+                <version>3.0.1</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>${mdsal.model.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
             <!-- ODL-NETCONF/RESTCONF-ARTIFACTS -->
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
                 <artifactId>restconf-artifacts</artifactId>
-                <version>${restconf.version}</version>
+                <version>1.9.0-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -80,7 +66,6 @@
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>odl-restconf-all</artifactId>
-            <version>${restconf.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>

diff --git a/features/odl-tsdr-elasticsearch/pom.xml b/features/odl-tsdr-elasticsearch/pom.xml
index 8aa5789c384395988f32a5ab0e07b2ab5815201b..a7a3ce4e592d68b24ffbf4b069ad4f8f01443977 100644 (file)
--- a/features/odl-tsdr-elasticsearch/pom.xml
+++ b/features/odl-tsdr-elasticsearch/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.3</version>
+        <version>4.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-tsdr-hbase/pom.xml b/features/odl-tsdr-hbase/pom.xml
index 647b4f73ac3172cc8728a251e107a37fc19406cd..201001948c593a9bba9d950b265f40d92684d19d 100644 (file)
--- a/features/odl-tsdr-hbase/pom.xml
+++ b/features/odl-tsdr-hbase/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.3</version>
+        <version>4.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-tsdr-hsqldb-all/pom.xml b/features/odl-tsdr-hsqldb-all/pom.xml
index d19fcfce3354fca73a7d3ad27337d5d2f85368e2..05172be11f7d5726e31c9534e2b796e8af1244b8 100644 (file)
--- a/features/odl-tsdr-hsqldb-all/pom.xml
+++ b/features/odl-tsdr-hsqldb-all/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.3</version>
+        <version>4.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-tsdr-hsqldb/pom.xml b/features/odl-tsdr-hsqldb/pom.xml
index c05ce7f4ff3570e3f84bbad6bd9cb1e1f1404a41..ac203191cbb5c708cd1c6b0636ae3a984da5e040 100644 (file)
--- a/features/odl-tsdr-hsqldb/pom.xml
+++ b/features/odl-tsdr-hsqldb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.3</version>
+        <version>4.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-tsdr-log-collector/pom.xml b/features/odl-tsdr-log-collector/pom.xml
index 7c4e8c28c30dc8fde03fab235a9aaa3f8fb7e349..c006734bcadbe9b6ad39d45de181774372a55f1c 100644 (file)
--- a/features/odl-tsdr-log-collector/pom.xml
+++ b/features/odl-tsdr-log-collector/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.3</version>
+        <version>4.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 d15f8d806e41ede7edd67bffce0ca5d95eac2d3c..02d2f06546089952f95530b4e82725790133d306 100644 (file)
--- a/features/odl-tsdr-netflow-statistics-collector/pom.xml
+++ b/features/odl-tsdr-netflow-statistics-collector/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.3</version>
+        <version>4.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 635989f9795943a3ecad85608a7812a72456202f..96eea5753de44c1e1f62662bf9ce4ddb9174531e 100644 (file)
--- a/features/odl-tsdr-openflow-statistics-collector/pom.xml
+++ b/features/odl-tsdr-openflow-statistics-collector/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.3</version>
+        <version>4.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-tsdr-restconf-collector/pom.xml b/features/odl-tsdr-restconf-collector/pom.xml
index 0d97b6eef1a05f13910176e0889bf60844e43c73..24c3cb0ce661abf975819b6bdf2a147b4ad39687 100644 (file)
--- a/features/odl-tsdr-restconf-collector/pom.xml
+++ b/features/odl-tsdr-restconf-collector/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.3</version>
+        <version>4.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-tsdr-syslog-collector/pom.xml b/features/odl-tsdr-syslog-collector/pom.xml
index 0c6706ae1160d347cfeca2222e90b19f0b77b122..fa7cf74288f6de70c845c1fb9e0a5445e30e2317 100644 (file)
--- a/features/odl-tsdr-syslog-collector/pom.xml
+++ b/features/odl-tsdr-syslog-collector/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.3</version>
+        <version>4.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/pom.xml b/features/pom.xml
index aa0266eb9c9283d21b8dcb35344877c266fc81c1..205a3ebe99f9482cc830c4fafd7dc68e644f23b1 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>3.1.3</version>
+        <version>4.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 72899898f748d21ff05461cc65ea4ffa30fb833e..d33aed5e8109943862158e69b7bd2974f7982b52 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>3.1.3</version>
+    <version>4.0.2</version>
   </parent>
 
   <groupId>org.opendaylight.tsdr</groupId>

diff --git a/parent/pom.xml b/parent/pom.xml
index 2d0f4838d5583b7034d1f77117d695973029d750..a09e8d1607f4acab80fd1371050294d495bd31d1 100644 (file)
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -10,7 +10,7 @@
   <parent>
       <groupId>org.opendaylight.mdsal</groupId>
       <artifactId>binding-parent</artifactId>
-      <version>0.14.0-SNAPSHOT</version>
+      <version>3.0.1</version>
       <relativePath/>
   </parent>
 
@@ -21,36 +21,22 @@
     <packaging>pom</packaging>
     <name>ODL :: tsdr :: ${project.artifactId}</name>
 
-    <properties>
-        <mdsal.java.binding.version>0.14.0-SNAPSHOT</mdsal.java.binding.version>
-        <mdsal.model.version>0.14.0-SNAPSHOT</mdsal.model.version>
-        <config.version>0.10.0-SNAPSHOT</config.version>
-        <controller.mdsal.version>1.9.0-SNAPSHOT</controller.mdsal.version>
-        <snmp.version>1.7.0-SNAPSHOT</snmp.version>
-        <guava.old.version>19.0</guava.old.version>
-        <hbase.version>0.94.15</hbase.version>
-        <hadoop.version>1.2.0</hadoop.version>
-        <model.flow.statistics>0.8.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.10.6.Final</io.netty.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>
-        <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>
+                <version>1.9.0-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>3.0.1</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -65,12 +51,6 @@
       <artifactId>javax.inject</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.ops4j.pax.cdi</groupId>
-      <artifactId>pax-cdi-api</artifactId>
-      <optional>true</optional>
-    </dependency>
-
     <!-- Testing Dependencies -->
     <dependency>
       <groupId>junit</groupId>
@@ -101,7 +81,7 @@
           <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
             <artifactId>findbugs</artifactId>
-            <version>3.1.3</version>
+            <version>4.0.2</version>
           </dependency>
         </dependencies>
         <configuration>

diff --git a/persistence-cassandra/pom.xml b/persistence-cassandra/pom.xml
index fa24352aa8d376631ca546b56596747fa4011d2e..a69b7ce2f635b0eecdc38aa9fb85bd7606ae495a 100644 (file)
--- a/persistence-cassandra/pom.xml
+++ b/persistence-cassandra/pom.xml
@@ -14,9 +14,6 @@
     <!-- <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>
-  <properties>
-    <com.datastax.cassandra.version>3.2.0</com.datastax.cassandra.version>
-  </properties>
   <build>
     <plugins>
       <plugin>
@@ -75,12 +72,12 @@
     <dependency>
       <groupId>com.codahale.metrics</groupId>
       <artifactId>metrics-core</artifactId>
-      <version>${com.codahale.metrics.version}</version>
+      <version>3.0.2</version>
     </dependency>
     <dependency>
       <groupId>io.netty</groupId>
       <artifactId>netty</artifactId>
-      <version>${io.netty.version}</version>
+      <version>3.10.6.Final</version>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
@@ -89,7 +86,7 @@
     <dependency>
       <groupId>com.datastax.cassandra</groupId>
       <artifactId>cassandra-driver-core</artifactId>
-      <version>${com.datastax.cassandra.version}</version>
+      <version>3.2.0</version>
     </dependency>
   </dependencies>
 </project>

diff --git a/persistence-cassandra/src/main/java/org/opendaylight/tsdr/persistence/cassandra/CassandraStore.java b/persistence-cassandra/src/main/java/org/opendaylight/tsdr/persistence/cassandra/CassandraStore.java
index c2dad24a600ebba11e3af5009a00bb1a69fc9830..a828fa4f58272399da223533dd65dd005f02f270 100644 (file)
--- a/persistence-cassandra/src/main/java/org/opendaylight/tsdr/persistence/cassandra/CassandraStore.java
+++ b/persistence-cassandra/src/main/java/org/opendaylight/tsdr/persistence/cassandra/CassandraStore.java
@@ -108,7 +108,7 @@ public class CassandraStore implements AutoCloseable {
         boolean isMaster = Boolean.parseBoolean(config.get("master"));
         int replicationFactor = Integer.parseInt(config.get("replication_factor"));
 
-        LOG.info("Trying to work with " + host + ", Which cassandra master is set to=" + isMaster);
+        LOG.info("Trying to work with {}, Which cassandra master is set to {}", host, isMaster);
         Cluster cluster = Cluster.builder().addContactPoint(host).build();
 
         // Try 5 times to connect to cassandra with a 5 seconds delay

diff --git a/persistence-cassandra/src/main/resources/org/opendaylight/blueprint/persistence-cassandra.xml b/persistence-cassandra/src/main/resources/OSGI-INF/blueprint/persistence-cassandra.xml
similarity index 100%
rename from persistence-cassandra/src/main/resources/org/opendaylight/blueprint/persistence-cassandra.xml
rename to persistence-cassandra/src/main/resources/OSGI-INF/blueprint/persistence-cassandra.xml

diff --git a/persistence-elasticsearch/pom.xml b/persistence-elasticsearch/pom.xml
index 22cdc5c4d7001ecad9549812f6c5da878661995e..94de5314d7dacfdecec227b3fda382073c79cc99 100644 (file)
--- a/persistence-elasticsearch/pom.xml
+++ b/persistence-elasticsearch/pom.xml
@@ -101,7 +101,7 @@
     <dependency>
       <groupId>io.searchbox</groupId>
       <artifactId>jest</artifactId>
-      <version>${jest.version}</version>
+      <version>2.0.3</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.tsdr</groupId>
@@ -133,23 +133,6 @@
       <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-module-junit4</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <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-elasticsearch/src/main/java/org/opendaylight/tsdr/persistence/elasticsearch/ElasticSearchStore.java b/persistence-elasticsearch/src/main/java/org/opendaylight/tsdr/persistence/elasticsearch/ElasticSearchStore.java
index e2caa6b1b16f9a4ce5ef8a393d3ee2a6d62b5286..d77780c692d8b9372da3d5ba345ae48f143b0abe 100644 (file)
--- a/persistence-elasticsearch/src/main/java/org/opendaylight/tsdr/persistence/elasticsearch/ElasticSearchStore.java
+++ b/persistence-elasticsearch/src/main/java/org/opendaylight/tsdr/persistence/elasticsearch/ElasticSearchStore.java
@@ -123,7 +123,7 @@ public class ElasticSearchStore extends AbstractScheduledService implements Auto
                         + name + "_mapping.json");
                 json = Files.asCharSource(file, StandardCharsets.UTF_8).read();
             } catch (IOException | IllegalArgumentException e) {
-                LOGGER.error("Mapping for {} cannot be set: {}", name, e);
+                LOGGER.error("Mapping for {} cannot be set", name, e);
                 LOGGER.warn("Using the default mapping strategy for {} type "
                         + "that may result it suboptimal types representation", name);
             }
@@ -197,7 +197,7 @@ public class ElasticSearchStore extends AbstractScheduledService implements Auto
             }
             return result;
         } catch (IOException ioe) {
-            LOGGER.error("Failed to execute action {}, cause: {}", action, ioe);
+            LOGGER.error("Failed to execute action {}", action, ioe);
         }
         return null;
     }
@@ -221,7 +221,7 @@ public class ElasticSearchStore extends AbstractScheduledService implements Auto
 
             @Override
             public void failed(Exception ex) {
-                LOGGER.error("Failed to execute action: {}, cause: {}", action, ex);
+                LOGGER.error("Failed to execute action: {}", action, ex);
             }
         });
     }
@@ -239,7 +239,7 @@ public class ElasticSearchStore extends AbstractScheduledService implements Auto
                         RecordType type = RecordType.resolve(r);
                         bulk.addAction(new Index.Builder(r).index(INDEX).type(type.name).build());
                     } catch (IllegalArgumentException iae) {
-                        LOGGER.error("Cannot resolve type: {}, {}", r, iae);
+                        LOGGER.error("Cannot resolve type: {}", r, iae);
                     }
                 }
                 BulkResult result = execute(bulk.build());

diff --git a/persistence-elasticsearch/src/main/java/org/opendaylight/tsdr/persistence/elasticsearch/TsdrElasticSearchPersistenceServiceImpl.java b/persistence-elasticsearch/src/main/java/org/opendaylight/tsdr/persistence/elasticsearch/TsdrElasticSearchPersistenceServiceImpl.java
index 3c6903319ec8986d429d27af37fd87f2ed36461c..0bc43878841c128c9e59ec4e3721a56b5f7de055 100644 (file)
--- a/persistence-elasticsearch/src/main/java/org/opendaylight/tsdr/persistence/elasticsearch/TsdrElasticSearchPersistenceServiceImpl.java
+++ b/persistence-elasticsearch/src/main/java/org/opendaylight/tsdr/persistence/elasticsearch/TsdrElasticSearchPersistenceServiceImpl.java
@@ -48,7 +48,7 @@ public class TsdrElasticSearchPersistenceServiceImpl implements TSDRMetricPersis
         try {
             store.store(record);
         } catch (IllegalStateException ise) {
-            LOGGER.error("Cannot store the record: {}, cause: {}", record, ise);
+            LOGGER.error("Cannot store the record: {}", record, ise);
         }
     }
 
@@ -56,7 +56,7 @@ public class TsdrElasticSearchPersistenceServiceImpl implements TSDRMetricPersis
         try {
             store.storeAll(records);
         } catch (IllegalStateException ise) {
-            LOGGER.error("Cannot store the records: {}, cause: {}", records.toArray(), ise);
+            LOGGER.error("Cannot store the records: {}", records.toArray(), ise);
         }
     }
 

diff --git a/persistence-elasticsearch/src/main/resources/org/opendaylight/blueprint/persistence-elasticsearch.xml b/persistence-elasticsearch/src/main/resources/OSGI-INF/blueprint/persistence-elasticsearch.xml
similarity index 100%
rename from persistence-elasticsearch/src/main/resources/org/opendaylight/blueprint/persistence-elasticsearch.xml
rename to persistence-elasticsearch/src/main/resources/OSGI-INF/blueprint/persistence-elasticsearch.xml

diff --git a/persistence-elasticsearch/src/test/java/org/opendaylight/tsdr/persistence/elasticsearch/ElasticSearchStoreTest.java b/persistence-elasticsearch/src/test/java/org/opendaylight/tsdr/persistence/elasticsearch/ElasticSearchStoreTest.java
index ee2ae155421b739ab0f3aa3cd8984686f1b388e6..fed67a5650298c3d60e6fa41c889296cb2ae362f 100644 (file)
--- a/persistence-elasticsearch/src/test/java/org/opendaylight/tsdr/persistence/elasticsearch/ElasticSearchStoreTest.java
+++ b/persistence-elasticsearch/src/test/java/org/opendaylight/tsdr/persistence/elasticsearch/ElasticSearchStoreTest.java
@@ -163,7 +163,7 @@ public class ElasticSearchStoreTest {
                 0L,
                 1000);
         assertThat(result).isEqualTo(Collections.emptyList());
-        Mockito.verify(CLIENT, Mockito.atLeastOnce()).execute(Mockito.any(Bulk.class));
+        Mockito.verify(CLIENT, Mockito.atLeastOnce()).execute(Mockito.any());
     }
 
     /**

diff --git a/persistence-hbase/pom.xml b/persistence-hbase/pom.xml
index 9d6c5f542931a1c7bee9e1a2f7865213deebd3f2..8d352f1ff923cc10517871119bd4926bf7c8aadb 100644 (file)
--- a/persistence-hbase/pom.xml
+++ b/persistence-hbase/pom.xml
@@ -59,12 +59,12 @@
     <dependency>
       <groupId>org.apache.hbase</groupId>
       <artifactId>hbase</artifactId>
-      <version>${hbase.version}</version>
+      <version>0.94.15</version>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-core</artifactId>
-      <version>${hadoop.version}</version>
+      <version>1.2.0</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.tsdr</groupId>

diff --git a/persistence-hbase/src/main/java/org/opendaylight/tsdr/persistence/hbase/CreateTableTask.java b/persistence-hbase/src/main/java/org/opendaylight/tsdr/persistence/hbase/CreateTableTask.java
index b59c488b8a5bec2157308a2d9b270dd8a2827b78..3fc830a798a2f1d73224bb91cb96ad64951ba997 100644 (file)
--- a/persistence-hbase/src/main/java/org/opendaylight/tsdr/persistence/hbase/CreateTableTask.java
+++ b/persistence-hbase/src/main/java/org/opendaylight/tsdr/persistence/hbase/CreateTableTask.java
@@ -76,7 +76,7 @@ class CreateTableTask implements Runnable {
             }
         }
 
-        LOG.info("Exiting createTables() - pending tables count:" + pendingTableNames.size());
+        LOG.info("Exiting createTables() - pending tables count: {}", pendingTableNames.size());
         if (pendingTableNames.isEmpty()) {
             completionFuture.set(null);
         } else {

diff --git a/persistence-hbase/src/main/java/org/opendaylight/tsdr/persistence/hbase/HBaseDataStore.java b/persistence-hbase/src/main/java/org/opendaylight/tsdr/persistence/hbase/HBaseDataStore.java
index 42519d1d2c4458d642616808f8e17d980f90d832..9021c8073081ace24664dadbf6d7726c1a5034c3 100644 (file)
--- a/persistence-hbase/src/main/java/org/opendaylight/tsdr/persistence/hbase/HBaseDataStore.java
+++ b/persistence-hbase/src/main/java/org/opendaylight/tsdr/persistence/hbase/HBaseDataStore.java
@@ -148,7 +148,7 @@ public class HBaseDataStore  {
             }
             if (htablePool != null) {
                 htableResult = htablePool.getTable(tableName);
-                LOG.debug("Obtained connection to table:" + tableName);
+                LOG.debug("Obtained connection to table {}", tableName);
                 htableResult.setAutoFlush(autoFlush);
                 htableResult.setWriteBufferSize(writeBufferSize);
             }
@@ -233,7 +233,7 @@ public class HBaseDataStore  {
             } catch (TableNotFoundException nfe) {
                 throw nfe;
             } catch (IOException ioe) {
-                LOG.error("Cannot put Data into HBase", ioe.getMessage());
+                LOG.error("Cannot put Data into HBase", ioe);
                 closeConnection(entity.getTableName());
                 HConnectionManager.deleteAllConnections();
             } finally {
@@ -295,7 +295,7 @@ public class HBaseDataStore  {
         } catch (TableNotFoundException nfe) {
             throw nfe;
         } catch (IOException ioe) {
-            LOG.error("Cannot put Data into HBase", ioe.getMessage());
+            LOG.error("Cannot put Data into HBase", ioe);
             closeConnection(tableName);
             HConnectionManager.deleteAllConnections();
         } finally {
@@ -564,7 +564,7 @@ public class HBaseDataStore  {
         } catch (TableNotFoundException nfe) {
             throw nfe;
         } catch (IOException ioe) {
-            LOG.error("Deletion from HBase Data Store failed!", ioe.getMessage());
+            LOG.error("Deletion from HBase Data Store failed!", ioe);
             closeConnection(tableName);
             HConnectionManager.deleteAllConnections();
         } finally {

diff --git a/persistence-hbase/src/main/resources/org/opendaylight/blueprint/persistence-hbase.xml b/persistence-hbase/src/main/resources/OSGI-INF/blueprint/persistence-hbase.xml
similarity index 100%
rename from persistence-hbase/src/main/resources/org/opendaylight/blueprint/persistence-hbase.xml
rename to persistence-hbase/src/main/resources/OSGI-INF/blueprint/persistence-hbase.xml

diff --git a/persistence-hbase/src/test/java/org/opendaylight/tsdr/persistence/hbase/HBaseDataStoreTest.java b/persistence-hbase/src/test/java/org/opendaylight/tsdr/persistence/hbase/HBaseDataStoreTest.java
index 0124774c4e6933dfaf1bf29f91edb17ba4b3d40c..5ab30608844f1d11247c8680c874b30a81b6d3d3 100644 (file)
--- a/persistence-hbase/src/test/java/org/opendaylight/tsdr/persistence/hbase/HBaseDataStoreTest.java
+++ b/persistence-hbase/src/test/java/org/opendaylight/tsdr/persistence/hbase/HBaseDataStoreTest.java
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.tsdr.persistence.hbase;
 
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
@@ -326,7 +326,6 @@ public class HBaseDataStoreTest {
 
     @Test(expected = TableNotFoundException.class)
     public void testCreateEntityException() throws TableNotFoundException {
-        HBaseDataStore hbasedatastore1 = null;
         HBaseEntity dentity = new HBaseEntity();
         dentity.setRowKey("rowKey1");
         dentity.setTableName("tableName1");
@@ -339,7 +338,7 @@ public class HBaseDataStoreTest {
         columnList1.add(column);
         dentity.setColumns(columnList1);
 
-        hbasedatastore1 = new HBaseDataStore() {
+        HBaseDataStore hbasedatastore1 = new HBaseDataStore() {
             @Override
             public HTableInterface getConnection(String tableName) throws IOException {
                 throw new IOException();
@@ -368,7 +367,6 @@ public class HBaseDataStoreTest {
 
     @Test(expected = TableNotFoundException.class)
     public void testCreateEntityListException() throws TableNotFoundException {
-        HBaseDataStore hbasedatastore1 = null;
         HBaseEntity dentity = new HBaseEntity();
         dentity.setRowKey("rowKey1");
         dentity.setTableName("tableName1");
@@ -383,7 +381,7 @@ public class HBaseDataStoreTest {
         List<HBaseEntity> entityList = new ArrayList<>();
         entityList.add(dentity);
 
-        hbasedatastore1 = new HBaseDataStore() {
+        HBaseDataStore hbasedatastore1 = new HBaseDataStore() {
             @Override
             public HTableInterface getConnection(String tableName) throws IOException {
                 throw new IOException();

diff --git a/persistence-hsqldb/pom.xml b/persistence-hsqldb/pom.xml
index 699c4854e244bb061e069b374b64d6df6d0a33cd..d6e94f0cdcb210d8fd0f147af40f11514d72876b 100644 (file)
--- a/persistence-hsqldb/pom.xml
+++ b/persistence-hsqldb/pom.xml
@@ -50,10 +50,6 @@
           </instructions>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>yang-maven-plugin</artifactId>
-      </plugin>
       <plugin>
         <groupId>org.apache.aries.blueprint</groupId>
         <artifactId>blueprint-maven-plugin</artifactId>
@@ -64,7 +60,7 @@
     <dependency>
       <groupId>hsqldb</groupId>
       <artifactId>hsqldb</artifactId>
-      <version>${hsqldb.version}</version>
+      <version>1.8.0.10</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.tsdr</groupId>

diff --git a/persistence-impl/src/main/java/org/opendaylight/tsdr/spi/scheduler/impl/SchedulerServiceImpl.java b/persistence-impl/src/main/java/org/opendaylight/tsdr/spi/scheduler/impl/SchedulerServiceImpl.java
index bbc6c18bbc3b1585d34a35f1d13e5d165d702624..8d5d50dec35ebd267c95ba6b9fbd341d491d7db8 100644 (file)
--- a/persistence-impl/src/main/java/org/opendaylight/tsdr/spi/scheduler/impl/SchedulerServiceImpl.java
+++ b/persistence-impl/src/main/java/org/opendaylight/tsdr/spi/scheduler/impl/SchedulerServiceImpl.java
@@ -27,7 +27,7 @@ import org.slf4j.LoggerFactory;
  */
 @Singleton
 public class SchedulerServiceImpl implements SchedulerService {
-    private static final Logger LOG = LoggerFactory.getLogger(SchedulerService.class);
+    private static final Logger LOG = LoggerFactory.getLogger(SchedulerServiceImpl.class);
 
     private static final int THREADS_COUNT = 10;
 

diff --git a/persistence-impl/src/main/resources/org/opendaylight/blueprint/persistence-impl.xml b/persistence-impl/src/main/resources/OSGI-INF/blueprint/persistence-impl.xml
similarity index 100%
rename from persistence-impl/src/main/resources/org/opendaylight/blueprint/persistence-impl.xml
rename to persistence-impl/src/main/resources/OSGI-INF/blueprint/persistence-impl.xml

diff --git a/persistence-spi/pom.xml b/persistence-spi/pom.xml
index ad646d16388edb14a807331c6374ad0a9498e54a..cd66c90a9b9ea0242ce3359f10ead2b0362f5545 100644 (file)
--- a/persistence-spi/pom.xml
+++ b/persistence-spi/pom.xml
@@ -40,18 +40,14 @@
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>yang-binding</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-inet-types-2013-07-15</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-yang-types-20130715</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-core-api</artifactId>
@@ -84,13 +80,6 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <!-- This bundle works with Karaf 3 and 4.0 -->
-            <Import-Package>
-              org.apache.karaf.shell.commands;version="[3.0.0,4.2)",
-              org.apache.karaf.shell.console;version="[3.0.0,4.2)",
-              *
-            </Import-Package>
-            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
             <Karaf-Commands>*</Karaf-Commands>
           </instructions>
         </configuration>

diff --git a/persistence-spi/src/main/java/org/opendaylight/tsdr/spi/command/ListMetricsCommand.java b/persistence-spi/src/main/java/org/opendaylight/tsdr/spi/command/ListMetricsCommand.java
index 3a58c295a8e19d37c526e81eb67ccc8d44e92e40..48fb03ba5742efb718910db91d7f90310dd958e1 100644 (file)
--- a/persistence-spi/src/main/java/org/opendaylight/tsdr/spi/command/ListMetricsCommand.java
+++ b/persistence-spi/src/main/java/org/opendaylight/tsdr/spi/command/ListMetricsCommand.java
@@ -72,7 +72,7 @@ public class ListMetricsCommand implements Action {
         } catch (ParseException e) {
             //Note we will log just a warning for this exception without stack trace
             // As this is expected in some cases
-            LOG.warn("getDate for " + dateTime + "caused exception {}", e);
+            LOG.warn("Error parsing date {}", dateTime, e);
             return 0;
         }
         return date.getTime();

diff --git a/pom.xml b/pom.xml
index b8b568dbfab25e803782d0953645d89b496bdbd3..c6ec6473ce1bbb833d51411bf7508e6a46be26fb 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
    <parent>
      <groupId>org.opendaylight.odlparent</groupId>
      <artifactId>odlparent-lite</artifactId>
-     <version>3.1.3</version>
+     <version>4.0.2</version>
      <relativePath/>
    </parent>