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 1502dcda18db485ca93e06830fc50f9fd08cb65d Author: zentol <[email protected]> AuthorDate: Mon Oct 8 10:37:23 2018 +0200 [FLINK-8033] Add flink-shaded-asm6 --- .../packaged_licenses/LICENSE.asm.txt | 31 ++++++ flink-shaded-asm-6/pom.xml | 108 +++++++++++++++++++++ pom.xml | 1 + 3 files changed, 140 insertions(+) diff --git a/flink-shaded-asm-6/packaged_licenses/LICENSE.asm.txt b/flink-shaded-asm-6/packaged_licenses/LICENSE.asm.txt new file mode 100644 index 0000000..62ffbcc --- /dev/null +++ b/flink-shaded-asm-6/packaged_licenses/LICENSE.asm.txt @@ -0,0 +1,31 @@ +ASM: a very small and fast Java bytecode manipulation framework + +Copyright (c) 2000-2011 INRIA, France Telecom +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +3. Neither the name of the copyright holders nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF +THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/flink-shaded-asm-6/pom.xml b/flink-shaded-asm-6/pom.xml new file mode 100644 index 0000000..85b7855 --- /dev/null +++ b/flink-shaded-asm-6/pom.xml @@ -0,0 +1,108 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.flink</groupId> + <artifactId>flink-shaded</artifactId> + <version>5.0</version> + <relativePath>..</relativePath> + </parent> + + <artifactId>flink-shaded-asm-${asm.major.version}</artifactId> + <version>${asm.version}-5.0</version> + + <packaging>jar</packaging> + + <properties> + <asm.major.version>6</asm.major.version> + <asm.version>${asm.major.version}.2.1</asm.version> + </properties> + + <dependencies> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm</artifactId> + <version>${asm.version}</version> + </dependency> + + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-tree</artifactId> + <version>${asm.version}</version> + </dependency> + + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-analysis</artifactId> + <version>${asm.version}</version> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <!-- asm6 uses java9 modularization which cannot be processed with 3.0.0 --> + <version>3.1.1</version> + <executions> + <execution> + <id>shade-flink</id> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <createDependencyReducedPom>true</createDependencyReducedPom> + <dependencyReducedPomLocation>${project.basedir}/target/dependency-reduced-pom.xml</dependencyReducedPomLocation> + <artifactSet> + <includes> + <include>org.ow2.asm:*</include> + </includes> + </artifactSet> + <relocations> + <relocation> + <pattern>org.objectweb</pattern> + <shadedPattern>org.apache.flink.shaded.asm6.org.objectweb</shadedPattern> + </relocation> + </relocations> + <transformers> + <!-- The service transformer is needed to merge META-INF/services files --> + <transformer + implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/> + <!-- The ApacheNoticeResourceTransformer collects and aggregates NOTICE files --> + <transformer + implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer"/> + <!-- The ApacheLicenseResourceTransformer prevents duplicate Apache Licenses --> + <transformer + implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/> + </transformers> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> diff --git a/pom.xml b/pom.xml index 7581102..e1e9505 100644 --- a/pom.xml +++ b/pom.xml @@ -54,6 +54,7 @@ under the License. <modules> <module>flink-shaded-force-shading</module> <module>flink-shaded-asm-5</module> + <module>flink-shaded-asm-6</module> <module>flink-shaded-guava-18</module> <module>flink-shaded-netty-4</module> <module>flink-shaded-jackson-parent</module>
