Bump up Jersey from 2.25.1 to 2.26 with corresponding deps updated
Change-Id: I0f9f6795187f78a777852678ab1a7d1442a49986
diff --git a/lib/BUCK b/lib/BUCK
index 954cb86..4f588ae 100644
--- a/lib/BUCK
+++ b/lib/BUCK
@@ -1,11 +1,11 @@
-# ***** This file was auto-generated at Sun, 18 Feb 2018 17:31:29 GMT. Do not edit this file manually. *****
+# ***** This file was auto-generated at Fri, 23 Feb 2018 16:41:27 GMT. Do not edit this file manually. *****
# ***** Use onos-lib-gen *****
pass_thru_pom(
- name = 'onos-dependencies-pom',
- src = 'pom.xml',
- out = 'onos-dependencies.pom',
- artifactId = 'onos-dependencies',
+ name = 'onos-dependencies-pom',
+ src = 'pom.xml',
+ out = 'onos-dependencies.pom',
+ artifactId = 'onos-dependencies',
)
osgi_feature_group(
@@ -75,6 +75,7 @@
':jersey-client',
':jersey-server',
':jersey-common',
+ ':jersey-hk2',
':jersey-test-framework-core',
':jersey-test-framework-jetty',
':jersey-container-jetty-http',
@@ -84,7 +85,6 @@
':jetty-io',
':jetty-util',
':javax.servlet-api',
- ':jersey-guava',
':hk2-api',
':hk2-locator',
':hk2-utils',
@@ -180,10 +180,10 @@
remote_jar (
name = 'aopalliance-repackaged',
- out = 'aopalliance-repackaged-2.5.0-b32.jar',
- url = 'mvn:org.glassfish.hk2.external:aopalliance-repackaged:jar:2.5.0-b32',
- sha1 = '6af37c3f8ec6f9e9653ec837eb508da28ce443cd',
- maven_coords = 'org.glassfish.hk2.external:aopalliance-repackaged:2.5.0-b32',
+ out = 'aopalliance-repackaged-2.5.0-b42.jar',
+ url = 'mvn:org.glassfish.hk2.external:aopalliance-repackaged:jar:2.5.0-b42',
+ sha1 = 'e74beab6ca12e9e745eb47ca61729d9452b96f0c',
+ maven_coords = 'org.glassfish.hk2.external:aopalliance-repackaged:2.5.0-b42',
visibility = [ 'PUBLIC' ],
)
@@ -396,19 +396,19 @@
remote_jar (
name = 'hk2-api',
- out = 'hk2-api-2.5.0-b32.jar',
- url = 'mvn:org.glassfish.hk2:hk2-api:jar:2.5.0-b32',
- sha1 = '6a576c9653832ce610b80a2f389374ef19d96171',
- maven_coords = 'org.glassfish.hk2:hk2-api:2.5.0-b32',
+ out = 'hk2-api-2.5.0-b42.jar',
+ url = 'mvn:org.glassfish.hk2:hk2-api:jar:2.5.0-b42',
+ sha1 = '7fd4e3d0f2cb37c80ad0dedee3f5ee69503eaf52',
+ maven_coords = 'org.glassfish.hk2:hk2-api:2.5.0-b42',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'hk2-locator',
- out = 'hk2-locator-2.5.0-b32.jar',
- url = 'mvn:org.glassfish.hk2:hk2-locator:jar:2.5.0-b32',
- sha1 = '195474f8ad0a8d130e9ea949a771bcf1215fc33b',
- maven_coords = 'org.glassfish.hk2:hk2-locator:2.5.0-b32',
+ out = 'hk2-locator-2.5.0-b42.jar',
+ url = 'mvn:org.glassfish.hk2:hk2-locator:jar:2.5.0-b42',
+ sha1 = '9d6edc0cb226401a8316e67d81bfc37cb626ef91',
+ maven_coords = 'org.glassfish.hk2:hk2-locator:2.5.0-b42',
visibility = [ 'PUBLIC' ],
)
@@ -423,10 +423,10 @@
remote_jar (
name = 'hk2-utils',
- out = 'hk2-utils-2.5.0-b32.jar',
- url = 'mvn:org.glassfish.hk2:hk2-utils:jar:2.5.0-b32',
- sha1 = '5108a926988c4ceda7f1e681dddfe3101454a002',
- maven_coords = 'org.glassfish.hk2:hk2-utils:2.5.0-b32',
+ out = 'hk2-utils-2.5.0-b42.jar',
+ url = 'mvn:org.glassfish.hk2:hk2-utils:jar:2.5.0-b42',
+ sha1 = '102a344e1728825e865a8986d7605602aba3c3b6',
+ maven_coords = 'org.glassfish.hk2:hk2-utils:2.5.0-b42',
visibility = [ 'PUBLIC' ],
)
@@ -522,10 +522,10 @@
remote_jar (
name = 'javax.inject',
- out = 'javax.inject-2.5.0-b32.jar',
- url = 'mvn:org.glassfish.hk2.external:javax.inject:jar:2.5.0-b32',
- sha1 = 'b2fa50c8186a38728c35fe6a9da57ce4cc806923',
- maven_coords = 'org.glassfish.hk2.external:javax.inject:2.5.0-b32',
+ out = 'javax.inject-2.5.0-b42.jar',
+ url = 'mvn:org.glassfish.hk2.external:javax.inject:jar:2.5.0-b42',
+ sha1 = '98e0b7dcef77dc04809f0603868140a1c60bea71',
+ maven_coords = 'org.glassfish.hk2.external:javax.inject:2.5.0-b42',
visibility = [ 'PUBLIC' ],
)
@@ -540,100 +540,100 @@
remote_jar (
name = 'jersey-client',
- out = 'jersey-client-2.25.1.jar',
- url = 'mvn:org.glassfish.jersey.core:jersey-client:jar:2.25.1',
- sha1 = '4d563b1f93352ee9fad597e9e1daf2c6159993c6',
- maven_coords = 'org.glassfish.jersey.core:jersey-client:2.25.1',
+ out = 'jersey-client-2.26.jar',
+ url = 'mvn:org.glassfish.jersey.core:jersey-client:jar:2.26',
+ sha1 = '125b8d1040d121a5dc4ce6858e21a6160bed7afa',
+ maven_coords = 'org.glassfish.jersey.core:jersey-client:2.26',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'jersey-security',
- out = 'oauth2-client-2.25.1.jar',
- url = 'mvn:org.glassfish.jersey.security:oauth2-client:jar:2.25.1',
- sha1 = '5081be1cdc45a48ebeada89157cab4711f7bad1b',
- maven_coords = 'org.glassfish.jersey.security:oauth2-client:jar:NON-OSGI:2.25.1',
+ out = 'oauth2-client-2.26.jar',
+ url = 'mvn:org.glassfish.jersey.security:oauth2-client:jar:2.26',
+ sha1 = '968e1d99c9460e29bdb447114fa8440c3dbafb14',
+ maven_coords = 'org.glassfish.jersey.security:oauth2-client:jar:NON-OSGI:2.26',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'jersey-common',
- out = 'jersey-common-2.25.1.jar',
- url = 'mvn:org.glassfish.jersey.core:jersey-common:jar:2.25.1',
- sha1 = '2438ce68d4907046095ab54aa83a6092951b4bbb',
- maven_coords = 'org.glassfish.jersey.core:jersey-common:2.25.1',
+ out = 'jersey-common-2.26.jar',
+ url = 'mvn:org.glassfish.jersey.core:jersey-common:jar:2.26',
+ sha1 = 'd96475745c5e72cafcbc4dc9e2e725f4d9683f21',
+ maven_coords = 'org.glassfish.jersey.core:jersey-common:2.26',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'jersey-container-jetty-http',
- out = 'jersey-container-jetty-http-2.25.1.jar',
- url = 'mvn:org.glassfish.jersey.containers:jersey-container-jetty-http:jar:2.25.1',
- sha1 = 'f880be688b57ef6d1fa317317da4adef687bfba5',
- maven_coords = 'org.glassfish.jersey.containers:jersey-container-jetty-http:2.25.1',
+ out = 'jersey-container-jetty-http-2.26.jar',
+ url = 'mvn:org.glassfish.jersey.containers:jersey-container-jetty-http:jar:2.26',
+ sha1 = 'c20d58ceb1a5d98aad2b2032ca200403622fe9d6',
+ maven_coords = 'org.glassfish.jersey.containers:jersey-container-jetty-http:2.26',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'jersey-container-servlet',
- out = 'jersey-container-servlet-2.25.1.jar',
- url = 'mvn:org.glassfish.jersey.containers:jersey-container-servlet:jar:2.25.1',
- sha1 = 'cf5f7a76fcea38158b890ab7a0142d4db709a882',
- maven_coords = 'org.glassfish.jersey.containers:jersey-container-servlet:2.25.1',
+ out = 'jersey-container-servlet-2.26.jar',
+ url = 'mvn:org.glassfish.jersey.containers:jersey-container-servlet:jar:2.26',
+ sha1 = '8723d05d1fe2fdda54d0921836ea5daa5abe5f00',
+ maven_coords = 'org.glassfish.jersey.containers:jersey-container-servlet:2.26',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'jersey-container-servlet-core',
- out = 'jersey-container-servlet-core-2.25.1.jar',
- url = 'mvn:org.glassfish.jersey.containers:jersey-container-servlet-core:jar:2.25.1',
- sha1 = '400e30bb035a0cdf3c554530224141ce659a0d1e',
- maven_coords = 'org.glassfish.jersey.containers:jersey-container-servlet-core:2.25.1',
- visibility = [ 'PUBLIC' ],
-)
-
-remote_jar (
- name = 'jersey-guava',
- out = 'jersey-guava-2.25.1.jar',
- url = 'mvn:org.glassfish.jersey.bundles.repackaged:jersey-guava:jar:2.25.1',
- sha1 = 'a2bb4f8208e134cf2cf71dfb8824e42942f7bd06',
- maven_coords = 'org.glassfish.jersey.bundles.repackaged:jersey-guava:2.25.1',
+ out = 'jersey-container-servlet-core-2.26.jar',
+ url = 'mvn:org.glassfish.jersey.containers:jersey-container-servlet-core:jar:2.26',
+ sha1 = '66a0d51facf1e49e2353ff0d2a2d4a9e2fa3f836',
+ maven_coords = 'org.glassfish.jersey.containers:jersey-container-servlet-core:2.26',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'jersey-media-multipart',
- out = 'jersey-media-multipart-2.25.1.jar',
- url = 'mvn:org.glassfish.jersey.media:jersey-media-multipart:jar:2.25.1',
- sha1 = '1d2db0078ee1b740c4e7ec7413d328a8a7e1c480',
- maven_coords = 'org.glassfish.jersey.media:jersey-media-multipart:2.25.1',
+ out = 'jersey-media-multipart-2.26.jar',
+ url = 'mvn:org.glassfish.jersey.media:jersey-media-multipart:jar:2.26',
+ sha1 = 'c7ea0a5819e4688317024c9f4b6e3de54f9d0f3d',
+ maven_coords = 'org.glassfish.jersey.media:jersey-media-multipart:2.26',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'jersey-server',
- out = 'jersey-server-2.25.1.jar',
- url = 'mvn:org.glassfish.jersey.core:jersey-server:jar:2.25.1',
- sha1 = '276e2ee0fd1cdabf99357fce560c5baab675b1a2',
- maven_coords = 'org.glassfish.jersey.core:jersey-server:2.25.1',
+ out = 'jersey-server-2.26.jar',
+ url = 'mvn:org.glassfish.jersey.core:jersey-server:jar:2.26',
+ sha1 = 'aa8eff3d591641dadd7c9880bb73b59bf46d4c82',
+ maven_coords = 'org.glassfish.jersey.core:jersey-server:2.26',
+ visibility = [ 'PUBLIC' ],
+)
+
+remote_jar (
+ name = 'jersey-hk2',
+ out = 'jersey-hk2-2.26.jar',
+ url = 'mvn:org.glassfish.jersey.inject:jersey-hk2:jar:2.26',
+ sha1 = 'df27f7d7577acf4b532684448021632098924dab',
+ maven_coords = 'org.glassfish.jersey.inject:jersey-hk2:2.26',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'jersey-test-framework-core',
- out = 'jersey-test-framework-core-2.25.1.jar',
- url = 'mvn:org.glassfish.jersey.test-framework:jersey-test-framework-core:jar:2.25.1',
- sha1 = '9368dc18933a8b9f2526c86ab310b02781969aa3',
- maven_coords = 'org.glassfish.jersey.test-framework:jersey-test-framework-core:jar:NON-OSGI:2.25.1',
+ out = 'jersey-test-framework-core-2.26.jar',
+ url = 'mvn:org.glassfish.jersey.test-framework:jersey-test-framework-core:jar:2.26',
+ sha1 = '92698666ae89db58074001a34f09b8233ef5effa',
+ maven_coords = 'org.glassfish.jersey.test-framework:jersey-test-framework-core:jar:NON-OSGI:2.26',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'jersey-test-framework-jetty',
- out = 'jersey-test-framework-provider-jetty-2.25.1.jar',
- url = 'mvn:org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jetty:jar:2.25.1',
- sha1 = 'f774ab891c8c7c697fd7f613d51a37e7b7c73366',
- maven_coords = 'org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jetty:jar:NON-OSGI:2.25.1',
+ out = 'jersey-test-framework-provider-jetty-2.26.jar',
+ url = 'mvn:org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jetty:jar:2.26',
+ sha1 = '6be06684283e7c90036d9e24f7793fd8bbb04f6a',
+ maven_coords = 'org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jetty:jar:NON-OSGI:2.26',
visibility = [ 'PUBLIC' ],
)
@@ -1071,10 +1071,10 @@
remote_jar (
name = 'javassist',
- 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',
+ out = 'javassist-3.22.0-GA.jar',
+ url = 'mvn:org.javassist:javassist:jar:3.22.0-GA',
+ sha1 = '3e83394258ae2089be7219b971ec21a8288528ad',
+ maven_coords = 'org.javassist:javassist:3.22.0-GA',
visibility = [ 'PUBLIC' ],
)
@@ -1562,3 +1562,4 @@
maven_coords = 'org.apache.servicemix.bundles:org.apache.servicemix.bundles.kafka-clients:0.8.2.2_1',
visibility = [ 'PUBLIC' ],
)
+
diff --git a/lib/deps.json b/lib/deps.json
index 57bc0c5..4f27a3c 100644
--- a/lib/deps.json
+++ b/lib/deps.json
@@ -44,6 +44,7 @@
"jersey-client",
"jersey-server",
"jersey-common",
+ "jersey-hk2",
"jersey-test-framework-core",
"jersey-test-framework-jetty",
"jersey-container-jetty-http",
@@ -53,7 +54,6 @@
"jetty-io",
"jetty-util",
"javax.servlet-api",
- "jersey-guava",
"hk2-api",
"hk2-locator",
"hk2-utils",
@@ -113,7 +113,7 @@
},
"artifacts": {
- "aopalliance-repackaged": "mvn:org.glassfish.hk2.external:aopalliance-repackaged:2.5.0-b32",
+ "aopalliance-repackaged": "mvn:org.glassfish.hk2.external:aopalliance-repackaged:2.5.0-b42",
"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:2.0.18",
@@ -137,10 +137,10 @@
"guava": "mvn:com.google.guava:guava:22.0",
"guava-testlib": "mvn:com.google.guava:guava-testlib:22.0",
"hamcrest-all": "mvn:org.hamcrest:hamcrest-all:1.3",
- "hk2-api": "mvn:org.glassfish.hk2:hk2-api:2.5.0-b32",
- "hk2-locator": "mvn:org.glassfish.hk2:hk2-locator:2.5.0-b32",
+ "hk2-api": "mvn:org.glassfish.hk2:hk2-api:2.5.0-b42",
+ "hk2-locator": "mvn:org.glassfish.hk2:hk2-locator:2.5.0-b42",
"hk2-osgi-resource-locator": "mvn:org.glassfish.hk2:osgi-resource-locator:1.0.1",
- "hk2-utils": "mvn:org.glassfish.hk2:hk2-utils:2.5.0-b32",
+ "hk2-utils": "mvn:org.glassfish.hk2:hk2-utils:2.5.0-b42",
"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",
@@ -151,19 +151,19 @@
"jackson-core": "mvn:com.fasterxml.jackson.core:jackson-core:2.8.10",
"jackson-databind": "mvn:com.fasterxml.jackson.core:jackson-databind:2.8.10",
"javax.annotation-api": "mvn:javax.annotation:javax.annotation-api:1.2",
- "javax.inject": "mvn:org.glassfish.hk2.external:javax.inject:2.5.0-b32",
+ "javax.inject": "mvn:org.glassfish.hk2.external:javax.inject:2.5.0-b42",
"javax.ws.rs-api": "mvn:javax.ws.rs:javax.ws.rs-api:2.1",
- "jersey-client": "mvn:org.glassfish.jersey.core:jersey-client:2.25.1",
- "jersey-security": "mvn:org.glassfish.jersey.security:oauth2-client:jar:2.25.1",
- "jersey-common": "mvn:org.glassfish.jersey.core:jersey-common:2.25.1",
- "jersey-container-jetty-http": "mvn:org.glassfish.jersey.containers:jersey-container-jetty-http:2.25.1",
- "jersey-container-servlet": "mvn:org.glassfish.jersey.containers:jersey-container-servlet:2.25.1",
- "jersey-container-servlet-core": "mvn:org.glassfish.jersey.containers:jersey-container-servlet-core:2.25.1",
- "jersey-guava": "mvn:org.glassfish.jersey.bundles.repackaged:jersey-guava:2.25.1",
- "jersey-media-multipart": "mvn:org.glassfish.jersey.media:jersey-media-multipart:2.25.1",
- "jersey-server": "mvn:org.glassfish.jersey.core:jersey-server:2.25.1",
- "jersey-test-framework-core": "mvn:org.glassfish.jersey.test-framework:jersey-test-framework-core:2.25.1",
- "jersey-test-framework-jetty": "mvn:org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jetty:2.25.1",
+ "jersey-client": "mvn:org.glassfish.jersey.core:jersey-client:2.26",
+ "jersey-security": "mvn:org.glassfish.jersey.security:oauth2-client:jar:2.26",
+ "jersey-common": "mvn:org.glassfish.jersey.core:jersey-common:2.26",
+ "jersey-container-jetty-http": "mvn:org.glassfish.jersey.containers:jersey-container-jetty-http:2.26",
+ "jersey-container-servlet": "mvn:org.glassfish.jersey.containers:jersey-container-servlet:2.26",
+ "jersey-container-servlet-core": "mvn:org.glassfish.jersey.containers:jersey-container-servlet-core:2.26",
+ "jersey-media-multipart": "mvn:org.glassfish.jersey.media:jersey-media-multipart:2.26",
+ "jersey-server": "mvn:org.glassfish.jersey.core:jersey-server:2.26",
+ "jersey-hk2":"mvn:org.glassfish.jersey.inject:jersey-hk2:2.26",
+ "jersey-test-framework-core": "mvn:org.glassfish.jersey.test-framework:jersey-test-framework-core:2.26",
+ "jersey-test-framework-jetty": "mvn:org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jetty:2.26",
"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.2.21.v20170120",
@@ -212,7 +212,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:3.1",
- "javassist": "mvn:org.javassist:javassist:3.20.0-GA", //transitive
+ "javassist": "mvn:org.javassist:javassist:3.22.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.25",
diff --git a/lib/pom.xml b/lib/pom.xml
index 95f5640..4fc5af61 100644
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -43,7 +43,7 @@
<onos-yang-tools.version>2.4</onos-yang-tools.version>
<osgi.version>5.0.0</osgi.version>
<karaf.version>3.0.8</karaf.version>
- <jersey.version>2.25.1</jersey.version>
+ <jersey.version>2.26</jersey.version>
<jetty.version>9.2.21.v20170120</jetty.version>
<jackson.version>2.8.10</jackson.version>
<slf4j.version>1.7.21</slf4j.version>