mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-14 08:51:01 +02:00
Code Issues Projects Releases Wiki Activity

Bumping netty dependency versions to 4.1.5.Final.

Browse Source 
Including test fixes.

Few more places referencing atomix version

Change-Id: I48fb8fa255624a86ae12117845603f7d53f1c29e
This commit is contained in:
Jonathan Hart 2017-01-13 09:09:57 -08:00 committed by Ray Milkey
parent 10bd8d11fa
commit 5dc9a4e5ce
13 changed files with 119 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/store/dist/BUCK vendored
View File

@ -8,6 +8,7 @@ COMPILE_DEPS = [
'//lib:netty-buffer',
'//lib:netty-handler',
'//lib:netty-transport-native-epoll',
'//lib:netty-resolver',
'//lib:commons-math3',
'//incubator/api:onos-incubator-api',
]

8
core/store/dist/pom.xml vendored
View File

@ -100,20 +100,28 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
<version>${netty4.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec</artifactId>
<version>${netty4.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
<version>${netty4.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
<version>${netty4.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-resolver</artifactId>
<version>${netty4.version}</version>
</dependency>
</dependencies>
</project>

1
core/store/primitives/BUCK
View File

@ -14,6 +14,7 @@ TEST_DEPS = [
'//lib:netty-handler',
'//lib:netty-buffer',
'//lib:netty-codec',
'//lib:netty-resolver',
]

6
core/store/primitives/pom.xml
View File

@ -70,18 +70,18 @@
<dependency>
<groupId>io.atomix</groupId>
<artifactId>atomix</artifactId>
<version>1.0.0-rc9</version>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>io.atomix.catalyst</groupId>
<artifactId>catalyst-netty</artifactId>
<version>1.1.1</version>
<version>1.1.2</version>
</dependency>
<dependency>
<groupId>io.atomix.catalyst</groupId>
<artifactId>catalyst-transport</artifactId>
<version>1.1.1</version>
<version>1.1.2</version>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>

1
features/BUCK
View File

@ -15,6 +15,7 @@ osgi_feature (
'//lib:netty-handler',
'//lib:netty-codec',
'//lib:netty-transport-native-epoll',
'//lib:netty-resolver',
'//lib:commons-pool',
'//lib:commons-math3',
'//lib:joda-time',

15
features/features.xml
View File

@ -25,12 +25,13 @@
<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.40.Final</bundle>
<bundle>mvn:io.netty/netty-buffer/4.0.40.Final</bundle>
<bundle>mvn:io.netty/netty-transport/4.0.40.Final</bundle>
<bundle>mvn:io.netty/netty-handler/4.0.40.Final</bundle>
<bundle>mvn:io.netty/netty-codec/4.0.40.Final</bundle>
<bundle>mvn:io.netty/netty-transport-native-epoll/4.0.40.Final</bundle>
<bundle>mvn:io.netty/netty-common/4.1.5.Final</bundle>
<bundle>mvn:io.netty/netty-buffer/4.1.5.Final</bundle>
<bundle>mvn:io.netty/netty-transport/4.1.5.Final</bundle>
<bundle>mvn:io.netty/netty-handler/4.1.5.Final</bundle>
<bundle>mvn:io.netty/netty-codec/4.1.5.Final</bundle>
<bundle>mvn:io.netty/netty-transport-native-epoll/4.1.5.Final</bundle>
<bundle>mvn:io.netty/netty-resolver/4.1.5.Final</bundle>
<bundle>mvn:commons-pool/commons-pool/1.6</bundle>
<bundle>mvn:org.apache.commons/commons-math3/3.6.1</bundle>
@ -56,7 +57,7 @@
<bundle>mvn:com.typesafe/config/1.2.1</bundle>
<bundle>mvn:com.googlecode.concurrent-trees/concurrent-trees/2.6.0</bundle>
<bundle>mvn:commons-io/commons-io/2.4</bundle>
<bundle>mvn:io.atomix/atomix-all/1.0.0-rc9</bundle>
<bundle>mvn:io.atomix/atomix-all/1.0.0</bundle>
<bundle>mvn:org.glassfish.jersey.core/jersey-client/2.25</bundle>

91
lib/BUCK
View File

@ -1,4 +1,4 @@
# ***** This file was auto-generated at Wed Jan 18 10:15:14 PST 2017. Do not edit this file manually. *****
# ***** This file was auto-generated at Fri Jan 20 11:48:05 PST 2017. Do not edit this file manually. *****
osgi_feature_group(
name = 'COMPILE',
visibility = ['PUBLIC'],
@ -137,10 +137,10 @@ remote_jar (
remote_jar (
name = 'atomix',
out = 'atomix-all-1.0.0-rc9.jar',
url = 'mvn:io.atomix:atomix-all:jar:1.0.0-rc9',
sha1 = '05a5ff76bba888856416b3132e1c45626f0fcaaf',
maven_coords = 'io.atomix:atomix-all:1.0.0-rc9',
out = 'atomix-all-1.0.0.jar',
url = 'mvn:io.atomix:atomix-all:jar:1.0.0',
sha1 = '1a1074eeb84b416a8ef032dabfe2f6a201978630',
maven_coords = 'io.atomix:atomix-all:1.0.0',
visibility = [ 'PUBLIC' ],
)
@ -740,82 +740,91 @@ remote_jar (
remote_jar (
name = 'netty-buffer',
out = 'netty-buffer-4.0.40.Final.jar',
url = 'mvn:io.netty:netty-buffer:jar:4.0.40.Final',
sha1 = '9ccf9a1130dbb4a4142febd5d6f68c735a7a059b',
maven_coords = 'io.netty:netty-buffer:4.0.40.Final',
out = 'netty-buffer-4.1.5.Final.jar',
url = 'mvn:io.netty:netty-buffer:jar:4.1.5.Final',
sha1 = 'b5fb6bccda4d63d4a74c9faccdf32f77ab66abc1',
maven_coords = 'io.netty:netty-buffer:4.1.5.Final',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'netty-codec',
out = 'netty-codec-4.0.40.Final.jar',
url = 'mvn:io.netty:netty-codec:jar:4.0.40.Final',
sha1 = 'f6ad91e4884b47c3e7e5faa3732b06e317ab82e1',
maven_coords = 'io.netty:netty-codec:4.0.40.Final',
out = 'netty-codec-4.1.5.Final.jar',
url = 'mvn:io.netty:netty-codec:jar:4.1.5.Final',
sha1 = '66bbf9324fa36467d041083f89328e2a24ec4f67',
maven_coords = 'io.netty:netty-codec:4.1.5.Final',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'netty-common',
out = 'netty-common-4.0.40.Final.jar',
url = 'mvn:io.netty:netty-common:jar:4.0.40.Final',
sha1 = 'ef08d9d6fa46f6a937e7a9934030df16f38978ae',
maven_coords = 'io.netty:netty-common:4.0.40.Final',
out = 'netty-common-4.1.5.Final.jar',
url = 'mvn:io.netty:netty-common:jar:4.1.5.Final',
sha1 = '607f8433d8782445e72abe34e43a7e57e86a5e6c',
maven_coords = 'io.netty:netty-common:4.1.5.Final',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'netty-handler',
out = 'netty-handler-4.0.40.Final.jar',
url = 'mvn:io.netty:netty-handler:jar:4.0.40.Final',
sha1 = '1d283fea961c27190a520fc841148715f5569a8a',
maven_coords = 'io.netty:netty-handler:4.0.40.Final',
out = 'netty-handler-4.1.5.Final.jar',
url = 'mvn:io.netty:netty-handler:jar:4.1.5.Final',
sha1 = '6262900ee9487e62560030a136160df953b1cd6b',
maven_coords = 'io.netty:netty-handler:4.1.5.Final',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'netty-transport',
out = 'netty-transport-4.0.40.Final.jar',
url = 'mvn:io.netty:netty-transport:jar:4.0.40.Final',
sha1 = 'ad6890b272eea75185252c85c2927752e221764d',
maven_coords = 'io.netty:netty-transport:4.0.40.Final',
out = 'netty-transport-4.1.5.Final.jar',
url = 'mvn:io.netty:netty-transport:jar:4.1.5.Final',
sha1 = '37126b370722ff9631ee13c91139aacec0a71d1d',
maven_coords = 'io.netty:netty-transport:4.1.5.Final',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'netty-transport-native-epoll',
out = 'netty-transport-native-epoll-4.0.40.Final.jar',
url = 'mvn:io.netty:netty-transport-native-epoll:jar:4.0.40.Final',
sha1 = 'd9cb62e87b207ac0e9913023f404b42987671d56',
maven_coords = 'io.netty:netty-transport-native-epoll:4.0.40.Final',
out = 'netty-transport-native-epoll-4.1.5.Final.jar',
url = 'mvn:io.netty:netty-transport-native-epoll:jar:4.1.5.Final',
sha1 = 'fa367ea8a375f236f4adeef1ac769d2d91dde1d1',
maven_coords = 'io.netty:netty-transport-native-epoll:4.1.5.Final',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'netty-resolver',
out = 'netty-resolver-4.1.5.Final.jar',
url = 'mvn:io.netty:netty-resolver:jar:4.1.5.Final',
sha1 = '5f367bedcdc185a727fda3296b9a18014cdc22c4',
maven_coords = 'io.netty:netty-resolver:4.1.5.Final',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'catalyst-concurrent',
out = 'catalyst-concurrent-1.1.1.jar',
url = 'mvn:io.atomix.catalyst:catalyst-concurrent:jar:1.1.1',
sha1 = 'a7f3499b9815d83f65137abe0146238e447514c7',
maven_coords = 'io.atomix.catalyst:catalyst-concurrent:1.1.1',
out = 'catalyst-concurrent-1.1.2.jar',
url = 'mvn:io.atomix.catalyst:catalyst-concurrent:jar:1.1.2',
sha1 = 'f7323bc5a1ebfd4710574cf5485956c949eec20b',
maven_coords = 'io.atomix.catalyst:catalyst-concurrent:1.1.2',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'catalyst-netty',
out = 'catalyst-netty-1.1.1.jar',
url = 'mvn:io.atomix.catalyst:catalyst-netty:jar:1.1.1',
sha1 = '8e9e5e6d8fdf01be26aa8a8eb07f762f5f4d4eb4',
maven_coords = 'io.atomix.catalyst:catalyst-netty:1.1.1',
out = 'catalyst-netty-1.1.2.jar',
url = 'mvn:io.atomix.catalyst:catalyst-netty:jar:1.1.2',
sha1 = '3072b53b1a6c0686ceccff3d371f8ea8aa28a273',
maven_coords = 'io.atomix.catalyst:catalyst-netty:1.1.2',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'catalyst-transport',
out = 'catalyst-transport-1.1.1.jar',
url = 'mvn:io.atomix.catalyst:catalyst-transport:jar:1.1.1',
sha1 = '2b38cb9ee3b5817b017072a886006461824d00c6',
maven_coords = 'io.atomix.catalyst:catalyst-transport:1.1.1',
out = 'catalyst-transport-1.1.2.jar',
url = 'mvn:io.atomix.catalyst:catalyst-transport:jar:1.1.2',
sha1 = '4a50b74deb6601d7fdca34e873a016c83db7bebf',
maven_coords = 'io.atomix.catalyst:catalyst-transport:1.1.2',
visibility = [ 'PUBLIC' ],
)

21
lib/deps.json
View File

@ -90,7 +90,7 @@
"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",
"atomix": "mvn:io.atomix:atomix-all:1.0.0",
"commons-codec": "mvn:commons-codec:commons-codec:1.10",
"commons-collections": "mvn:commons-collections:commons-collections:3.2.2",
"commons-configuration": "mvn:commons-configuration:commons-configuration:1.10",
@ -157,15 +157,16 @@
"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.40.Final",
"netty-codec": "mvn:io.netty:netty-codec:4.0.40.Final",
"netty-common": "mvn:io.netty:netty-common:4.0.40.Final",
"netty-handler": "mvn:io.netty:netty-handler:4.0.40.Final",
"netty-transport": "mvn:io.netty:netty-transport:4.0.40.Final",
"netty-transport-native-epoll": "mvn:io.netty:netty-transport-native-epoll:4.0.40.Final",
"catalyst-concurrent": "mvn:io.atomix.catalyst:catalyst-concurrent:1.1.1",
"catalyst-netty": "mvn:io.atomix.catalyst:catalyst-netty:1.1.1",
"catalyst-transport": "mvn:io.atomix.catalyst:catalyst-transport:1.1.1",
"netty-buffer": "mvn:io.netty:netty-buffer:4.1.5.Final",
"netty-codec": "mvn:io.netty:netty-codec:4.1.5.Final",
"netty-common": "mvn:io.netty:netty-common:4.1.5.Final",
"netty-handler": "mvn:io.netty:netty-handler:4.1.5.Final",
"netty-transport": "mvn:io.netty:netty-transport:4.1.5.Final",
"netty-transport-native-epoll": "mvn:io.netty:netty-transport-native-epoll:4.1.5.Final",
"netty-resolver": "mvn:io.netty:netty-resolver:4.1.5.Final",
"catalyst-concurrent": "mvn:io.atomix.catalyst:catalyst-concurrent:1.1.2",
"catalyst-netty": "mvn:io.atomix.catalyst:catalyst-netty:1.1.2",
"catalyst-transport": "mvn:io.atomix.catalyst:catalyst-transport:1.1.2",
"objenesis": "mvn:org.objenesis:objenesis:2.2",
"openflowj": "mvn:org.onosproject:openflowj:0.9.7.onos",
"org.apache.felix.scr": "mvn:org.apache.felix:org.apache.felix.scr:1.8.2",

8
lib/pom.xml
View File

@ -41,7 +41,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<onos-build-conf.version>1.3</onos-build-conf.version>
<netty4.version>4.0.40.Final</netty4.version>
<netty4.version>4.1.5.Final</netty4.version>
<openflowj.version>0.9.7.onos</openflowj.version>
<onos-maven-plugin.version>1.10</onos-maven-plugin.version>
<osgi.version>5.0.0</osgi.version>
@ -327,6 +327,12 @@
<classifier>${os.detected.classifier}</classifier>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-resolver</artifactId>
<version>${netty4.version}</version>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>

3
protocols/lisp/ctl/BUCK
View File

@ -6,7 +6,8 @@ COMPILE_DEPS = [
'//lib:netty-codec',
'//lib:netty-transport',
'//lib:netty-transport-native-epoll',
'//lib:netty-handler'
'//lib:netty-handler',
'//lib:netty-resolver',
]
TEST_DEPS = [

21
protocols/lisp/ctl/src/test/java/org/onosproject/lisp/ctl/impl/ChannelAdapter.java
View File

@ -19,6 +19,7 @@ import io.netty.buffer.ByteBufAllocator;
import io.netty.channel.Channel;
import io.netty.channel.ChannelConfig;
import io.netty.channel.ChannelFuture;
import io.netty.channel.ChannelId;
import io.netty.channel.ChannelPipeline;
import io.netty.channel.ChannelPromise;
import io.netty.channel.ChannelProgressivePromise;
@ -33,6 +34,11 @@ import java.net.SocketAddress;
* Adapter for testing against a netty channel.
*/
public class ChannelAdapter implements Channel {
@Override
public ChannelId id() {
return null;
}
@Override
public EventLoop eventLoop() {
return null;
@ -88,6 +94,16 @@ public class ChannelAdapter implements Channel {
return false;
}
@Override
public long bytesBeforeUnwritable() {
return 0;
}
@Override
public long bytesBeforeWritable() {
return 0;
}
@Override
public Unsafe unsafe() {
return null;
@ -223,6 +239,11 @@ public class ChannelAdapter implements Channel {
return null;
}
@Override
public <T> boolean hasAttr(AttributeKey<T> key) {
return false;
}
@Override
public int compareTo(Channel o) {
return 0;

5
protocols/lisp/ctl/src/test/java/org/onosproject/lisp/ctl/impl/ChannelHandlerContextAdapter.java
View File

@ -234,4 +234,9 @@ public class ChannelHandlerContextAdapter implements ChannelHandlerContext {
public <T> Attribute<T> attr(AttributeKey<T> attributeKey) {
return null;
}
@Override
public <T> boolean hasAttr(AttributeKey<T> key) {
return false;
}
}

2
protocols/lisp/ctl/src/test/java/org/onosproject/lisp/ctl/impl/LispMessageAdapter.java
View File

@ -45,7 +45,7 @@ public class LispMessageAdapter implements LispMessage {
@Override
public InetSocketAddress getSender() {
return null;
return new InetSocketAddress(1);
}
@Override