This is an automated email from the ASF dual-hosted git repository. chesnay pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink-shaded.git
commit 6583eb8c89096a462d47d6213abf9f4884777a3a Author: zentol <[email protected]> AuthorDate: Wed May 30 14:06:29 2018 +0200 (#44) Remove remaining references to netty router --- .../packaged_licenses/LICENSE.jauter.txt | 20 -------------------- .../packaged_licenses/LICENSE.netty_router.txt | 20 -------------------- flink-shaded-netty-4/pom.xml | 5 ----- 3 files changed, 45 deletions(-) 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 index 373fc69..0000000 --- a/flink-shaded-netty-4/packaged_licenses/LICENSE.jauter.txt +++ /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 index 63a131f..0000000 --- a/flink-shaded-netty-4/packaged_licenses/LICENSE.netty_router.txt +++ /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 diff --git a/flink-shaded-netty-4/pom.xml b/flink-shaded-netty-4/pom.xml index c2f8b6f..8b5c65e 100644 --- a/flink-shaded-netty-4/pom.xml +++ b/flink-shaded-netty-4/pom.xml @@ -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 -->
