홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Jian Li
3276d156 1 parent c299d07a

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
Inline Side-by-side
Showing 11 changed files with 39 additions and 39 deletions
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
73 <dependency> 73 <dependency>
74 <groupId>org.influxdb</groupId> 74 <groupId>org.influxdb</groupId>
75 <artifactId>influxdb-java</artifactId> 75 <artifactId>influxdb-java</artifactId>
76 - <version>2.1</version> 76 + <version>2.2</version>
77 </dependency> 77 </dependency>
78 <dependency> 78 <dependency>
79 <groupId>org.onosproject</groupId> 79 <groupId>org.onosproject</groupId>
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
36 <dependency> 36 <dependency>
37 <groupId>org.apache.commons</groupId> 37 <groupId>org.apache.commons</groupId>
38 <artifactId>commons-math3</artifactId> 38 <artifactId>commons-math3</artifactId>
39 - <version>3.2</version> 39 + <version>3.6.1</version>
40 </dependency> 40 </dependency>
41 41
42 <dependency> 42 <dependency>
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
32 <bundle>mvn:io.netty/netty-codec/4.0.36.Final</bundle> 32 <bundle>mvn:io.netty/netty-codec/4.0.36.Final</bundle>
33 <bundle>mvn:io.netty/netty-transport-native-epoll/4.0.36.Final</bundle> 33 <bundle>mvn:io.netty/netty-transport-native-epoll/4.0.36.Final</bundle>
34 <bundle>mvn:commons-pool/commons-pool/1.6</bundle> 34 <bundle>mvn:commons-pool/commons-pool/1.6</bundle>
35 - <bundle>mvn:org.apache.commons/commons-math3/3.2</bundle> 35 + <bundle>mvn:org.apache.commons/commons-math3/3.6.1</bundle>
36 36
37 <bundle>mvn:joda-time/joda-time/2.9.3</bundle> 37 <bundle>mvn:joda-time/joda-time/2.9.3</bundle>
38 38
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
133 description="ONOS GUI console components"> 133 description="ONOS GUI console components">
134 <feature>onos-api</feature> 134 <feature>onos-api</feature>
135 <feature>onos-thirdparty-web</feature> 135 <feature>onos-thirdparty-web</feature>
136 - <bundle>mvn:org.eclipse.jetty/jetty-websocket/8.1.18.v20150929</bundle> 136 + <bundle>mvn:org.eclipse.jetty/jetty-websocket/8.1.19.v20160209</bundle>
137 <bundle>mvn:org.onosproject/onlab-rest/@ONOS-VERSION</bundle> 137 <bundle>mvn:org.onosproject/onlab-rest/@ONOS-VERSION</bundle>
138 <bundle>mvn:org.onosproject/onos-gui/@ONOS-VERSION</bundle> 138 <bundle>mvn:org.onosproject/onos-gui/@ONOS-VERSION</bundle>
139 </feature> 139 </feature>
......
1 -# ***** This file was auto-generated at Mon May 16 15:32:04 PDT 2016. Do not edit this file manually. ***** 1 +# ***** This file was auto-generated at Wed May 18 14:26:50 PDT 2016. Do not edit this file manually. *****
2 osgi_feature_group( 2 osgi_feature_group(
3 name = 'COMPILE', 3 name = 'COMPILE',
4 visibility = ['PUBLIC'], 4 visibility = ['PUBLIC'],
...@@ -304,10 +304,10 @@ remote_jar ( ...@@ -304,10 +304,10 @@ remote_jar (
304 304
305 remote_jar ( 305 remote_jar (
306 name = 'commons-math3', 306 name = 'commons-math3',
307 - out = 'commons-math3-3.2.jar', 307 + out = 'commons-math3-3.6.1.jar',
308 - url = 'mvn:org.apache.commons:commons-math3:jar:3.2', 308 + url = 'mvn:org.apache.commons:commons-math3:jar:3.6.1',
309 - sha1 = 'ec2544ab27e110d2d431bdad7d538ed509b21e62', 309 + sha1 = 'e4ba98f1d4b3c80ec46392f25e094a6a2e58fcbf',
310 - maven_coords = 'org.apache.commons:commons-math3:3.2', 310 + maven_coords = 'org.apache.commons:commons-math3:3.6.1',
311 visibility = [ 'PUBLIC' ], 311 visibility = [ 'PUBLIC' ],
312 ) 312 )
313 313
...@@ -565,10 +565,10 @@ remote_jar ( ...@@ -565,10 +565,10 @@ remote_jar (
565 565
566 remote_jar ( 566 remote_jar (
567 name = 'influxdb-java', 567 name = 'influxdb-java',
568 - out = 'influxdb-java-2.1.jar', 568 + out = 'influxdb-java-2.2.jar',
569 - url = 'mvn:org.influxdb:influxdb-java:jar:2.1', 569 + url = 'mvn:org.influxdb:influxdb-java:jar:2.2',
570 - sha1 = 'd2fe39fb8db1d823e64fc7ea54b779e1cab917c7', 570 + sha1 = '3774bf8fc20385c99fe003cc104af14eba1cbc6a',
571 - maven_coords = 'org.influxdb:influxdb-java:jar:NON-OSGI:2.1', 571 + maven_coords = 'org.influxdb:influxdb-java:jar:NON-OSGI:2.2',
572 visibility = [ 'PUBLIC' ], 572 visibility = [ 'PUBLIC' ],
573 ) 573 )
574 574
...@@ -700,10 +700,10 @@ remote_jar ( ...@@ -700,10 +700,10 @@ remote_jar (
700 700
701 remote_jar ( 701 remote_jar (
702 name = 'jetty-websocket', 702 name = 'jetty-websocket',
703 - out = 'jetty-websocket-8.1.18.v20150929.jar', 703 + out = 'jetty-websocket-8.1.19.v20160209.jar',
704 - url = 'mvn:org.eclipse.jetty:jetty-websocket:jar:8.1.18.v20150929', 704 + url = 'mvn:org.eclipse.jetty:jetty-websocket:jar:8.1.19.v20160209',
705 - sha1 = '4a1610515aed4f02e7cb6ab0db564489d4d44d9f', 705 + sha1 = 'a423ddda13e52a65d604320472af598ca7122a60',
706 - maven_coords = 'org.eclipse.jetty:jetty-websocket:8.1.18.v20150929', 706 + maven_coords = 'org.eclipse.jetty:jetty-websocket:8.1.19.v20160209',
707 visibility = [ 'PUBLIC' ], 707 visibility = [ 'PUBLIC' ],
708 ) 708 )
709 709
...@@ -1006,19 +1006,19 @@ remote_jar ( ...@@ -1006,19 +1006,19 @@ remote_jar (
1006 1006
1007 remote_jar ( 1007 remote_jar (
1008 name = 'org.osgi.compendium', 1008 name = 'org.osgi.compendium',
1009 - out = 'org.osgi.compendium-4.3.1.jar', 1009 + out = 'org.osgi.compendium-5.0.0.jar',
1010 - url = 'mvn:org.osgi:org.osgi.compendium:jar:4.3.1', 1010 + url = 'mvn:org.osgi:org.osgi.compendium:jar:5.0.0',
1011 - sha1 = 'd1c9d7819de47d938a96ac2a3813bfd914684cf4', 1011 + sha1 = '9d7a9c35591f6fa1c98ac85af32775c12361aee4',
1012 - maven_coords = 'org.osgi:org.osgi.compendium:4.3.1', 1012 + maven_coords = 'org.osgi:org.osgi.compendium:5.0.0',
1013 visibility = [ 'PUBLIC' ], 1013 visibility = [ 'PUBLIC' ],
1014 ) 1014 )
1015 1015
1016 remote_jar ( 1016 remote_jar (
1017 name = 'osgi-core', 1017 name = 'osgi-core',
1018 - out = 'org.osgi.core-4.3.1.jar', 1018 + out = 'org.osgi.core-5.0.0.jar',
1019 - url = 'mvn:org.osgi:org.osgi.core:jar:4.3.1', 1019 + url = 'mvn:org.osgi:org.osgi.core:jar:5.0.0',
1020 - sha1 = '5458ffe2ba049e76c29f2df2dc3ffccddf8b839e', 1020 + sha1 = '6e5e8cd3c9059c08e1085540442a490b59a7783c',
1021 - maven_coords = 'org.osgi:org.osgi.core:4.3.1', 1021 + maven_coords = 'org.osgi:org.osgi.core:5.0.0',
1022 visibility = [ 'PUBLIC' ], 1022 visibility = [ 'PUBLIC' ],
1023 ) 1023 )
1024 1024
......
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
105 "commons-lang": "mvn:commons-lang:commons-lang:2.6", 105 "commons-lang": "mvn:commons-lang:commons-lang:2.6",
106 "commons-lang3": "mvn:org.apache.commons:commons-lang3:3.4", 106 "commons-lang3": "mvn:org.apache.commons:commons-lang3:3.4",
107 "commons-logging": "mvn:commons-logging:commons-logging:1.1.1", 107 "commons-logging": "mvn:commons-logging:commons-logging:1.1.1",
108 - "commons-math3": "mvn:org.apache.commons:commons-math3:3.2", 108 + "commons-math3": "mvn:org.apache.commons:commons-math3:3.6.1",
109 "commons-pool": "mvn:commons-pool:commons-pool:1.6", 109 "commons-pool": "mvn:commons-pool:commons-pool:1.6",
110 "concurrent-trees": "mvn:com.googlecode.concurrent-trees:concurrent-trees:2.4.0", 110 "concurrent-trees": "mvn:com.googlecode.concurrent-trees:concurrent-trees:2.4.0",
111 "copycat-api": "mvn:org.onosproject:copycat-api:0.5.1.onos", 111 "copycat-api": "mvn:org.onosproject:copycat-api:0.5.1.onos",
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
134 "hk2-utils": "mvn:org.glassfish.hk2:hk2-utils:2.4.0-b34", 134 "hk2-utils": "mvn:org.glassfish.hk2:hk2-utils:2.4.0-b34",
135 "httpclient-osgi": "mvn:org.apache.httpcomponents:httpclient-osgi:4.5.1", 135 "httpclient-osgi": "mvn:org.apache.httpcomponents:httpclient-osgi:4.5.1",
136 "httpcore-osgi": "mvn:org.apache.httpcomponents:httpcore-osgi:4.4.4", 136 "httpcore-osgi": "mvn:org.apache.httpcomponents:httpcore-osgi:4.4.4",
137 - "influxdb-java": "mvn:org.influxdb:influxdb-java:2.1", 137 + "influxdb-java": "mvn:org.influxdb:influxdb-java:2.2",
138 "jackson-annotations": "mvn:com.fasterxml.jackson.core:jackson-annotations:2.7.3", 138 "jackson-annotations": "mvn:com.fasterxml.jackson.core:jackson-annotations:2.7.3",
139 "jackson-core": "mvn:com.fasterxml.jackson.core:jackson-core:2.7.3", 139 "jackson-core": "mvn:com.fasterxml.jackson.core:jackson-core:2.7.3",
140 "jackson-databind": "mvn:com.fasterxml.jackson.core:jackson-databind:2.7.3", 140 "jackson-databind": "mvn:com.fasterxml.jackson.core:jackson-databind:2.7.3",
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
149 "jersey-test-framework-core": "mvn:org.glassfish.jersey.test-framework:jersey-test-framework-core:2.22.2", 149 "jersey-test-framework-core": "mvn:org.glassfish.jersey.test-framework:jersey-test-framework-core:2.22.2",
150 "jersey-test-framework-jetty": "mvn:org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jetty:2.22.2", 150 "jersey-test-framework-jetty": "mvn:org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jetty:2.22.2",
151 "jetty-util": "mvn:org.eclipse.jetty:jetty-util:9.1.6.v20160112", 151 "jetty-util": "mvn:org.eclipse.jetty:jetty-util:9.1.6.v20160112",
152 - "jetty-websocket": "mvn:org.eclipse.jetty:jetty-websocket:8.1.18.v20150929", 152 + "jetty-websocket": "mvn:org.eclipse.jetty:jetty-websocket:8.1.19.v20160209",
153 "jetty-server": "mvn:org.eclipse.jetty:jetty-server:9.1.6.v20160112", 153 "jetty-server": "mvn:org.eclipse.jetty:jetty-server:9.1.6.v20160112",
154 "jetty-continuation": "mvn:org.eclipse.jetty:jetty-continuation:9.1.6.v20160112", 154 "jetty-continuation": "mvn:org.eclipse.jetty:jetty-continuation:9.1.6.v20160112",
155 "jetty-http": "mvn:org.eclipse.jetty:jetty-http:9.1.6.v20160112", 155 "jetty-http": "mvn:org.eclipse.jetty:jetty-http:9.1.6.v20160112",
...@@ -186,8 +186,8 @@ ...@@ -186,8 +186,8 @@
186 "org.apache.karaf.shell.console": "mvn:org.apache.karaf.shell:org.apache.karaf.shell.console:3.0.5", 186 "org.apache.karaf.shell.console": "mvn:org.apache.karaf.shell:org.apache.karaf.shell.console:3.0.5",
187 "org.apache.karaf.system.core": "mvn:org.apache.karaf.system:org.apache.karaf.system.core:3.0.5", 187 "org.apache.karaf.system.core": "mvn:org.apache.karaf.system:org.apache.karaf.system.core:3.0.5",
188 "org.apache.servicemix.bundles.snmp4j": "mvn:org.apache.servicemix.bundles:org.apache.servicemix.bundles.snmp4j:2.3.4_1", 188 "org.apache.servicemix.bundles.snmp4j": "mvn:org.apache.servicemix.bundles:org.apache.servicemix.bundles.snmp4j:2.3.4_1",
189 - "org.osgi.compendium": "mvn:org.osgi:org.osgi.compendium:4.3.1", 189 + "org.osgi.compendium": "mvn:org.osgi:org.osgi.compendium:5.0.0",
190 - "osgi-core": "mvn:org.osgi:org.osgi.core:4.3.1", 190 + "osgi-core": "mvn:org.osgi:org.osgi.core:5.0.0",
191 "reflectasm": "mvn:com.esotericsoftware:reflectasm:1.11.0", 191 "reflectasm": "mvn:com.esotericsoftware:reflectasm:1.11.0",
192 "remotetea-oncrpc": "mvn:org.acplt.remotetea:remotetea-oncrpc:1.1.3", 192 "remotetea-oncrpc": "mvn:org.acplt.remotetea:remotetea-oncrpc:1.1.3",
193 "rrd4j": "mvn:org.rrd4j:rrd4j:2.2", 193 "rrd4j": "mvn:org.rrd4j:rrd4j:2.2",
......
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
79 <netty4.version>4.0.36.Final</netty4.version> 79 <netty4.version>4.0.36.Final</netty4.version>
80 <openflowj.version>0.9.3.onos-SNAPSHOT</openflowj.version> 80 <openflowj.version>0.9.3.onos-SNAPSHOT</openflowj.version>
81 <onos-maven-plugin.version>1.9</onos-maven-plugin.version> 81 <onos-maven-plugin.version>1.9</onos-maven-plugin.version>
82 - <osgi.version>4.3.1</osgi.version> 82 + <osgi.version>5.0.0</osgi.version>
83 <karaf.version>3.0.5</karaf.version> 83 <karaf.version>3.0.5</karaf.version>
84 <jersey.version>2.22.2</jersey.version> 84 <jersey.version>2.22.2</jersey.version>
85 <jackson.version>2.7.3</jackson.version> 85 <jackson.version>2.7.3</jackson.version>
......
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
73 <dependency> 73 <dependency>
74 <groupId>org.osgi</groupId> 74 <groupId>org.osgi</groupId>
75 <artifactId>org.osgi.core</artifactId> 75 <artifactId>org.osgi.core</artifactId>
76 - <version>4.3.1</version> 76 + <version>5.0.0</version>
77 <scope>provided</scope> 77 <scope>provided</scope>
78 </dependency> 78 </dependency>
79 <dependency> 79 <dependency>
......
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
121 <dependency> 121 <dependency>
122 <groupId>org.osgi</groupId> 122 <groupId>org.osgi</groupId>
123 <artifactId>org.osgi.core</artifactId> 123 <artifactId>org.osgi.core</artifactId>
124 - <version>4.3.1</version> 124 + <version>5.0.0</version>
125 <scope>provided</scope> 125 <scope>provided</scope>
126 </dependency> 126 </dependency>
127 <dependency> 127 <dependency>
......
...@@ -68,17 +68,17 @@ ...@@ -68,17 +68,17 @@
68 <dependency> 68 <dependency>
69 <groupId>org.eclipse.jetty</groupId> 69 <groupId>org.eclipse.jetty</groupId>
70 <artifactId>jetty-server</artifactId> 70 <artifactId>jetty-server</artifactId>
71 - <version>8.1.18.v20150929</version> 71 + <version>8.1.19.v20160209</version>
72 </dependency> 72 </dependency>
73 <dependency> 73 <dependency>
74 <groupId>org.eclipse.jetty</groupId> 74 <groupId>org.eclipse.jetty</groupId>
75 <artifactId>jetty-servlet</artifactId> 75 <artifactId>jetty-servlet</artifactId>
76 - <version>8.1.18.v20150929</version> 76 + <version>8.1.19.v20160209</version>
77 </dependency> 77 </dependency>
78 <dependency> 78 <dependency>
79 <groupId>org.eclipse.jetty</groupId> 79 <groupId>org.eclipse.jetty</groupId>
80 <artifactId>jetty-websocket</artifactId> 80 <artifactId>jetty-websocket</artifactId>
81 - <version>8.1.18.v20150929</version> 81 + <version>8.1.19.v20160209</version>
82 </dependency> 82 </dependency>
83 </dependencies> 83 </dependencies>
84 84
......
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
105 <dependency> 105 <dependency>
106 <groupId>commons-io</groupId> 106 <groupId>commons-io</groupId>
107 <artifactId>commons-io</artifactId> 107 <artifactId>commons-io</artifactId>
108 - <version>2.2</version> 108 + <version>2.4</version>
109 </dependency> 109 </dependency>
110 110
111 <dependency> 111 <dependency>
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
123 <dependency> 123 <dependency>
124 <groupId>org.antlr</groupId> 124 <groupId>org.antlr</groupId>
125 <artifactId>antlr4-runtime</artifactId> 125 <artifactId>antlr4-runtime</artifactId>
126 - <version>4.5</version> 126 + <version>4.5.3</version>
127 </dependency> 127 </dependency>
128 <dependency> 128 <dependency>
129 <groupId>org.codehaus.mojo</groupId> 129 <groupId>org.codehaus.mojo</groupId>
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
39 <dependency> 39 <dependency>
40 <groupId>org.eclipse.jetty</groupId> 40 <groupId>org.eclipse.jetty</groupId>
41 <artifactId>jetty-websocket</artifactId> 41 <artifactId>jetty-websocket</artifactId>
42 - <version>8.1.18.v20150929</version> 42 + <version>8.1.19.v20160209</version>
43 </dependency> 43 </dependency>
44 <dependency> 44 <dependency>
45 <groupId>javax.servlet</groupId> 45 <groupId>javax.servlet</groupId>
......