diff --git a/apps/cpman/app/features.xml b/apps/cpman/app/features.xml
index 35222ff..5cf18cd 100644
--- a/apps/cpman/app/features.xml
+++ b/apps/cpman/app/features.xml
@@ -20,6 +20,6 @@
         <feature>onos-api</feature>
         <bundle>mvn:${project.groupId}/onos-app-cpman-api/${project.version}</bundle>
         <bundle>mvn:${project.groupId}/onos-app-cpman/${project.version}</bundle>
-        <bundle>wrap:mvn:org.rrd4j/rrd4j/2.2$Bundle-SymbolicName=rrd4j&amp;Bundle-Version=2.2</bundle>
+        <bundle>wrap:mvn:org.rrd4j/rrd4j/3.1$Bundle-SymbolicName=rrd4j&amp;Bundle-Version=3.1</bundle>
     </feature>
 </features>
diff --git a/apps/cpman/app/pom.xml b/apps/cpman/app/pom.xml
index c51978a..76abcdf 100644
--- a/apps/cpman/app/pom.xml
+++ b/apps/cpman/app/pom.xml
@@ -109,7 +109,7 @@
         <dependency>
             <groupId>org.rrd4j</groupId>
             <artifactId>rrd4j</artifactId>
-            <version>2.2</version>
+            <version>3.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/lib/BUCK b/lib/BUCK
index 71f9651..6b7184a 100644
--- a/lib/BUCK
+++ b/lib/BUCK
@@ -1,4 +1,4 @@
-# ***** This file was auto-generated at Mon, 22 May 2017 16:14:48 GMT. Do not edit this file manually. *****
+# ***** This file was auto-generated at Mon, 22 May 2017 16:30:19 GMT. Do not edit this file manually. *****
 # ***** Use onos-lib-gen *****
 
 pass_thru_pom(
@@ -960,10 +960,10 @@
 
 remote_jar (
   name = 'rrd4j',
-  out = 'rrd4j-2.2.jar',
-  url = 'mvn:org.rrd4j:rrd4j:jar:2.2',
-  sha1 = 'e5aee992ece8c82291b77bef96cd1d11c1e0a009',
-  maven_coords = 'org.rrd4j:rrd4j:jar:NON-OSGI:2.2',
+  out = 'rrd4j-3.1.jar',
+  url = 'mvn:org.rrd4j:rrd4j:jar:3.1',
+  sha1 = 'e533553fbf52f241dcb0c468b2052a3814dd6722',
+  maven_coords = 'org.rrd4j:rrd4j:jar:NON-OSGI:3.1',
   visibility = [ 'PUBLIC' ],
 )
 
diff --git a/lib/deps.json b/lib/deps.json
index 8157d97..5ef6f14 100644
--- a/lib/deps.json
+++ b/lib/deps.json
@@ -184,7 +184,7 @@
     "osgi-core": "mvn:org.osgi:org.osgi.core:5.0.0",
     "reflectasm": "mvn:com.esotericsoftware:reflectasm:1.11.0",
     "remotetea-oncrpc": "mvn:org.acplt.remotetea:remotetea-oncrpc:1.1.3",
-    "rrd4j": "mvn:org.rrd4j:rrd4j:2.2",
+    "rrd4j": "mvn:org.rrd4j:rrd4j:3.1",
     "javassist": "mvn:org.javassist:javassist:3.20.0-GA", //transitive
     "mimepull": "mvn:org.jvnet.mimepull:mimepull:1.9.6", //transitive
     "servlet-api": "mvn:javax.servlet:servlet-api:2.5",