홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Jian Li
0a119fe7 1 parent a3e4c7ad

Bump up netty, slf4j, jackson, joda-time maven dependencies 

- netty: 4.0.33.Final -> 4.0.36.Final
- jackson: 2.7.0 -> 2.7.3
- joda-time: 2.9 -> 2.9.3
- slf4j -> 1.7.13 -> 1.7.21

Change-Id: If2cdd0e6e0f52d50be232a817cf7d3f27df20ff1
Inline Side-by-side
Showing 11 changed files with 90 additions and 96 deletions
......@@ -57,13 +57,13 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.13</version>
<version>1.7.21</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<version>1.7.13</version>
<version>1.7.21</version>
</dependency>
<dependency>
......@@ -74,12 +74,12 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.7.0</version>
<version>2.7.3</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.7.0</version>
<version>2.7.3</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
......
......@@ -45,11 +45,6 @@
<artifactId>onos-cli</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
<version>3.9.0.Final</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
......
......@@ -94,7 +94,6 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
<version>3.9.0.Final</version>
</dependency>
<dependency>
......
......@@ -25,16 +25,16 @@
<bundle>mvn:commons-configuration/commons-configuration/1.10</bundle>
<bundle>mvn:com.google.guava/guava/19.0</bundle>
<bundle>mvn:io.netty/netty/3.10.5.Final</bundle>
<bundle>mvn:io.netty/netty-common/4.0.33.Final</bundle>
<bundle>mvn:io.netty/netty-buffer/4.0.33.Final</bundle>
<bundle>mvn:io.netty/netty-transport/4.0.33.Final</bundle>
<bundle>mvn:io.netty/netty-handler/4.0.33.Final</bundle>
<bundle>mvn:io.netty/netty-codec/4.0.33.Final</bundle>
<bundle>mvn:io.netty/netty-transport-native-epoll/4.0.33.Final</bundle>
<bundle>mvn:io.netty/netty-common/4.0.36.Final</bundle>
<bundle>mvn:io.netty/netty-buffer/4.0.36.Final</bundle>
<bundle>mvn:io.netty/netty-transport/4.0.36.Final</bundle>
<bundle>mvn:io.netty/netty-handler/4.0.36.Final</bundle>
<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:joda-time/joda-time/2.9</bundle>
<bundle>mvn:joda-time/joda-time/2.9.3</bundle>
<bundle>mvn:io.dropwizard.metrics/metrics-core/3.1.2</bundle>
<bundle>mvn:io.dropwizard.metrics/metrics-json/3.1.2</bundle>
......@@ -46,9 +46,9 @@
<bundle>mvn:com.esotericsoftware/minlog/1.3.0</bundle>
<bundle>mvn:org.objenesis/objenesis/2.2</bundle>
<bundle>mvn:com.fasterxml.jackson.core/jackson-core/2.7.0</bundle>
<bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/2.7.0</bundle>
<bundle>mvn:com.fasterxml.jackson.core/jackson-databind/2.7.0</bundle>
<bundle>mvn:com.fasterxml.jackson.core/jackson-core/2.7.3</bundle>
<bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/2.7.3</bundle>
<bundle>mvn:com.fasterxml.jackson.core/jackson-databind/2.7.3</bundle>
<bundle>mvn:commons-configuration/commons-configuration/1.10</bundle>
<bundle>mvn:commons-collections/commons-collections/3.2.2</bundle>
......
# ***** This file was auto-generated at Wed May 11 19:22:32 PDT 2016. Do not edit this file manually. *****
# ***** This file was auto-generated at Thu May 12 13:53:20 PDT 2016. Do not edit this file manually. *****
osgi_feature_group(
name = 'COMPILE',
visibility = ['PUBLIC'],
......@@ -187,9 +187,9 @@ remote_jar (
remote_jar (
name = 'onos-atomix',
out = 'atomix-1.0.onos-20160511.220807-302.jar',
url = 'https://oss.sonatype.org/content/repositories/snapshots/org/onosproject/atomix/1.0.onos-SNAPSHOT/atomix-1.0.onos-20160511.220807-302.jar',
sha1 = 'a5686d5905b02202e8228f789268a536a47a1419',
out = 'atomix-1.0.onos-20160512.202119-309.jar',
url = 'https://oss.sonatype.org/content/repositories/snapshots/org/onosproject/atomix/1.0.onos-SNAPSHOT/atomix-1.0.onos-20160512.202119-309.jar',
sha1 = 'ab0ccee5ed5044ebef3d7b7663992894effc1f3a',
maven_coords = 'org.onosproject:atomix:1.0.onos-SNAPSHOT',
visibility = [ 'PUBLIC' ],
)
......@@ -574,28 +574,28 @@ remote_jar (
remote_jar (
name = 'jackson-annotations',
out = 'jackson-annotations-2.7.0.jar',
url = 'mvn:com.fasterxml.jackson.core:jackson-annotations:jar:2.7.0',
sha1 = '19f42c154ffc689f40a77613bc32caeb17d744e3',
maven_coords = 'com.fasterxml.jackson.core:jackson-annotations:2.7.0',
out = 'jackson-annotations-2.7.3.jar',
url = 'mvn:com.fasterxml.jackson.core:jackson-annotations:jar:2.7.3',
sha1 = 'e250c11c1329c7b6b62442a9743befad78be553c',
maven_coords = 'com.fasterxml.jackson.core:jackson-annotations:2.7.3',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'jackson-core',
out = 'jackson-core-2.7.0.jar',
url = 'mvn:com.fasterxml.jackson.core:jackson-core:jar:2.7.0',
sha1 = '05f2bfd0866bcacbcc7c25ce25f80b5aeed0f72f',
maven_coords = 'com.fasterxml.jackson.core:jackson-core:2.7.0',
out = 'jackson-core-2.7.3.jar',
url = 'mvn:com.fasterxml.jackson.core:jackson-core:jar:2.7.3',
sha1 = '1499b854ae9f370409792db5af1b552dc7d9682f',
maven_coords = 'com.fasterxml.jackson.core:jackson-core:2.7.3',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'jackson-databind',
out = 'jackson-databind-2.7.0.jar',
url = 'mvn:com.fasterxml.jackson.core:jackson-databind:jar:2.7.0',
sha1 = '7d3430de9f2b600b074ba3bc007edcfbc4bbf4fb',
maven_coords = 'com.fasterxml.jackson.core:jackson-databind:2.7.0',
out = 'jackson-databind-2.7.3.jar',
url = 'mvn:com.fasterxml.jackson.core:jackson-databind:jar:2.7.3',
sha1 = 'f12e6cd05cbaecd74d16e685d45b627732939e42',
maven_coords = 'com.fasterxml.jackson.core:jackson-databind:2.7.3',
visibility = [ 'PUBLIC' ],
)
......@@ -754,10 +754,10 @@ remote_jar (
remote_jar (
name = 'joda-time',
out = 'joda-time-2.9.jar',
url = 'mvn:joda-time:joda-time:jar:2.9',
sha1 = 'e8a58b7f5853b693b8c4795a714fe77c266c3acc',
maven_coords = 'joda-time:joda-time:2.9',
out = 'joda-time-2.9.3.jar',
url = 'mvn:joda-time:joda-time:jar:2.9.3',
sha1 = '9e46be514a4ed60bcfbaaba88a3c668cf30476ab',
maven_coords = 'joda-time:joda-time:2.9.3',
visibility = [ 'PUBLIC' ],
)
......@@ -880,55 +880,55 @@ remote_jar (
remote_jar (
name = 'netty-buffer',
out = 'netty-buffer-4.0.33.Final.jar',
url = 'mvn:io.netty:netty-buffer:jar:4.0.33.Final',
sha1 = 'dd14c35b020af7aa1c6fed7ec5e67a2aa165619e',
maven_coords = 'io.netty:netty-buffer:4.0.33.Final',
out = 'netty-buffer-4.0.36.Final.jar',
url = 'mvn:io.netty:netty-buffer:jar:4.0.36.Final',
sha1 = '9e767120867ed17e72bf764be0578c712887d7ba',
maven_coords = 'io.netty:netty-buffer:4.0.36.Final',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'netty-codec',
out = 'netty-codec-4.0.33.Final.jar',
url = 'mvn:io.netty:netty-codec:jar:4.0.33.Final',
sha1 = '56c31f1e373a9374f56173383fe8b6e089ea0351',
maven_coords = 'io.netty:netty-codec:4.0.33.Final',
out = 'netty-codec-4.0.36.Final.jar',
url = 'mvn:io.netty:netty-codec:jar:4.0.36.Final',
sha1 = '6a69fc12c1f6f8ac51465c777de8cac0bbd79ba3',
maven_coords = 'io.netty:netty-codec:4.0.36.Final',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'netty-common',
out = 'netty-common-4.0.33.Final.jar',
url = 'mvn:io.netty:netty-common:jar:4.0.33.Final',
sha1 = '1a1fde71cb95a6e18754b0fd7ac6749f15a86543',
maven_coords = 'io.netty:netty-common:4.0.33.Final',
out = 'netty-common-4.0.36.Final.jar',
url = 'mvn:io.netty:netty-common:jar:4.0.36.Final',
sha1 = 'ebcc1f105f8124434cced21effaf702c16ed7a18',
maven_coords = 'io.netty:netty-common:4.0.36.Final',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'netty-handler',
out = 'netty-handler-4.0.33.Final.jar',
url = 'mvn:io.netty:netty-handler:jar:4.0.33.Final',
sha1 = '88325df280c3ba83011cf442883f9f55dc83d5bb',
maven_coords = 'io.netty:netty-handler:4.0.33.Final',
out = 'netty-handler-4.0.36.Final.jar',
url = 'mvn:io.netty:netty-handler:jar:4.0.36.Final',
sha1 = '9d10bfcc57bbb39dafd63979805a93fbe1d069da',
maven_coords = 'io.netty:netty-handler:4.0.36.Final',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'netty-transport',
out = 'netty-transport-4.0.33.Final.jar',
url = 'mvn:io.netty:netty-transport:jar:4.0.33.Final',
sha1 = '287c2378318efc12d6bfe00835cd66317fc53dcd',
maven_coords = 'io.netty:netty-transport:4.0.33.Final',
out = 'netty-transport-4.0.36.Final.jar',
url = 'mvn:io.netty:netty-transport:jar:4.0.36.Final',
sha1 = 'b22c2d243bee4f8183b8a84c9837cff9376f50b3',
maven_coords = 'io.netty:netty-transport:4.0.36.Final',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'netty-transport-native-epoll',
out = 'netty-transport-native-epoll-4.0.33.Final.jar',
url = 'mvn:io.netty:netty-transport-native-epoll:jar:4.0.33.Final',
sha1 = 'f17c2b172e28e9447e0ecf1a87bc4ce3d45647f0',
maven_coords = 'io.netty:netty-transport-native-epoll:4.0.33.Final',
out = 'netty-transport-native-epoll-4.0.36.Final.jar',
url = 'mvn:io.netty:netty-transport-native-epoll:jar:4.0.36.Final',
sha1 = 'b60f013a613d8c299e01abb669be14467758dcdf',
maven_coords = 'io.netty:netty-transport-native-epoll:4.0.36.Final',
visibility = [ 'PUBLIC' ],
)
......@@ -1078,19 +1078,19 @@ remote_jar (
remote_jar (
name = 'slf4j-api',
out = 'slf4j-api-1.7.13.jar',
url = 'mvn:org.slf4j:slf4j-api:jar:1.7.13',
sha1 = '7fcf30c25b8f4a9379b9dad0d3f487b25272c026',
maven_coords = 'org.slf4j:slf4j-api:1.7.13',
out = 'slf4j-api-1.7.21.jar',
url = 'mvn:org.slf4j:slf4j-api:jar:1.7.21',
sha1 = '139535a69a4239db087de9bab0bee568bf8e0b70',
maven_coords = 'org.slf4j:slf4j-api:1.7.21',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'slf4j-jdk14',
out = 'slf4j-jdk14-1.7.13.jar',
url = 'mvn:org.slf4j:slf4j-jdk14:jar:1.7.13',
sha1 = 'bcc4dd3bffd6bce845164140bdf18ce14e76b423',
maven_coords = 'org.slf4j:slf4j-jdk14:1.7.13',
out = 'slf4j-jdk14-1.7.21.jar',
url = 'mvn:org.slf4j:slf4j-jdk14:jar:1.7.21',
sha1 = '168ee1e516a458bd80fb23caf2e512ed41e1e865',
maven_coords = 'org.slf4j:slf4j-jdk14:1.7.21',
visibility = [ 'PUBLIC' ],
)
......
......@@ -138,9 +138,9 @@
"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",
"jackson-annotations": "mvn:com.fasterxml.jackson.core:jackson-annotations:2.7.0",
"jackson-core": "mvn:com.fasterxml.jackson.core:jackson-core:2.7.0",
"jackson-databind": "mvn:com.fasterxml.jackson.core:jackson-databind:2.7.0",
"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",
"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.ws.rs-api": "mvn:javax.ws.rs:javax.ws.rs-api:2.0.1",
......@@ -158,7 +158,7 @@
"jetty-http": "mvn:org.eclipse.jetty:jetty-http:9.1.6.v20160112",
"jetty-io": "mvn:org.eclipse.jetty:jetty-io:9.1.6.v20160112",
"javax.servlet-api": "mvn:javax.servlet:javax.servlet-api:3.1.0",
"joda-time": "mvn:joda-time:joda-time:2.9",
"joda-time": "mvn:joda-time:joda-time:2.9.3",
"jsch": "mvn:com.jcraft:jsch:0.1.53",
"jsr305": "mvn:com.google.code.findbugs:jsr305:3.0.1",
"junit": "mvn:junit:junit:4.12",
......@@ -172,12 +172,12 @@
"minimal-json": "mvn:com.eclipsesource.minimal-json:minimal-json:0.9.4",
"minlog": "mvn:com.esotericsoftware:minlog:1.3.0",
"netty": "mvn:io.netty:netty:3.10.5.Final",
"netty-buffer": "mvn:io.netty:netty-buffer:4.0.33.Final",
"netty-codec": "mvn:io.netty:netty-codec:4.0.33.Final",
"netty-common": "mvn:io.netty:netty-common:4.0.33.Final",
"netty-handler": "mvn:io.netty:netty-handler:4.0.33.Final",
"netty-transport": "mvn:io.netty:netty-transport:4.0.33.Final",
"netty-transport-native-epoll": "mvn:io.netty:netty-transport-native-epoll:4.0.33.Final",
"netty-buffer": "mvn:io.netty:netty-buffer:4.0.36.Final",
"netty-codec": "mvn:io.netty:netty-codec:4.0.36.Final",
"netty-common": "mvn:io.netty:netty-common:4.0.36.Final",
"netty-handler": "mvn:io.netty:netty-handler:4.0.36.Final",
"netty-transport": "mvn:io.netty:netty-transport:4.0.36.Final",
"netty-transport-native-epoll": "mvn:io.netty:netty-transport-native-epoll:4.0.36.Final",
"objenesis": "mvn:org.objenesis:objenesis:2.2",
"openflowj": {
"uri": "mvn:org.onosproject:openflowj:0.9.3.onos-SNAPSHOT",
......@@ -197,8 +197,8 @@
"javassist": "mvn:org.javassist:javassist:3.18.1-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.13",
"slf4j-jdk14": "mvn:org.slf4j:slf4j-jdk14:1.7.13",
"slf4j-api": "mvn:org.slf4j:slf4j-api:1.7.21",
"slf4j-jdk14": "mvn:org.slf4j:slf4j-jdk14:1.7.21",
"typesafe-config": "mvn:com.typesafe:config:1.2.1",
"validation-api": "mvn:javax.validation:validation-api:1.1.0.Final",
"checkstyle": "http://onlab.vicci.org/onos/third-party/checkstyle-6.11.2-all.jar",
......
......@@ -76,14 +76,14 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<onos-build-conf.version>1.3-SNAPSHOT</onos-build-conf.version>
<netty4.version>4.0.33.Final</netty4.version>
<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>
<karaf.version>3.0.5</karaf.version>
<jersey.version>2.22.2</jersey.version>
<jackson.version>2.7.0</jackson.version>
<slf4j.version>1.7.13</slf4j.version>
<jackson.version>2.7.3</jackson.version>
<slf4j.version>1.7.21</slf4j.version>
<guava.version>19.0</guava.version>
<commons.io.version>2.4</commons.io.version>
<!-- TODO argLine was originally added maven-surfire-plugin configuration
......@@ -531,7 +531,7 @@
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>2.9</version>
<version>2.9.3</version>
</dependency>
<dependency>
......
......@@ -108,13 +108,13 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.7.0</version>
<version>2.7.3</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.7.0</version>
<version>2.7.3</version>
<scope>provided</scope>
</dependency>
......
......@@ -79,12 +79,12 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.7.0</version>
<version>2.7.3</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.7.0</version>
<version>2.7.3</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
......
......@@ -54,13 +54,13 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.7.0</version>
<version>2.7.3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.7.0</version>
<version>2.7.3</version>
<scope>compile</scope>
</dependency>
<dependency>
......
......@@ -55,13 +55,13 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.7.0</version>
<version>2.7.3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.7.0</version>
<version>2.7.3</version>
<scope>compile</scope>
</dependency>
......