Bump to odlparent 3.1.0 and yangtools 2.0.3

Change-Id: I6405e134e85a53a6fbd929c3a62905979e2ab6eb
Signed-off-by: Stephen Kitt <skitt@redhat.com>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 61654ccbfa9eaca035d8f74698648dd916d8c21d..9c8682d995f7e2ee780a4539372c80c7e7eab4ec 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.0.2</version>
+      <version>3.1.0</version>
       <relativePath/>
     </parent>
 
@@ -293,4 +293,3 @@
    </dependencies>
  </dependencyManagement>
 </project>
-

diff --git a/datastorage/src/main/java/org/opendaylight/tsdr/datastorage/TSDRStorageServiceImpl.java b/datastorage/src/main/java/org/opendaylight/tsdr/datastorage/TSDRStorageServiceImpl.java
index bd03705447e8919a28029f6388b9029d590b82c3..fe3358a647aac477ad74f252710e2b6ad772bfbb 100644 (file)
--- a/datastorage/src/main/java/org/opendaylight/tsdr/datastorage/TSDRStorageServiceImpl.java
+++ b/datastorage/src/main/java/org/opendaylight/tsdr/datastorage/TSDRStorageServiceImpl.java
@@ -7,6 +7,7 @@
  */
 package org.opendaylight.tsdr.datastorage;
 
+import com.google.common.base.Optional;
 import com.google.common.collect.Iterators;
 import com.google.common.collect.Lists;
 import com.google.common.collect.PeekingIterator;
