홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Yuta HIGUCHI
Committed by Gerrit Code Review
287b9389 1 parent df2a4e69

Bump netty 4.0 to latest release 

- 4.0.37 seems to contain security bug-fix
  http://netty.io/news/2016/06/07/4-0-37-Final.html
  All other release notes: http://netty.io/news/

Change-Id: I820c268c0ff58527a43354927dd97ee5431d7b31
Inline Side-by-side
Showing 5 changed files with 43 additions and 44 deletions
...@@ -25,12 +25,12 @@ ...@@ -25,12 +25,12 @@
25 <bundle>mvn:commons-configuration/commons-configuration/1.10</bundle> 25 <bundle>mvn:commons-configuration/commons-configuration/1.10</bundle>
26 <bundle>mvn:com.google.guava/guava/19.0</bundle> 26 <bundle>mvn:com.google.guava/guava/19.0</bundle>
27 <bundle>mvn:io.netty/netty/3.10.5.Final</bundle> 27 <bundle>mvn:io.netty/netty/3.10.5.Final</bundle>
28 - <bundle>mvn:io.netty/netty-common/4.0.36.Final</bundle> 28 + <bundle>mvn:io.netty/netty-common/4.0.40.Final</bundle>
29 - <bundle>mvn:io.netty/netty-buffer/4.0.36.Final</bundle> 29 + <bundle>mvn:io.netty/netty-buffer/4.0.40.Final</bundle>
30 - <bundle>mvn:io.netty/netty-transport/4.0.36.Final</bundle> 30 + <bundle>mvn:io.netty/netty-transport/4.0.40.Final</bundle>
31 - <bundle>mvn:io.netty/netty-handler/4.0.36.Final</bundle> 31 + <bundle>mvn:io.netty/netty-handler/4.0.40.Final</bundle>
32 - <bundle>mvn:io.netty/netty-codec/4.0.36.Final</bundle> 32 + <bundle>mvn:io.netty/netty-codec/4.0.40.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.40.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.6.1</bundle> 35 <bundle>mvn:org.apache.commons/commons-math3/3.6.1</bundle>
36 36
......
1 -# ***** This file was auto-generated at Tue Aug 09 11:28:14 PDT 2016. Do not edit this file manually. ***** 1 +# ***** This file was auto-generated at Thu Aug 11 12:54:15 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'],
...@@ -718,46 +718,55 @@ remote_jar ( ...@@ -718,46 +718,55 @@ remote_jar (
718 718
719 remote_jar ( 719 remote_jar (
720 name = 'netty-buffer', 720 name = 'netty-buffer',
721 - out = 'netty-buffer-4.0.36.Final.jar', 721 + out = 'netty-buffer-4.0.40.Final.jar',
722 - url = 'mvn:io.netty:netty-buffer:jar:4.0.36.Final', 722 + url = 'mvn:io.netty:netty-buffer:jar:4.0.40.Final',
723 - sha1 = '9e767120867ed17e72bf764be0578c712887d7ba', 723 + sha1 = '9ccf9a1130dbb4a4142febd5d6f68c735a7a059b',
724 - maven_coords = 'io.netty:netty-buffer:4.0.36.Final', 724 + maven_coords = 'io.netty:netty-buffer:4.0.40.Final',
725 visibility = [ 'PUBLIC' ], 725 visibility = [ 'PUBLIC' ],
726 ) 726 )
727 727
728 remote_jar ( 728 remote_jar (
729 name = 'netty-codec', 729 name = 'netty-codec',
730 - out = 'netty-codec-4.0.36.Final.jar', 730 + out = 'netty-codec-4.0.40.Final.jar',
731 - url = 'mvn:io.netty:netty-codec:jar:4.0.36.Final', 731 + url = 'mvn:io.netty:netty-codec:jar:4.0.40.Final',
732 - sha1 = '6a69fc12c1f6f8ac51465c777de8cac0bbd79ba3', 732 + sha1 = 'f6ad91e4884b47c3e7e5faa3732b06e317ab82e1',
733 - maven_coords = 'io.netty:netty-codec:4.0.36.Final', 733 + maven_coords = 'io.netty:netty-codec:4.0.40.Final',
734 visibility = [ 'PUBLIC' ], 734 visibility = [ 'PUBLIC' ],
735 ) 735 )
736 736
737 remote_jar ( 737 remote_jar (
738 name = 'netty-common', 738 name = 'netty-common',
739 - out = 'netty-common-4.0.36.Final.jar', 739 + out = 'netty-common-4.0.40.Final.jar',
740 - url = 'mvn:io.netty:netty-common:jar:4.0.36.Final', 740 + url = 'mvn:io.netty:netty-common:jar:4.0.40.Final',
741 - sha1 = 'ebcc1f105f8124434cced21effaf702c16ed7a18', 741 + sha1 = 'ef08d9d6fa46f6a937e7a9934030df16f38978ae',
742 - maven_coords = 'io.netty:netty-common:4.0.36.Final', 742 + maven_coords = 'io.netty:netty-common:4.0.40.Final',
743 visibility = [ 'PUBLIC' ], 743 visibility = [ 'PUBLIC' ],
744 ) 744 )
745 745
746 remote_jar ( 746 remote_jar (
747 name = 'netty-handler', 747 name = 'netty-handler',
748 - out = 'netty-handler-4.0.36.Final.jar', 748 + out = 'netty-handler-4.0.40.Final.jar',
749 - url = 'mvn:io.netty:netty-handler:jar:4.0.36.Final', 749 + url = 'mvn:io.netty:netty-handler:jar:4.0.40.Final',
750 - sha1 = '9d10bfcc57bbb39dafd63979805a93fbe1d069da', 750 + sha1 = '1d283fea961c27190a520fc841148715f5569a8a',
751 - maven_coords = 'io.netty:netty-handler:4.0.36.Final', 751 + maven_coords = 'io.netty:netty-handler:4.0.40.Final',
752 visibility = [ 'PUBLIC' ], 752 visibility = [ 'PUBLIC' ],
753 ) 753 )
754 754
755 remote_jar ( 755 remote_jar (
756 name = 'netty-transport', 756 name = 'netty-transport',
757 - out = 'netty-transport-4.0.36.Final.jar', 757 + out = 'netty-transport-4.0.40.Final.jar',
758 - url = 'mvn:io.netty:netty-transport:jar:4.0.36.Final', 758 + url = 'mvn:io.netty:netty-transport:jar:4.0.40.Final',
759 - sha1 = 'b22c2d243bee4f8183b8a84c9837cff9376f50b3', 759 + sha1 = 'ad6890b272eea75185252c85c2927752e221764d',
760 - maven_coords = 'io.netty:netty-transport:4.0.36.Final', 760 + maven_coords = 'io.netty:netty-transport:4.0.40.Final',
761 + visibility = [ 'PUBLIC' ],
762 +)
763 +
764 +remote_jar (
765 + name = 'netty-transport-native-epoll',
766 + out = 'netty-transport-native-epoll-4.0.40.Final.jar',
767 + url = 'mvn:io.netty:netty-transport-native-epoll:jar:4.0.40.Final',
768 + sha1 = 'd9cb62e87b207ac0e9913023f404b42987671d56',
769 + maven_coords = 'io.netty:netty-transport-native-epoll:4.0.40.Final',
761 visibility = [ 'PUBLIC' ], 770 visibility = [ 'PUBLIC' ],
762 ) 771 )
763 772
...@@ -771,15 +780,6 @@ remote_jar ( ...@@ -771,15 +780,6 @@ remote_jar (
771 ) 780 )
772 781
773 remote_jar ( 782 remote_jar (
774 - name = 'netty-transport-native-epoll',
775 - out = 'netty-transport-native-epoll-4.0.36.Final.jar',
776 - url = 'mvn:io.netty:netty-transport-native-epoll:jar:4.0.36.Final',
777 - sha1 = 'b60f013a613d8c299e01abb669be14467758dcdf',
778 - maven_coords = 'io.netty:netty-transport-native-epoll:4.0.36.Final',
779 - visibility = [ 'PUBLIC' ],
780 -)
781 -
782 -remote_jar (
783 name = 'catalyst-netty', 783 name = 'catalyst-netty',
784 out = 'catalyst-netty-1.1.1.jar', 784 out = 'catalyst-netty-1.1.1.jar',
785 url = 'mvn:io.atomix.catalyst:catalyst-netty:jar:1.1.1', 785 url = 'mvn:io.atomix.catalyst:catalyst-netty:jar:1.1.1',
......
...@@ -151,13 +151,13 @@ ...@@ -151,13 +151,13 @@
151 "minimal-json": "mvn:com.eclipsesource.minimal-json:minimal-json:0.9.4", 151 "minimal-json": "mvn:com.eclipsesource.minimal-json:minimal-json:0.9.4",
152 "minlog": "mvn:com.esotericsoftware:minlog:1.3.0", 152 "minlog": "mvn:com.esotericsoftware:minlog:1.3.0",
153 "netty": "mvn:io.netty:netty:3.10.5.Final", 153 "netty": "mvn:io.netty:netty:3.10.5.Final",
154 - "netty-buffer": "mvn:io.netty:netty-buffer:4.0.36.Final", 154 + "netty-buffer": "mvn:io.netty:netty-buffer:4.0.40.Final",
155 - "netty-codec": "mvn:io.netty:netty-codec:4.0.36.Final", 155 + "netty-codec": "mvn:io.netty:netty-codec:4.0.40.Final",
156 - "netty-common": "mvn:io.netty:netty-common:4.0.36.Final", 156 + "netty-common": "mvn:io.netty:netty-common:4.0.40.Final",
157 - "netty-handler": "mvn:io.netty:netty-handler:4.0.36.Final", 157 + "netty-handler": "mvn:io.netty:netty-handler:4.0.40.Final",
158 - "netty-transport": "mvn:io.netty:netty-transport:4.0.36.Final", 158 + "netty-transport": "mvn:io.netty:netty-transport:4.0.40.Final",
159 + "netty-transport-native-epoll": "mvn:io.netty:netty-transport-native-epoll:4.0.40.Final",
159 "catalyst-concurrent": "mvn:io.atomix.catalyst:catalyst-concurrent:1.1.1", 160 "catalyst-concurrent": "mvn:io.atomix.catalyst:catalyst-concurrent:1.1.1",
160 - "netty-transport-native-epoll": "mvn:io.netty:netty-transport-native-epoll:4.0.36.Final",
161 "catalyst-netty": "mvn:io.atomix.catalyst:catalyst-netty:1.1.1", 161 "catalyst-netty": "mvn:io.atomix.catalyst:catalyst-netty:1.1.1",
162 "catalyst-transport": "mvn:io.atomix.catalyst:catalyst-transport:1.1.1", 162 "catalyst-transport": "mvn:io.atomix.catalyst:catalyst-transport:1.1.1",
163 "objenesis": "mvn:org.objenesis:objenesis:2.2", 163 "objenesis": "mvn:org.objenesis:objenesis:2.2",
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
41 <properties> 41 <properties>
42 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> 42 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
43 <onos-build-conf.version>1.3</onos-build-conf.version> 43 <onos-build-conf.version>1.3</onos-build-conf.version>
44 - <netty4.version>4.0.36.Final</netty4.version> 44 + <netty4.version>4.0.40.Final</netty4.version>
45 <openflowj.version>0.9.5.onos</openflowj.version> 45 <openflowj.version>0.9.5.onos</openflowj.version>
46 <onos-maven-plugin.version>1.10</onos-maven-plugin.version> 46 <onos-maven-plugin.version>1.10</onos-maven-plugin.version>
47 <osgi.version>5.0.0</osgi.version> 47 <osgi.version>5.0.0</osgi.version>
......
...@@ -49,7 +49,6 @@ ...@@ -49,7 +49,6 @@
49 <dependency> 49 <dependency>
50 <groupId>io.netty</groupId> 50 <groupId>io.netty</groupId>
51 <artifactId>netty-common</artifactId> 51 <artifactId>netty-common</artifactId>
52 - <version>4.0.36.Final</version>
53 </dependency> 52 </dependency>
54 </dependencies> 53 </dependencies>
55 54
......