diff --git a/apps/openstacknetworking/web/pom.xml b/apps/openstacknetworking/web/pom.xml index 7b46c8aecc..1e7440258d 100644 --- a/apps/openstacknetworking/web/pom.xml +++ b/apps/openstacknetworking/web/pom.xml @@ -101,7 +101,7 @@ org.glassfish.jersey.core jersey-common - 2.22.2 + 2.25 org.onosproject diff --git a/apps/virtualbng/features.xml b/apps/virtualbng/features.xml index ebbf94f35c..6b22a2ba0d 100644 --- a/apps/virtualbng/features.xml +++ b/apps/virtualbng/features.xml @@ -17,7 +17,7 @@ - mvn:org.glassfish.jersey.core/jersey-client/2.22.2 + mvn:org.glassfish.jersey.core/jersey-client/2.25 mvn:${project.groupId}/onos-app-virtualbng/${project.version} onos-thirdparty-web diff --git a/features/features.xml b/features/features.xml index d5f81fe485..d570e01d1e 100644 --- a/features/features.xml +++ b/features/features.xml @@ -58,7 +58,7 @@ mvn:commons-io/commons-io/2.4 mvn:io.atomix/atomix-all/1.0.0-rc9 - mvn:org.glassfish.jersey.core/jersey-client/2.22.2 + mvn:org.glassfish.jersey.core/jersey-client/2.25 mvn:org.mapdb/mapdb/1.0.7 @@ -68,25 +68,25 @@ war onos-thirdparty-base - mvn:org.glassfish.jersey.core/jersey-common/2.22.2 + mvn:org.glassfish.jersey.core/jersey-common/2.25 mvn:javax.annotation/javax.annotation-api/1.2 mvn:javax.ws.rs/javax.ws.rs-api/2.0.1 - mvn:org.glassfish.hk2/hk2-api/2.4.0 - mvn:org.glassfish.hk2/hk2-locator/2.4.0 + mvn:org.glassfish.hk2/hk2-api/2.5.0-b30 + mvn:org.glassfish.hk2/hk2-locator/2.5.0-b30 mvn:org.glassfish.hk2/osgi-resource-locator/1.0.1 - mvn:org.glassfish.hk2.external/javax.inject/2.4.0 - mvn:org.glassfish.jersey.bundles.repackaged/jersey-guava/2.22.2 + mvn:org.glassfish.hk2.external/javax.inject/2.5.0-b30 + mvn:org.glassfish.jersey.bundles.repackaged/jersey-guava/2.25 - mvn:org.glassfish.jersey.core/jersey-server/2.22.2 - mvn:org.glassfish.hk2.external/aopalliance-repackaged/2.4.0 - mvn:org.glassfish.hk2/hk2-utils/2.4.0 + mvn:org.glassfish.jersey.core/jersey-server/2.25 + mvn:org.glassfish.hk2.external/aopalliance-repackaged/2.5.0-b30 + mvn:org.glassfish.hk2/hk2-utils/2.5.0-b30 mvn:javax.validation/validation-api/1.1.0.Final - mvn:org.javassist/javassist/3.18.1-GA + mvn:org.javassist/javassist/3.20.0-GA - mvn:org.glassfish.jersey.containers/jersey-container-servlet/2.22.2 - mvn:org.glassfish.jersey.containers/jersey-container-servlet-core/2.22.2 + mvn:org.glassfish.jersey.containers/jersey-container-servlet/2.25 + mvn:org.glassfish.jersey.containers/jersey-container-servlet-core/2.25 - mvn:org.glassfish.jersey.media/jersey-media-multipart/2.22.2 + mvn:org.glassfish.jersey.media/jersey-media-multipart/2.25 mvn:org.jvnet.mimepull/mimepull/1.9.6 diff --git a/lib/BUCK b/lib/BUCK index a6d60232ba..f77228403d 100644 --- a/lib/BUCK +++ b/lib/BUCK @@ -1,4 +1,4 @@ -# ***** This file was auto-generated at Fri Jan 13 10:17:21 PST 2017. Do not edit this file manually. ***** +# ***** This file was auto-generated at Wed Jan 18 10:15:14 PST 2017. Do not edit this file manually. ***** osgi_feature_group( name = 'COMPILE', visibility = ['PUBLIC'], @@ -110,10 +110,10 @@ osgi_feature_group( remote_jar ( name = 'aopalliance-repackaged', - out = 'aopalliance-repackaged-2.4.0-b34.jar', - url = 'mvn:org.glassfish.hk2.external:aopalliance-repackaged:jar:2.4.0-b34', - sha1 = '3d5e856dbc91a3a2b0bcb3a3424f8b62421ae4cf', - maven_coords = 'org.glassfish.hk2.external:aopalliance-repackaged:2.4.0-b34', + out = 'aopalliance-repackaged-2.5.0-b30.jar', + url = 'mvn:org.glassfish.hk2.external:aopalliance-repackaged:jar:2.5.0-b30', + sha1 = '4e882c90e9ba801803991b4000e6d9ad216ac261', + maven_coords = 'org.glassfish.hk2.external:aopalliance-repackaged:2.5.0-b30', visibility = [ 'PUBLIC' ], ) @@ -344,19 +344,19 @@ remote_jar ( remote_jar ( name = 'hk2-api', - out = 'hk2-api-2.4.0-b34.jar', - url = 'mvn:org.glassfish.hk2:hk2-api:jar:2.4.0-b34', - sha1 = '1017432e219dbd1d4a1121b2d7e87c5b2f0bcfb9', - maven_coords = 'org.glassfish.hk2:hk2-api:2.4.0-b34', + out = 'hk2-api-2.5.0-b30.jar', + url = 'mvn:org.glassfish.hk2:hk2-api:jar:2.5.0-b30', + sha1 = '5c6688a6bafcd2098bef4ca45226d5355b816647', + maven_coords = 'org.glassfish.hk2:hk2-api:2.5.0-b30', visibility = [ 'PUBLIC' ], ) remote_jar ( name = 'hk2-locator', - out = 'hk2-locator-2.4.0-b34.jar', - url = 'mvn:org.glassfish.hk2:hk2-locator:jar:2.4.0-b34', - sha1 = '1451fc3e5b7f00d7a5ca0feaff2c1bf68be5ac91', - maven_coords = 'org.glassfish.hk2:hk2-locator:2.4.0-b34', + out = 'hk2-locator-2.5.0-b30.jar', + url = 'mvn:org.glassfish.hk2:hk2-locator:jar:2.5.0-b30', + sha1 = '82056cbbd258647bbc6b80debe4e6b7121c61be9', + maven_coords = 'org.glassfish.hk2:hk2-locator:2.5.0-b30', visibility = [ 'PUBLIC' ], ) @@ -371,10 +371,10 @@ remote_jar ( remote_jar ( name = 'hk2-utils', - out = 'hk2-utils-2.4.0-b34.jar', - url = 'mvn:org.glassfish.hk2:hk2-utils:jar:2.4.0-b34', - sha1 = 'aacce18411fffef9621d8fc91464ca0477119c38', - maven_coords = 'org.glassfish.hk2:hk2-utils:2.4.0-b34', + out = 'hk2-utils-2.5.0-b30.jar', + url = 'mvn:org.glassfish.hk2:hk2-utils:jar:2.5.0-b30', + sha1 = 'b17fc7d8082ac00e59cd96fda9cff21f24cc367c', + maven_coords = 'org.glassfish.hk2:hk2-utils:2.5.0-b30', visibility = [ 'PUBLIC' ], ) @@ -443,10 +443,10 @@ remote_jar ( remote_jar ( name = 'javax.inject', - out = 'javax.inject-2.4.0-b34.jar', - url = 'mvn:org.glassfish.hk2.external:javax.inject:jar:2.4.0-b34', - sha1 = 'a6a3d4935af7b03e44126b5aac2c2a0ce98fe6e9', - maven_coords = 'org.glassfish.hk2.external:javax.inject:2.4.0-b34', + out = 'javax.inject-2.5.0-b30.jar', + url = 'mvn:org.glassfish.hk2.external:javax.inject:jar:2.5.0-b30', + sha1 = '054b36144fd2fb684f9cee73d96060bb82e4d363', + maven_coords = 'org.glassfish.hk2.external:javax.inject:2.5.0-b30', visibility = [ 'PUBLIC' ], ) @@ -461,91 +461,91 @@ remote_jar ( remote_jar ( name = 'jersey-client', - out = 'jersey-client-2.22.2.jar', - url = 'mvn:org.glassfish.jersey.core:jersey-client:jar:2.22.2', - sha1 = '1712fff037ce5a59e3d67f90fff29222989799ee', - maven_coords = 'org.glassfish.jersey.core:jersey-client:2.22.2', + out = 'jersey-client-2.25.jar', + url = 'mvn:org.glassfish.jersey.core:jersey-client:jar:2.25', + sha1 = '416a00562f25d7efdba015e5c21876d19163edd0', + maven_coords = 'org.glassfish.jersey.core:jersey-client:2.25', visibility = [ 'PUBLIC' ], ) remote_jar ( name = 'jersey-common', - out = 'jersey-common-2.22.2.jar', - url = 'mvn:org.glassfish.jersey.core:jersey-common:jar:2.22.2', - sha1 = '1209b89878b60ce7d49afadeff7522d2fde0e217', - maven_coords = 'org.glassfish.jersey.core:jersey-common:2.22.2', + out = 'jersey-common-2.25.jar', + url = 'mvn:org.glassfish.jersey.core:jersey-common:jar:2.25', + sha1 = 'b38e1a1af6ad75dd9037a767764b0d41801f1c9f', + maven_coords = 'org.glassfish.jersey.core:jersey-common:2.25', visibility = [ 'PUBLIC' ], ) remote_jar ( name = 'jersey-container-jetty-http', - out = 'jersey-container-jetty-http-2.22.2.jar', - url = 'mvn:org.glassfish.jersey.containers:jersey-container-jetty-http:jar:2.22.2', - sha1 = '7421abf505bda989087745a458b5ccf2cd327297', - maven_coords = 'org.glassfish.jersey.containers:jersey-container-jetty-http:2.22.2', + out = 'jersey-container-jetty-http-2.25.jar', + url = 'mvn:org.glassfish.jersey.containers:jersey-container-jetty-http:jar:2.25', + sha1 = '7b199d4684de57839d7d9abc7cba8710b9ea9356', + maven_coords = 'org.glassfish.jersey.containers:jersey-container-jetty-http:2.25', visibility = [ 'PUBLIC' ], ) remote_jar ( name = 'jersey-container-servlet', - out = 'jersey-container-servlet-2.22.2.jar', - url = 'mvn:org.glassfish.jersey.containers:jersey-container-servlet:jar:2.22.2', - sha1 = 'd90487b9809f822af7731abb8896a2183e7c4a0c', - maven_coords = 'org.glassfish.jersey.containers:jersey-container-servlet:2.22.2', + out = 'jersey-container-servlet-2.25.jar', + url = 'mvn:org.glassfish.jersey.containers:jersey-container-servlet:jar:2.25', + sha1 = '0a3162855a184793c3c934ed9ee0170ebeb82cc9', + maven_coords = 'org.glassfish.jersey.containers:jersey-container-servlet:2.25', visibility = [ 'PUBLIC' ], ) remote_jar ( name = 'jersey-container-servlet-core', - out = 'jersey-container-servlet-core-2.22.2.jar', - url = 'mvn:org.glassfish.jersey.containers:jersey-container-servlet-core:jar:2.22.2', - sha1 = '212c534c5b030594ccf5c4b929e8f7cbf26eb1ba', - maven_coords = 'org.glassfish.jersey.containers:jersey-container-servlet-core:2.22.2', + out = 'jersey-container-servlet-core-2.25.jar', + url = 'mvn:org.glassfish.jersey.containers:jersey-container-servlet-core:jar:2.25', + sha1 = '42708aca357418bb51528b20181cdfe0241c3ecb', + maven_coords = 'org.glassfish.jersey.containers:jersey-container-servlet-core:2.25', visibility = [ 'PUBLIC' ], ) remote_jar ( name = 'jersey-guava', - out = 'jersey-guava-2.22.2.jar', - url = 'mvn:org.glassfish.jersey.bundles.repackaged:jersey-guava:jar:2.22.2', - sha1 = '7422c693c89640c9685dfa99dbef2da745aa4617', - maven_coords = 'org.glassfish.jersey.bundles.repackaged:jersey-guava:2.22.2', + out = 'jersey-guava-2.25.jar', + url = 'mvn:org.glassfish.jersey.bundles.repackaged:jersey-guava:jar:2.25', + sha1 = '4439bddb870b210e40ca2e953813930be424dc0c', + maven_coords = 'org.glassfish.jersey.bundles.repackaged:jersey-guava:2.25', visibility = [ 'PUBLIC' ], ) remote_jar ( name = 'jersey-media-multipart', - out = 'jersey-media-multipart-2.22.2.jar', - url = 'mvn:org.glassfish.jersey.media:jersey-media-multipart:jar:2.22.2', - sha1 = '304107e42563307acd337c20734148cca41cda91', - maven_coords = 'org.glassfish.jersey.media:jersey-media-multipart:2.22.2', + out = 'jersey-media-multipart-2.25.jar', + url = 'mvn:org.glassfish.jersey.media:jersey-media-multipart:jar:2.25', + sha1 = 'c16881a7522dc8e2636bf5024d183919c16a7f75', + maven_coords = 'org.glassfish.jersey.media:jersey-media-multipart:2.25', visibility = [ 'PUBLIC' ], ) remote_jar ( name = 'jersey-server', - out = 'jersey-server-2.22.2.jar', - url = 'mvn:org.glassfish.jersey.core:jersey-server:jar:2.22.2', - sha1 = '5ede3e5f98f8b14d31d1d0fffe9908df2bd41c0f', - maven_coords = 'org.glassfish.jersey.core:jersey-server:2.22.2', + out = 'jersey-server-2.25.jar', + url = 'mvn:org.glassfish.jersey.core:jersey-server:jar:2.25', + sha1 = '0874ca16134872781b8c6a2adfe3bb2af80bc378', + maven_coords = 'org.glassfish.jersey.core:jersey-server:2.25', visibility = [ 'PUBLIC' ], ) remote_jar ( name = 'jersey-test-framework-core', - out = 'jersey-test-framework-core-2.22.2.jar', - url = 'mvn:org.glassfish.jersey.test-framework:jersey-test-framework-core:jar:2.22.2', - sha1 = '0abc7ab1ac424392d8761798318f706de40fef4d', - maven_coords = 'org.glassfish.jersey.test-framework:jersey-test-framework-core:jar:NON-OSGI:2.22.2', + out = 'jersey-test-framework-core-2.25.jar', + url = 'mvn:org.glassfish.jersey.test-framework:jersey-test-framework-core:jar:2.25', + sha1 = 'c83b9dda2c2148b189b087eb79aae0017635e8b4', + maven_coords = 'org.glassfish.jersey.test-framework:jersey-test-framework-core:jar:NON-OSGI:2.25', visibility = [ 'PUBLIC' ], ) remote_jar ( name = 'jersey-test-framework-jetty', - out = 'jersey-test-framework-provider-jetty-2.22.2.jar', - url = 'mvn:org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jetty:jar:2.22.2', - sha1 = 'ab3b0418403f6a5cfc311f92b7cd589dc32f60ed', - maven_coords = 'org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jetty:jar:NON-OSGI:2.22.2', + out = 'jersey-test-framework-provider-jetty-2.25.jar', + url = 'mvn:org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jetty:jar:2.25', + sha1 = '50946d9535fb3905bab771c0ba04d28018ffd578', + maven_coords = 'org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jetty:jar:NON-OSGI:2.25', visibility = [ 'PUBLIC' ], ) @@ -938,10 +938,10 @@ remote_jar ( remote_jar ( name = 'javassist', - out = 'javassist-3.18.1-GA.jar', - url = 'mvn:org.javassist:javassist:jar:3.18.1-GA', - sha1 = 'd9a09f7732226af26bf99f19e2cffe0ae219db5b', - maven_coords = 'org.javassist:javassist:3.18.1-GA', + out = 'javassist-3.20.0-GA.jar', + url = 'mvn:org.javassist:javassist:jar:3.20.0-GA', + sha1 = 'a9cbcdfb7e9f86fbc74d3afae65f2248bfbf82a0', + maven_coords = 'org.javassist:javassist:3.20.0-GA', visibility = [ 'PUBLIC' ], ) diff --git a/lib/deps.json b/lib/deps.json index b9710ed156..d44f30cae8 100644 --- a/lib/deps.json +++ b/lib/deps.json @@ -87,7 +87,7 @@ }, "artifacts": { - "aopalliance-repackaged": "mvn:org.glassfish.hk2.external:aopalliance-repackaged:2.4.0-b34", + "aopalliance-repackaged": "mvn:org.glassfish.hk2.external:aopalliance-repackaged:2.5.0-b30", "amqp-client": "mvn:com.rabbitmq:amqp-client:jar:3.6.1", "asm": "mvn:org.ow2.asm:asm:5.0.4", "atomix": "mvn:io.atomix:atomix-all:1.0.0-rc9", @@ -113,10 +113,10 @@ "hamcrest-all": "mvn:org.hamcrest:hamcrest-all:1.3", "hamcrest-core": "mvn:org.hamcrest:hamcrest-core:1.3", "hamcrest-library": "mvn:org.hamcrest:hamcrest-library:1.3", - "hk2-api": "mvn:org.glassfish.hk2:hk2-api:2.4.0-b34", - "hk2-locator": "mvn:org.glassfish.hk2:hk2-locator:2.4.0-b34", + "hk2-api": "mvn:org.glassfish.hk2:hk2-api:2.5.0-b30", + "hk2-locator": "mvn:org.glassfish.hk2:hk2-locator:2.5.0-b30", "hk2-osgi-resource-locator": "mvn:org.glassfish.hk2:osgi-resource-locator:1.0.1", - "hk2-utils": "mvn:org.glassfish.hk2:hk2-utils:2.4.0-b34", + "hk2-utils": "mvn:org.glassfish.hk2:hk2-utils:2.5.0-b30", "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.2", @@ -124,18 +124,18 @@ "jackson-core": "mvn:com.fasterxml.jackson.core:jackson-core:2.7.3", "jackson-databind": "mvn:com.fasterxml.jackson.core:jackson-databind:2.7.3", "javax.annotation-api": "mvn:javax.annotation:javax.annotation-api:1.2", - "javax.inject": "mvn:org.glassfish.hk2.external:javax.inject:2.4.0-b34", + "javax.inject": "mvn:org.glassfish.hk2.external:javax.inject:2.5.0-b30", "javax.ws.rs-api": "mvn:javax.ws.rs:javax.ws.rs-api:2.0.1", - "jersey-client": "mvn:org.glassfish.jersey.core:jersey-client:2.22.2", - "jersey-common": "mvn:org.glassfish.jersey.core:jersey-common:2.22.2", - "jersey-container-jetty-http": "mvn:org.glassfish.jersey.containers:jersey-container-jetty-http:2.22.2", - "jersey-container-servlet": "mvn:org.glassfish.jersey.containers:jersey-container-servlet:2.22.2", - "jersey-container-servlet-core": "mvn:org.glassfish.jersey.containers:jersey-container-servlet-core:2.22.2", - "jersey-guava": "mvn:org.glassfish.jersey.bundles.repackaged:jersey-guava:2.22.2", - "jersey-media-multipart": "mvn:org.glassfish.jersey.media:jersey-media-multipart:2.22.2", - "jersey-server": "mvn:org.glassfish.jersey.core:jersey-server:2.22.2", - "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", + "jersey-client": "mvn:org.glassfish.jersey.core:jersey-client:2.25", + "jersey-common": "mvn:org.glassfish.jersey.core:jersey-common:2.25", + "jersey-container-jetty-http": "mvn:org.glassfish.jersey.containers:jersey-container-jetty-http:2.25", + "jersey-container-servlet": "mvn:org.glassfish.jersey.containers:jersey-container-servlet:2.25", + "jersey-container-servlet-core": "mvn:org.glassfish.jersey.containers:jersey-container-servlet-core:2.25", + "jersey-guava": "mvn:org.glassfish.jersey.bundles.repackaged:jersey-guava:2.25", + "jersey-media-multipart": "mvn:org.glassfish.jersey.media:jersey-media-multipart:2.25", + "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-websocket": "mvn:org.eclipse.jetty:jetty-websocket:8.1.19.v20160209", "jetty-server": "mvn:org.eclipse.jetty:jetty-server:9.1.6.v20160112", @@ -179,7 +179,7 @@ "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", - "javassist": "mvn:org.javassist:javassist:3.18.1-GA", //transitive + "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", "slf4j-api": "mvn:org.slf4j:slf4j-api:1.7.21", diff --git a/lib/pom.xml b/lib/pom.xml index 31d3c13e08..49bda357b0 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -46,7 +46,7 @@ 1.10 5.0.0 3.0.5 - 2.22.2 + 2.25 2.7.3 1.7.21 19.0 diff --git a/protocols/restconf/server/rpp/pom.xml b/protocols/restconf/server/rpp/pom.xml index 09bec635b6..5ee695429b 100644 --- a/protocols/restconf/server/rpp/pom.xml +++ b/protocols/restconf/server/rpp/pom.xml @@ -93,12 +93,12 @@ org.glassfish.jersey.core jersey-client - 2.22.2 + 2.25 org.glassfish.jersey.core jersey-common - 2.22.2 + 2.25 org.onosproject diff --git a/providers/rest/app/features.xml b/providers/rest/app/features.xml index 821662bcf7..dfd736dc57 100644 --- a/providers/rest/app/features.xml +++ b/providers/rest/app/features.xml @@ -23,7 +23,7 @@ mvn:${project.groupId}/onos-restsb-provider-device/${project.version} - mvn:org.glassfish.jersey.core/jersey-client/2.22.2 + mvn:org.glassfish.jersey.core/jersey-client/2.25 mvn:commons-io/commons-io/2.4 mvn:org.apache.httpcomponents/httpclient-osgi/4.5.1 mvn:org.apache.httpcomponents/httpcore-osgi/4.4.4 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 3fb8d4edc1..76081bde4c 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 @@ -101,7 +101,7 @@ org.glassfish.jersey.containers jersey-container-servlet - 2.22.2 + 2.25 provided