@@ -215,9 +216,9 @@ public class TSDRStorageServiceImpl implements TSDRService,TsdrMetricDataService
             final GetTSDRAggregatedMetricsInput input) {
 
         // Locate the appropriate aggregation function implementation
-        final AggregationFunction aggregationFunction = Iterators.find(
-                aggregationFunctions.iterator(), candidate -> candidate.getType().equals(input.getAggregation()), null);
-        if (aggregationFunction == null) {
+        Optional<AggregationFunction> aggregationFunction = Iterators.tryFind(
+                aggregationFunctions.iterator(), candidate -> candidate.getType().equals(input.getAggregation()));
+        if (!aggregationFunction.isPresent()) {
             return RpcResultBuilder.<GetTSDRAggregatedMetricsOutput>failed()
                     .withError(ErrorType.APPLICATION,
                             String.format("No aggregation function implementation was found for '%s'.",
@@ -285,7 +286,7 @@ public class TSDRStorageServiceImpl implements TSDRService,TsdrMetricDataService
                 // Aggregate the metrics in the interval
                 aggregatedMetrics.add(new AggregatedMetricsBuilder()
                         .setTimeStamp(intervalStartInclusive)
-                        .setMetricValue(aggregationFunction.aggregate(metricsInInterval)).build());
+                        .setMetricValue(aggregationFunction.get().aggregate(metricsInInterval)).build());
             }
 
             // We're done

diff --git a/features/features-tsdr/pom.xml b/features/features-tsdr/pom.xml
index 5f8a92383a8f8a06c21c888f0cd255e061a09a2e..92e589996ce0ac6b2e6b59f1939a38fee09f0e60 100644 (file)
--- a/features/features-tsdr/pom.xml
+++ b/features/features-tsdr/pom.xml
@@ -6,15 +6,13 @@ 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">
+<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>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>3.0.2</version>
+        <version>3.1.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-hbaseclient/pom.xml b/features/odl-hbaseclient/pom.xml
index 328019f546cd33b0701afcec4fe48ad93864a411..1c7374e098fea280a08a43a52bbdd816486eeff2 100644 (file)
--- a/features/odl-hbaseclient/pom.xml
+++ b/features/odl-hbaseclient/pom.xml
@@ -6,15 +6,13 @@
  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">
+<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>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.0.2</version>
+        <version>3.1.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-tsdr-cassandra/pom.xml b/features/odl-tsdr-cassandra/pom.xml
index 8cdb013e995e779b7415e5132fcc81af25219e8e..7e9439cdc7ac236883263faed53fe9771a6f13dd 100644 (file)
--- a/features/odl-tsdr-cassandra/pom.xml
+++ b/features/odl-tsdr-cassandra/pom.xml
@@ -1,13 +1,11 @@
 <?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">
+<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>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.0.2</version>
+        <version>3.1.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-tsdr-controller-metrics-collector/pom.xml b/features/odl-tsdr-controller-metrics-collector/pom.xml
index 89091db4f154c1b6e34b96fcfb7528b878208029..33dcd501905493afdfda4e83b7caadbc2e4911b3 100644 (file)
--- a/features/odl-tsdr-controller-metrics-collector/pom.xml
+++ b/features/odl-tsdr-controller-metrics-collector/pom.xml
@@ -1,13 +1,11 @@
 <?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">
+<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>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.0.2</version>
+        <version>3.1.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-tsdr-core/pom.xml b/features/odl-tsdr-core/pom.xml
index 1aa16f9e1ae348ad4f26f68913d1566597848330..faef16281745f0dc83c515cdaf0e11eaf1911c7b 100644 (file)
--- a/features/odl-tsdr-core/pom.xml
+++ b/features/odl-tsdr-core/pom.xml
@@ -1,13 +1,11 @@
 <?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">
+<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>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.0.2</version>
+        <version>3.1.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-tsdr-elasticsearch/pom.xml b/features/odl-tsdr-elasticsearch/pom.xml
index e1889b0433ad3cae154e4be90f6bcc4e649e8cb4..544d71b96e87592c49cf6718b74fda2fbf25e940 100644 (file)
--- a/features/odl-tsdr-elasticsearch/pom.xml
+++ b/features/odl-tsdr-elasticsearch/pom.xml
@@ -1,13 +1,11 @@
 <?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">
+<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>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.0.2</version>
+        <version>3.1.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-tsdr-hbase/pom.xml b/features/odl-tsdr-hbase/pom.xml
index 52c6eb6d33a2f5e2feaa65c24d46919a9db403bf..26c0c61c7d178d3ff29be3f29e421396948557a1 100644 (file)
--- a/features/odl-tsdr-hbase/pom.xml
+++ b/features/odl-tsdr-hbase/pom.xml
@@ -1,13 +1,11 @@
 <?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">
+<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>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.0.2</version>
+        <version>3.1.0</version>
         <relativePath/>
     </parent>
 
@@ -18,6 +16,11 @@
 
     <name>ODL :: tsdr :: hbase</name>
 
+    <properties>
+        <!-- For some reason SFT dies with a native memory allocation error -->
+        <skip.karaf.featureTest>true</skip.karaf.featureTest>
+    </properties>
+
     <dependencyManagement>
         <dependencies>
             <dependency>

diff --git a/features/odl-tsdr-hsqldb-all/pom.xml b/features/odl-tsdr-hsqldb-all/pom.xml
index 3964bb54a56425aaf8be373a7277d5b5ca5b2e05..d80a712dc0fb4666df8e989b0184ba4ebf2858cd 100644 (file)
--- a/features/odl-tsdr-hsqldb-all/pom.xml
+++ b/features/odl-tsdr-hsqldb-all/pom.xml
@@ -1,13 +1,11 @@
 <?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">
+<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>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.0.2</version>
+        <version>3.1.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-tsdr-hsqldb/pom.xml b/features/odl-tsdr-hsqldb/pom.xml
index 7f513f6e2b66fd3ce650fa10e0e356029c754a5b..419cf581b3973b12558cff8c8e380a171388fff0 100644 (file)
--- a/features/odl-tsdr-hsqldb/pom.xml
+++ b/features/odl-tsdr-hsqldb/pom.xml
@@ -1,13 +1,11 @@
 <?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">
+<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>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.0.2</version>
+        <version>3.1.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-tsdr-netflow-statistics-collector/pom.xml b/features/odl-tsdr-netflow-statistics-collector/pom.xml
index 7bedd517c1a2a38f06e52c19914c4e4a3efb2be0..d01bb64f0664aa1f852c55badfb6bdf1ef90c662 100644 (file)
--- a/features/odl-tsdr-netflow-statistics-collector/pom.xml
+++ b/features/odl-tsdr-netflow-statistics-collector/pom.xml
@@ -1,13 +1,11 @@
 <?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">
+<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>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.0.2</version>
+        <version>3.1.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-tsdr-openflow-statistics-collector/pom.xml b/features/odl-tsdr-openflow-statistics-collector/pom.xml
index 2c082dcc84a46888d65f7a5453b559ae4b9738a3..0b990ee673238d6583d38ec5f7ecebe54927c23d 100644 (file)
--- a/features/odl-tsdr-openflow-statistics-collector/pom.xml
+++ b/features/odl-tsdr-openflow-statistics-collector/pom.xml
@@ -1,13 +1,11 @@
 <?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">
+<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>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.0.2</version>
+        <version>3.1.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-tsdr-restconf-collector/pom.xml b/features/odl-tsdr-restconf-collector/pom.xml
index d7c8bf60a2af4037614d8d8685be9dbc4ea10d42..65fffee301de7de2428478d54e35583857a58b6f 100644 (file)
--- a/features/odl-tsdr-restconf-collector/pom.xml
+++ b/features/odl-tsdr-restconf-collector/pom.xml
@@ -1,13 +1,11 @@
 <?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">
+<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>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.0.2</version>
+        <version>3.1.0</version>
         <relativePath/>
     </parent>
 
@@ -88,4 +86,3 @@
       </dependency>
     </dependencies>
 </project>
-                       

diff --git a/features/odl-tsdr-syslog-collector/pom.xml b/features/odl-tsdr-syslog-collector/pom.xml
index 4108baf851f275fc13b0cd4544e7edb52de40a7e..eaa73d4560e014537fd4f68c7d27da5ec80417b1 100644 (file)
--- a/features/odl-tsdr-syslog-collector/pom.xml
+++ b/features/odl-tsdr-syslog-collector/pom.xml
@@ -1,13 +1,11 @@
 <?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">
+<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>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.0.2</version>
+        <version>3.1.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/pom.xml b/features/pom.xml
index 2bf5b69082edf4e074ef666b262fa9592418273a..77d25ff676835dc164782f6e3ab069d3a9157841 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.0.2</version>
+        <version>3.1.0</version>
         <relativePath/>
     </parent>
 
@@ -33,4 +33,3 @@
       <module>odl-tsdr-hbase</module>
     </modules>
 </project>
-

diff --git a/karaf/pom.xml b/karaf/pom.xml
index c21ea663170d09b3030136b806d8ffb0f6b0578b..8f1584882e978600c80f1525fbd48a163f3feaee 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.0.2</version>
+    <version>3.1.0</version>
   </parent>
 
   <groupId>org.opendaylight.tsdr</groupId>

diff --git a/parent/pom.xml b/parent/pom.xml
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/persistence-hbase/src/main/resources/hbase-default.xml b/persistence-hbase/src/main/resources/hbase-default.xml
index b12726707257ce8855c37008433955e17c66323c..21763c228fea80145bb41bfeae16574a145a8ba6 100644 (file)
--- a/persistence-hbase/src/main/resources/hbase-default.xml
+++ b/persistence-hbase/src/main/resources/hbase-default.xml
@@ -569,14 +569,14 @@
        values, included here for documentation purposes -->
   <property>
     <name>hbase.master.keytab.file</name>
-    <value></value>
+    <value/>
     <description>Full path to the kerberos keytab file to use for logging in
     the configured HMaster server principal.
     </description>
   </property>
   <property>
     <name>hbase.master.kerberos.principal</name>
-    <value></value>
+    <value/>
     <description>Ex. "hbase/_HOST@EXAMPLE.COM".  The kerberos principal name
     that should be used to run the HMaster process.  The principal name should
     be in the form: user/hostname@DOMAIN.  If "_HOST" is used as the hostname
@@ -586,14 +586,14 @@
   </property>
   <property>
     <name>hbase.regionserver.keytab.file</name>
-    <value></value>
+    <value/>
     <description>Full path to the kerberos keytab file to use for logging in
     the configured HRegionServer server principal.
     </description>
   </property>
   <property>
     <name>hbase.regionserver.kerberos.principal</name>
-    <value></value>
+    <value/>
     <description>Ex. "hbase/_HOST@EXAMPLE.COM".  The kerberos principal name
     that should be used to run the HRegionServer process.  The principal name
     should be in the form: user/hostname@DOMAIN.  If "_HOST" is used as the
@@ -614,7 +614,7 @@
   </property>
   <property>
     <name>hbase.superuser</name>
-    <value></value>
+    <value/>
     <description>List of users or groups (comma-separated), who are allowed
     full privileges, regardless of stored ACLs, across the cluster.
     Only used when HBase security is enabled.
@@ -688,7 +688,7 @@
   
   <property>
     <name>hbase.coprocessor.region.classes</name>
-    <value></value>
+    <value/>
     <description>A comma-separated list of Coprocessors that are loaded by
     default on all tables. For any override coprocessor method, these classes
     will be called in order. After implementing your own Coprocessor, just put
@@ -699,7 +699,7 @@
 
   <property>
     <name>hbase.coprocessor.master.classes</name>
-    <value></value>
+    <value/>
     <description>A comma-separated list of
     org.apache.hadoop.hbase.coprocessor.MasterObserver coprocessors that are
     loaded by default on the active HMaster process. For any implemented

diff --git a/pom.xml b/pom.xml
index f342a7a763d6199dd8f81f6858f2c9fa486f4d19..0f75cfcbba40c8d0d8911f086074a3990bf45047 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,8 +4,8 @@
    <parent>
      <groupId>org.opendaylight.odlparent</groupId>
      <artifactId>odlparent-lite</artifactId>
-     <version>3.0.2</version>
-     <relativePath></relativePath>
+     <version>3.1.0</version>
+     <relativePath/>
    </parent>