Sync onos-dependency, deps.json
Change-Id: I6f0b9d6d9de4f7395c16561c7997208b0c4114a6
diff --git a/lib/BUCK b/lib/BUCK
index 601d2b0..3654522 100644
--- a/lib/BUCK
+++ b/lib/BUCK
@@ -1,4 +1,4 @@
-# ***** This file was auto-generated at Mon, 17 Apr 2017 19:01:18 GMT. Do not edit this file manually. *****
+# ***** This file was auto-generated at Fri, 21 Apr 2017 07:44:51 GMT. Do not edit this file manually. *****
# ***** Use onos-lib-gen *****
pass_thru_pom(
@@ -212,10 +212,10 @@
remote_jar (
name = 'commons-logging',
- out = 'commons-logging-1.1.1.jar',
- url = 'mvn:commons-logging:commons-logging:jar:1.1.1',
- sha1 = '5043bfebc3db072ed80fbd362e7caf00e885d8ae',
- maven_coords = 'commons-logging:commons-logging:jar:NON-OSGI:1.1.1',
+ out = 'commons-logging-1.2.jar',
+ url = 'mvn:commons-logging:commons-logging:jar:1.2',
+ sha1 = '4bfc12adfe4842bf07b657f0369c4cb522955686',
+ maven_coords = 'commons-logging:commons-logging:1.2',
visibility = [ 'PUBLIC' ],
)
@@ -275,10 +275,10 @@
remote_jar (
name = 'error_prone_annotations',
- out = 'error_prone_annotations-2.0.2.jar',
- url = 'mvn:com.google.errorprone:error_prone_annotations:jar:2.0.2',
- sha1 = '8382c6cdc18c8c8ad7840024fa340509cf16be11',
- maven_coords = 'com.google.errorprone:error_prone_annotations:jar:NON-OSGI:2.0.2',
+ out = 'error_prone_annotations-2.0.11.jar',
+ url = 'mvn:com.google.errorprone:error_prone_annotations:jar:2.0.11',
+ sha1 = '3624d81fca4e93c67f43bafc222b06e1b1e3b260',
+ maven_coords = 'com.google.errorprone:error_prone_annotations:jar:NON-OSGI:2.0.11',
visibility = [ 'PUBLIC' ],
)
@@ -572,10 +572,10 @@
remote_jar (
name = 'jetty-util',
- out = 'jetty-util-9.1.6.v20160112.jar',
- url = 'mvn:org.eclipse.jetty:jetty-util:jar:9.1.6.v20160112',
- sha1 = 'd4337bc023fe99b072abc56425b8a317ffd3f462',
- maven_coords = 'org.eclipse.jetty:jetty-util:9.1.6.v20160112',
+ out = 'jetty-util-9.2.21.v20170120.jar',
+ url = 'mvn:org.eclipse.jetty:jetty-util:jar:9.2.21.v20170120',
+ sha1 = '58d9c3a134dc6d6d84b555758015ab3585b88464',
+ maven_coords = 'org.eclipse.jetty:jetty-util:9.2.21.v20170120',
visibility = [ 'PUBLIC' ],
)
@@ -590,37 +590,37 @@
remote_jar (
name = 'jetty-server',
- out = 'jetty-server-9.1.6.v20160112.jar',
- url = 'mvn:org.eclipse.jetty:jetty-server:jar:9.1.6.v20160112',
- sha1 = '15f8b12fe0e2105f46d7c3b372054adc85e941a9',
- maven_coords = 'org.eclipse.jetty:jetty-server:9.1.6.v20160112',
+ out = 'jetty-server-9.2.21.v20170120.jar',
+ url = 'mvn:org.eclipse.jetty:jetty-server:jar:9.2.21.v20170120',
+ sha1 = 'bdf6a2d58f878652e4b8c3af913e9c56b995e87d',
+ maven_coords = 'org.eclipse.jetty:jetty-server:9.2.21.v20170120',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'jetty-continuation',
- out = 'jetty-continuation-9.1.6.v20160112.jar',
- url = 'mvn:org.eclipse.jetty:jetty-continuation:jar:9.1.6.v20160112',
- sha1 = 'c8f35dfc6321cc15224404c9c4ede79988eeae34',
- maven_coords = 'org.eclipse.jetty:jetty-continuation:9.1.6.v20160112',
+ out = 'jetty-continuation-9.2.21.v20170120.jar',
+ url = 'mvn:org.eclipse.jetty:jetty-continuation:jar:9.2.21.v20170120',
+ sha1 = '38c35ef850d508aa0fae450eee72d784a5dd2d06',
+ maven_coords = 'org.eclipse.jetty:jetty-continuation:9.2.21.v20170120',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'jetty-http',
- out = 'jetty-http-9.1.6.v20160112.jar',
- url = 'mvn:org.eclipse.jetty:jetty-http:jar:9.1.6.v20160112',
- sha1 = 'c3675e6ebc350aafbc9dd7686265af9f65165b36',
- maven_coords = 'org.eclipse.jetty:jetty-http:9.1.6.v20160112',
+ out = 'jetty-http-9.2.21.v20170120.jar',
+ url = 'mvn:org.eclipse.jetty:jetty-http:jar:9.2.21.v20170120',
+ sha1 = '24c5a91c48cfd73b863962ec36ba4dc2bb6552ea',
+ maven_coords = 'org.eclipse.jetty:jetty-http:9.2.21.v20170120',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'jetty-io',
- out = 'jetty-io-9.1.6.v20160112.jar',
- url = 'mvn:org.eclipse.jetty:jetty-io:jar:9.1.6.v20160112',
- sha1 = '717fc5a269becb2537849105de1547dc1a4476b0',
- maven_coords = 'org.eclipse.jetty:jetty-io:9.1.6.v20160112',
+ out = 'jetty-io-9.2.21.v20170120.jar',
+ url = 'mvn:org.eclipse.jetty:jetty-io:jar:9.2.21.v20170120',
+ sha1 = 'a25222b557823b59a7b6d121f951926be20cff85',
+ maven_coords = 'org.eclipse.jetty:jetty-io:9.2.21.v20170120',
visibility = [ 'PUBLIC' ],
)
diff --git a/lib/deps.json b/lib/deps.json
index c0ea59f..267879c 100644
--- a/lib/deps.json
+++ b/lib/deps.json
@@ -100,14 +100,14 @@
"commons-io": "mvn:commons-io:commons-io:2.4",
"commons-lang": "mvn:commons-lang:commons-lang:2.6",
"commons-lang3": "mvn:org.apache.commons:commons-lang3:3.5",
- "commons-logging": "mvn:commons-logging:commons-logging:1.1.1",
+ "commons-logging": "mvn:commons-logging:commons-logging:1.2",
"commons-math3": "mvn:org.apache.commons:commons-math3:3.6.1",
"commons-pool": "mvn:commons-pool:commons-pool:1.6",
"commons-beanutils": "mvn:commons-beanutils:commons-beanutils:1.9.2",
"concurrent-trees": "mvn:com.googlecode.concurrent-trees:concurrent-trees:2.6.0",
"easymock": "mvn:org.easymock:easymock:3.4",
"antlr": "mvn:antlr:antlr:2.7.7",
- "error_prone_annotations": "mvn:com.google.errorprone:error_prone_annotations:2.0.2",
+ "error_prone_annotations": "mvn:com.google.errorprone:error_prone_annotations:2.0.11",
"ganymed-ssh2": "mvn:ch.ethz.ganymed:ganymed-ssh2:262",
"gmetric4j": "mvn:info.ganglia.gmetric4j:gmetric4j:1.0.10",
"gson": "mvn:com.google.code.gson:gson:jar:2.6.2",
@@ -140,12 +140,12 @@
"jersey-server": "mvn:org.glassfish.jersey.core:jersey-server:2.25",
"jersey-test-framework-core": "mvn:org.glassfish.jersey.test-framework:jersey-test-framework-core:2.25",
"jersey-test-framework-jetty": "mvn:org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jetty:2.25",
- "jetty-util": "mvn:org.eclipse.jetty:jetty-util:9.1.6.v20160112",
+ "jetty-util": "mvn:org.eclipse.jetty:jetty-util:9.2.21.v20170120",
"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",
- "jetty-io": "mvn:org.eclipse.jetty:jetty-io:9.1.6.v20160112",
+ "jetty-server": "mvn:org.eclipse.jetty:jetty-server:9.2.21.v20170120",
+ "jetty-continuation": "mvn:org.eclipse.jetty:jetty-continuation:9.2.21.v20170120",
+ "jetty-http": "mvn:org.eclipse.jetty:jetty-http:9.2.21.v20170120",
+ "jetty-io": "mvn:org.eclipse.jetty:jetty-io:9.2.21.v20170120",
"javax.servlet-api": "mvn:javax.servlet:javax.servlet-api:3.1.0",
"joda-time": "mvn:joda-time:joda-time:2.9.3",
"jsch": "mvn:com.jcraft:jsch:0.1.53",
diff --git a/lib/pom.xml b/lib/pom.xml
index 6429ad8..305c043 100644
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -19,10 +19,6 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <prerequisites>
- <maven>3.0.5</maven>
- </prerequisites>
-
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-base</artifactId>
@@ -47,6 +43,7 @@
<osgi.version>5.0.0</osgi.version>
<karaf.version>3.0.8</karaf.version>
<jersey.version>2.25</jersey.version>
+ <jetty.version>9.2.21.v20170120</jetty.version>
<jackson.version>2.8.6</jackson.version>
<slf4j.version>1.7.21</slf4j.version>
<guava.version>19.0</guava.version>
@@ -150,6 +147,12 @@
</dependency>
<dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.2</version>
+ </dependency>
+
+ <dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>3.4</version>
@@ -158,6 +161,12 @@
<!-- Web related -->
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.1.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
<version>${jersey.version}</version>
@@ -193,6 +202,27 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>${jetty.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-io</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-http</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
@@ -346,6 +376,12 @@
</dependency>
<dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_annotations</artifactId>
+ <version>2.0.11</version>
+ </dependency>
+
+ <dependency>
<groupId>org.onosproject</groupId>
<artifactId>openflowj</artifactId>
<version>${openflowj.version}</version>
@@ -403,7 +439,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.19.1</version>
+ <version>2.20</version>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<printSummary>true</printSummary>
@@ -446,7 +482,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.0.1</version>
+ <version>3.0.2</version>
</plugin>
<plugin>
@@ -462,13 +498,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>2.4.3</version>
+ <version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
- <version>1.22.0</version>
+ <version>1.24.0</version>
<executions>
<execution>
<id>generate-scr-srcdescriptor</id>
@@ -580,7 +616,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>3.6</version>
+ <version>3.7</version>
<configuration>
<excludes>
</excludes>
@@ -603,7 +639,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
- <version>0.7.7.201606060606</version>
+ <version>0.7.9</version>
<executions>
<execution>
<id>default-prepare-agent</id>