(#44) Remove remaining references to netty router release-4.0 4.0 4.0-rc2
authorzentol <chesnay@apache.org>
Wed, 30 May 2018 12:06:29 +0000 (14:06 +0200)
committerzentol <chesnay@apache.org>
Wed, 30 May 2018 12:13:48 +0000 (14:13 +0200)
flink-shaded-netty-4/packaged_licenses/LICENSE.jauter.txt [deleted file]
flink-shaded-netty-4/packaged_licenses/LICENSE.netty_router.txt [deleted file]
flink-shaded-netty-4/pom.xml

diff --git a/flink-shaded-netty-4/packaged_licenses/LICENSE.jauter.txt b/flink-shaded-netty-4/packaged_licenses/LICENSE.jauter.txt
deleted file mode 100644 (file)
index 373fc69..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2014 Ngoc Dao
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/flink-shaded-netty-4/packaged_licenses/LICENSE.netty_router.txt b/flink-shaded-netty-4/packaged_licenses/LICENSE.netty_router.txt
deleted file mode 100644 (file)
index 63a131f..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2015 Ngoc Dao
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
index 5708f146ee17015298c4fcde6191f9f51a8f690d..4b8b97b934c849b70fa2b5e1ce9b6ddf2fd0a225 100644 (file)
@@ -62,7 +62,6 @@ under the License.
                             <dependencyReducedPomLocation>${project.basedir}/target/dependency-reduced-pom.xml</dependencyReducedPomLocation>
                             <artifactSet>
                                 <includes>
-                                    <include>tv.cntt:*</include>
                                     <include>io.netty:*</include>
                                 </includes>
                             </artifactSet>
@@ -71,10 +70,6 @@ under the License.
                                     <pattern>io.netty</pattern>
                                     <shadedPattern>org.apache.flink.shaded.netty4.io.netty</shadedPattern>
                                 </relocation>
-                                <relocation>
-                                    <pattern>jauter</pattern>
-                                    <shadedPattern>org.apache.flink.shaded.netty4.jauter</shadedPattern>
-                                </relocation>
                             </relocations>
                             <transformers>
                                 <!-- The service transformer is needed to merge META-INF/services files -->