Bump up osgi, jetty-websocket, math3, antlr4, common-io, influxdb-java
osgi-core: 4.3.1 -> 5.0.0
osgi-compendium: 4.3.1 -> 5.0.0
jetty-websocket: 8.1.18.v20150929 -> 8.1.19.v20160209
commons-math3: 3.2 -> 3.6.1
antlr4-runtime: 4.5 -> 4.5.3
commons-io: 2.2 -> 2.4
influxdb-java: 2.1 -> 2.2
Change-Id: Ie4ab08326327b64685cb6809d73927cab4278364
diff --git a/apps/influxdbmetrics/pom.xml b/apps/influxdbmetrics/pom.xml
index 9fdedde..8737034 100644
--- a/apps/influxdbmetrics/pom.xml
+++ b/apps/influxdbmetrics/pom.xml
@@ -73,7 +73,7 @@
<dependency>
<groupId>org.influxdb</groupId>
<artifactId>influxdb-java</artifactId>
- <version>2.1</version>
+ <version>2.2</version>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
diff --git a/core/store/dist/pom.xml b/core/store/dist/pom.xml
index e66a8bb..b61f42b 100644
--- a/core/store/dist/pom.xml
+++ b/core/store/dist/pom.xml
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math3</artifactId>
- <version>3.2</version>
+ <version>3.6.1</version>
</dependency>
<dependency>
diff --git a/features/features.xml b/features/features.xml
index c6ac69b..8f5445d 100644
--- a/features/features.xml
+++ b/features/features.xml
@@ -32,7 +32,7 @@
<bundle>mvn:io.netty/netty-codec/4.0.36.Final</bundle>
<bundle>mvn:io.netty/netty-transport-native-epoll/4.0.36.Final</bundle>
<bundle>mvn:commons-pool/commons-pool/1.6</bundle>
- <bundle>mvn:org.apache.commons/commons-math3/3.2</bundle>
+ <bundle>mvn:org.apache.commons/commons-math3/3.6.1</bundle>
<bundle>mvn:joda-time/joda-time/2.9.3</bundle>
@@ -133,7 +133,7 @@
description="ONOS GUI console components">
<feature>onos-api</feature>
<feature>onos-thirdparty-web</feature>
- <bundle>mvn:org.eclipse.jetty/jetty-websocket/8.1.18.v20150929</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-websocket/8.1.19.v20160209</bundle>
<bundle>mvn:org.onosproject/onlab-rest/@ONOS-VERSION</bundle>
<bundle>mvn:org.onosproject/onos-gui/@ONOS-VERSION</bundle>
</feature>
diff --git a/lib/BUCK b/lib/BUCK
index 4a5959f..db38e47 100644
--- a/lib/BUCK
+++ b/lib/BUCK
@@ -1,4 +1,4 @@
-# ***** This file was auto-generated at Mon May 16 15:32:04 PDT 2016. Do not edit this file manually. *****
+# ***** This file was auto-generated at Wed May 18 14:26:50 PDT 2016. Do not edit this file manually. *****
osgi_feature_group(
name = 'COMPILE',
visibility = ['PUBLIC'],
@@ -304,10 +304,10 @@
remote_jar (
name = 'commons-math3',
- out = 'commons-math3-3.2.jar',
- url = 'mvn:org.apache.commons:commons-math3:jar:3.2',
- sha1 = 'ec2544ab27e110d2d431bdad7d538ed509b21e62',
- maven_coords = 'org.apache.commons:commons-math3:3.2',
+ out = 'commons-math3-3.6.1.jar',
+ url = 'mvn:org.apache.commons:commons-math3:jar:3.6.1',
+ sha1 = 'e4ba98f1d4b3c80ec46392f25e094a6a2e58fcbf',
+ maven_coords = 'org.apache.commons:commons-math3:3.6.1',
visibility = [ 'PUBLIC' ],
)
@@ -565,10 +565,10 @@
remote_jar (
name = 'influxdb-java',
- out = 'influxdb-java-2.1.jar',
- url = 'mvn:org.influxdb:influxdb-java:jar:2.1',
- sha1 = 'd2fe39fb8db1d823e64fc7ea54b779e1cab917c7',
- maven_coords = 'org.influxdb:influxdb-java:jar:NON-OSGI:2.1',
+ out = 'influxdb-java-2.2.jar',
+ url = 'mvn:org.influxdb:influxdb-java:jar:2.2',
+ sha1 = '3774bf8fc20385c99fe003cc104af14eba1cbc6a',
+ maven_coords = 'org.influxdb:influxdb-java:jar:NON-OSGI:2.2',
visibility = [ 'PUBLIC' ],
)
@@ -700,10 +700,10 @@
remote_jar (
name = 'jetty-websocket',
- out = 'jetty-websocket-8.1.18.v20150929.jar',
- url = 'mvn:org.eclipse.jetty:jetty-websocket:jar:8.1.18.v20150929',
- sha1 = '4a1610515aed4f02e7cb6ab0db564489d4d44d9f',
- maven_coords = 'org.eclipse.jetty:jetty-websocket:8.1.18.v20150929',
+ out = 'jetty-websocket-8.1.19.v20160209.jar',
+ url = 'mvn:org.eclipse.jetty:jetty-websocket:jar:8.1.19.v20160209',
+ sha1 = 'a423ddda13e52a65d604320472af598ca7122a60',
+ maven_coords = 'org.eclipse.jetty:jetty-websocket:8.1.19.v20160209',
visibility = [ 'PUBLIC' ],
)
@@ -1006,19 +1006,19 @@
remote_jar (
name = 'org.osgi.compendium',
- out = 'org.osgi.compendium-4.3.1.jar',
- url = 'mvn:org.osgi:org.osgi.compendium:jar:4.3.1',
- sha1 = 'd1c9d7819de47d938a96ac2a3813bfd914684cf4',
- maven_coords = 'org.osgi:org.osgi.compendium:4.3.1',
+ out = 'org.osgi.compendium-5.0.0.jar',
+ url = 'mvn:org.osgi:org.osgi.compendium:jar:5.0.0',
+ sha1 = '9d7a9c35591f6fa1c98ac85af32775c12361aee4',
+ maven_coords = 'org.osgi:org.osgi.compendium:5.0.0',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'osgi-core',
- out = 'org.osgi.core-4.3.1.jar',
- url = 'mvn:org.osgi:org.osgi.core:jar:4.3.1',
- sha1 = '5458ffe2ba049e76c29f2df2dc3ffccddf8b839e',
- maven_coords = 'org.osgi:org.osgi.core:4.3.1',
+ out = 'org.osgi.core-5.0.0.jar',
+ url = 'mvn:org.osgi:org.osgi.core:jar:5.0.0',
+ sha1 = '6e5e8cd3c9059c08e1085540442a490b59a7783c',
+ maven_coords = 'org.osgi:org.osgi.core:5.0.0',
visibility = [ 'PUBLIC' ],
)
diff --git a/lib/deps.json b/lib/deps.json
index 6068505..62ea79c 100644
--- a/lib/deps.json
+++ b/lib/deps.json
@@ -105,7 +105,7 @@
"commons-lang": "mvn:commons-lang:commons-lang:2.6",
"commons-lang3": "mvn:org.apache.commons:commons-lang3:3.4",
"commons-logging": "mvn:commons-logging:commons-logging:1.1.1",
- "commons-math3": "mvn:org.apache.commons:commons-math3:3.2",
+ "commons-math3": "mvn:org.apache.commons:commons-math3:3.6.1",
"commons-pool": "mvn:commons-pool:commons-pool:1.6",
"concurrent-trees": "mvn:com.googlecode.concurrent-trees:concurrent-trees:2.4.0",
"copycat-api": "mvn:org.onosproject:copycat-api:0.5.1.onos",
@@ -134,7 +134,7 @@
"hk2-utils": "mvn:org.glassfish.hk2:hk2-utils:2.4.0-b34",
"httpclient-osgi": "mvn:org.apache.httpcomponents:httpclient-osgi:4.5.1",
"httpcore-osgi": "mvn:org.apache.httpcomponents:httpcore-osgi:4.4.4",
- "influxdb-java": "mvn:org.influxdb:influxdb-java:2.1",
+ "influxdb-java": "mvn:org.influxdb:influxdb-java:2.2",
"jackson-annotations": "mvn:com.fasterxml.jackson.core:jackson-annotations:2.7.3",
"jackson-core": "mvn:com.fasterxml.jackson.core:jackson-core:2.7.3",
"jackson-databind": "mvn:com.fasterxml.jackson.core:jackson-databind:2.7.3",
@@ -149,7 +149,7 @@
"jersey-test-framework-core": "mvn:org.glassfish.jersey.test-framework:jersey-test-framework-core:2.22.2",
"jersey-test-framework-jetty": "mvn:org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jetty:2.22.2",
"jetty-util": "mvn:org.eclipse.jetty:jetty-util:9.1.6.v20160112",
- "jetty-websocket": "mvn:org.eclipse.jetty:jetty-websocket:8.1.18.v20150929",
+ "jetty-websocket": "mvn:org.eclipse.jetty:jetty-websocket:8.1.19.v20160209",
"jetty-server": "mvn:org.eclipse.jetty:jetty-server:9.1.6.v20160112",
"jetty-continuation": "mvn:org.eclipse.jetty:jetty-continuation:9.1.6.v20160112",
"jetty-http": "mvn:org.eclipse.jetty:jetty-http:9.1.6.v20160112",
@@ -186,8 +186,8 @@
"org.apache.karaf.shell.console": "mvn:org.apache.karaf.shell:org.apache.karaf.shell.console:3.0.5",
"org.apache.karaf.system.core": "mvn:org.apache.karaf.system:org.apache.karaf.system.core:3.0.5",
"org.apache.servicemix.bundles.snmp4j": "mvn:org.apache.servicemix.bundles:org.apache.servicemix.bundles.snmp4j:2.3.4_1",
- "org.osgi.compendium": "mvn:org.osgi:org.osgi.compendium:4.3.1",
- "osgi-core": "mvn:org.osgi:org.osgi.core:4.3.1",
+ "org.osgi.compendium": "mvn:org.osgi:org.osgi.compendium:5.0.0",
+ "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",
diff --git a/pom.xml b/pom.xml
index 5bc5732..8815908 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,7 +79,7 @@
<netty4.version>4.0.36.Final</netty4.version>
<openflowj.version>0.9.3.onos-SNAPSHOT</openflowj.version>
<onos-maven-plugin.version>1.9</onos-maven-plugin.version>
- <osgi.version>4.3.1</osgi.version>
+ <osgi.version>5.0.0</osgi.version>
<karaf.version>3.0.5</karaf.version>
<jersey.version>2.22.2</jersey.version>
<jackson.version>2.7.3</jackson.version>
diff --git a/tools/package/archetypes/cli/src/main/resources/archetype-resources/pom.xml b/tools/package/archetypes/cli/src/main/resources/archetype-resources/pom.xml
index 52120d6..c60a6bc 100644
--- a/tools/package/archetypes/cli/src/main/resources/archetype-resources/pom.xml
+++ b/tools/package/archetypes/cli/src/main/resources/archetype-resources/pom.xml
@@ -73,7 +73,7 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>4.3.1</version>
+ <version>5.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/tools/package/archetypes/rest/src/main/resources/archetype-resources/pom.xml b/tools/package/archetypes/rest/src/main/resources/archetype-resources/pom.xml
index df05f8d..23e3199 100644
--- a/tools/package/archetypes/rest/src/main/resources/archetype-resources/pom.xml
+++ b/tools/package/archetypes/rest/src/main/resources/archetype-resources/pom.xml
@@ -121,7 +121,7 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>4.3.1</version>
+ <version>5.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/utils/stc/pom.xml b/utils/stc/pom.xml
index 1b3272b..bbdba5c 100644
--- a/utils/stc/pom.xml
+++ b/utils/stc/pom.xml
@@ -68,17 +68,17 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>8.1.18.v20150929</version>
+ <version>8.1.19.v20160209</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
- <version>8.1.18.v20150929</version>
+ <version>8.1.19.v20160209</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-websocket</artifactId>
- <version>8.1.18.v20150929</version>
+ <version>8.1.19.v20160209</version>
</dependency>
</dependencies>
diff --git a/utils/yangutils/pom.xml b/utils/yangutils/pom.xml
index 8b3ef1c..28a3e5d 100644
--- a/utils/yangutils/pom.xml
+++ b/utils/yangutils/pom.xml
@@ -105,7 +105,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.2</version>
+ <version>2.4</version>
</dependency>
<dependency>
@@ -123,7 +123,7 @@
<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr4-runtime</artifactId>
- <version>4.5</version>
+ <version>4.5.3</version>
</dependency>
<dependency>
<groupId>org.codehaus.mojo</groupId>
diff --git a/web/gui/pom.xml b/web/gui/pom.xml
index da43d17..ee783d7 100644
--- a/web/gui/pom.xml
+++ b/web/gui/pom.xml
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-websocket</artifactId>
- <version>8.1.18.v20150929</version>
+ <version>8.1.19.v20160209</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>