You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2019/05/08 09:11:43 UTC
[flink-shaded] branch master updated: [FLINK-12397][build] Drop
flink-shaded-asm-5
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
The following commit(s) were added to refs/heads/master by this push:
new ed42ad1 [FLINK-12397][build] Drop flink-shaded-asm-5
ed42ad1 is described below
commit ed42ad1e9b4e9d9588acc5de61c7703f765a298e
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Wed May 8 11:11:31 2019 +0200
[FLINK-12397][build] Drop flink-shaded-asm-5
---
flink-shaded-asm-5/pom.xml | 83 ----------------------
.../src/main/resources/META-INF/NOTICE | 10 ---
.../main/resources/META-INF/licenses/LICENSE.asm | 31 --------
pom.xml | 1 -
4 files changed, 125 deletions(-)
diff --git a/flink-shaded-asm-5/pom.xml b/flink-shaded-asm-5/pom.xml
deleted file mode 100644
index 1e72bff..0000000
--- a/flink-shaded-asm-5/pom.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?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>7.0</version>
- <relativePath>..</relativePath>
- </parent>
-
- <artifactId>flink-shaded-asm</artifactId>
- <name>flink-shaded-asm-5</name>
- <version>${asm.version}-7.0</version>
-
- <packaging>jar</packaging>
-
- <properties>
- <asm.version>5.0.4</asm.version>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.ow2.asm</groupId>
- <artifactId>asm-all</artifactId>
- <version>${asm.version}</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <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.asm5.org.objectweb</shadedPattern>
- </relocation>
- </relocations>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/flink-shaded-asm-5/src/main/resources/META-INF/NOTICE b/flink-shaded-asm-5/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index a3065f2..0000000
--- a/flink-shaded-asm-5/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,10 +0,0 @@
-flink-shaded-asm
-Copyright 2014-2018 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-This project bundles the following dependencies under the BSD license.
-See bundled license files for details.
-
-- org.ow2.asm:asm-all:5.0.4
\ No newline at end of file
diff --git a/flink-shaded-asm-5/src/main/resources/META-INF/licenses/LICENSE.asm b/flink-shaded-asm-5/src/main/resources/META-INF/licenses/LICENSE.asm
deleted file mode 100644
index 62ffbcc..0000000
--- a/flink-shaded-asm-5/src/main/resources/META-INF/licenses/LICENSE.asm
+++ /dev/null
@@ -1,31 +0,0 @@
-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/pom.xml b/pom.xml
index 76ef223..38f0f3a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,6 @@ 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>