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/01/31 14:12:56 UTC
[flink-shaded] branch master updated (735c20c -> daa7317)
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/flink-shaded.git.
from 735c20c [FLINK-11154][network] Bump netty to 4.1.32
new 80befaf [FLINK-11022] Define transformers in parent pom
new d0807f7 [FLINK-11022] Sync license packaging with Flink
new daa7317 [FLINK-11022] Add NOTICE files
The 47 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
flink-shaded-asm-5/pom.xml | 11 ------
.../src/main/resources/META-INF/NOTICE | 10 ++++++
.../main/resources/META-INF/licenses/LICENSE.asm | 0
flink-shaded-asm-6/pom.xml | 11 ------
.../src/main/resources/META-INF/NOTICE | 12 +++++++
.../main/resources/META-INF/licenses/LICENSE.asm | 0
flink-shaded-guava-18/pom.xml | 11 ------
.../src/main/resources/META-INF/NOTICE | 6 ++--
.../src/main/resources/META-INF/NOTICE | 14 ++++++++
.../src/main/resources/META-INF/NOTICE | 13 ++++++++
flink-shaded-jackson-parent/pom.xml | 11 ------
flink-shaded-netty-4/pom.xml | 11 ------
pom.xml | 39 ++++++----------------
13 files changed, 63 insertions(+), 86 deletions(-)
create mode 100644 flink-shaded-asm-5/src/main/resources/META-INF/NOTICE
rename flink-shaded-asm-6/packaged_licenses/LICENSE.asm.txt => flink-shaded-asm-5/src/main/resources/META-INF/licenses/LICENSE.asm (100%)
create mode 100644 flink-shaded-asm-6/src/main/resources/META-INF/NOTICE
rename flink-shaded-asm-5/packaged_licenses/LICENSE.asm.txt => flink-shaded-asm-6/src/main/resources/META-INF/licenses/LICENSE.asm (100%)
copy {flink-shaded-netty-4 => flink-shaded-guava-18}/src/main/resources/META-INF/NOTICE (71%)
create mode 100644 flink-shaded-jackson-parent/flink-shaded-jackson-2/src/main/resources/META-INF/NOTICE
create mode 100644 flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/src/main/resources/META-INF/NOTICE
[flink-shaded] 04/47: [FLINK-6981] Add flink-shaded-guava module
Posted by ch...@apache.org.
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 75c797449700a6b7e86bf05317be057111b0f966
Author: zentol <ch...@apache.org>
AuthorDate: Thu Jun 22 09:33:58 2017 +0200
[FLINK-6981] Add flink-shaded-guava module
---
flink-shaded-guava-18/pom.xml | 94 +++++++++++++++++++++++++++++++++++++++++++
pom.xml | 4 ++
2 files changed, 98 insertions(+)
diff --git a/flink-shaded-guava-18/pom.xml b/flink-shaded-guava-18/pom.xml
new file mode 100644
index 0000000..7e63fd0
--- /dev/null
+++ b/flink-shaded-guava-18/pom.xml
@@ -0,0 +1,94 @@
+<?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>1.0</version>
+ <relativePath>..</relativePath>
+ </parent>
+
+ <artifactId>flink-shaded-guava-18</artifactId>
+ <name>flink-shaded-guava-18</name>
+ <version>1.0-${guava.version}</version>
+
+ <packaging>jar</packaging>
+
+ <properties>
+ <guava.version>18.0</guava.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava.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>
+ <artifactSet>
+ <includes>
+ <include>com.google.guava:*</include>
+ </includes>
+ </artifactSet>
+ <relocations>
+ <relocation>
+ <pattern>com.google</pattern>
+ <shadedPattern>org.apache.flink.shaded.guava18.com.google</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 4d530fc..5c535ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,6 +55,10 @@ under the License.
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/flink-shaded.git</developerConnection>
</scm>
+ <modules>
+ <module>flink-shaded-guava-18</module>
+ </modules>
+
<build>
<plugins>
<plugin>
[flink-shaded] 30/47: (#38) Include missing javax validation-api
dependency
Posted by ch...@apache.org.
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 52701f9d4bdef09ead31732244ddfa02dca3e42b
Author: zentol <ch...@apache.org>
AuthorDate: Mon Feb 19 14:02:43 2018 +0100
(#38) Include missing javax validation-api dependency
---
.../pom.xml | 27 ++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/pom.xml b/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/pom.xml
index e7407f6..9079575 100644
--- a/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/pom.xml
+++ b/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/pom.xml
@@ -40,4 +40,31 @@ under the License.
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>shade-flink</id>
+ <configuration>
+ <artifactSet>
+ <includes combine.children="append">
+ <include>javax.validation:validation-api</include>
+ </includes>
+ </artifactSet>
+ <relocations combine.children="append">
+ <relocation>
+ <pattern>javax.validation</pattern>
+ <shadedPattern>org.apache.flink.shaded.jackson2.javax.validation
+ </shadedPattern>
+ </relocation>
+ </relocations>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
[flink-shaded] 32/47: [FLINK-3952] Bump netty to 4.1.24 and drop
netty-router
Posted by ch...@apache.org.
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 149cec8fc3ffdcc8ef080533ea0a9ee33ee008a3
Author: Piotr Nowojski <pi...@gmail.com>
AuthorDate: Thu May 24 11:44:48 2018 +0200
[FLINK-3952] Bump netty to 4.1.24 and drop netty-router
---
flink-shaded-netty-4/pom.xml | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/flink-shaded-netty-4/pom.xml b/flink-shaded-netty-4/pom.xml
index 3ac5c25..0aa734b 100644
--- a/flink-shaded-netty-4/pom.xml
+++ b/flink-shaded-netty-4/pom.xml
@@ -34,7 +34,7 @@ under the License.
<version>${netty.version}-4.0</version>
<properties>
- <netty.version>4.0.56.Final</netty.version>
+ <netty.version>4.1.24.Final</netty.version>
</properties>
<dependencies>
@@ -43,12 +43,6 @@ under the License.
<artifactId>netty-all</artifactId>
<version>${netty.version}</version>
</dependency>
-
- <dependency>
- <groupId>tv.cntt</groupId>
- <artifactId>netty-router</artifactId>
- <version>1.10</version>
- </dependency>
</dependencies>
<build>
@@ -101,4 +95,4 @@ under the License.
</build>
-</project>
\ No newline at end of file
+</project>
[flink-shaded] 07/47: Add flink-shaded-netty module
Posted by ch...@apache.org.
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 a78b48a721b595eec56c94567ae52c2879ee1a2e
Author: zentol <ch...@apache.org>
AuthorDate: Tue Jun 27 14:35:52 2017 +0200
Add flink-shaded-netty module
---
flink-shaded-netty-4/pom.xml | 112 +++++++++++++++++++++++++++++++++++++++++++
pom.xml | 1 +
2 files changed, 113 insertions(+)
diff --git a/flink-shaded-netty-4/pom.xml b/flink-shaded-netty-4/pom.xml
new file mode 100644
index 0000000..b831c44
--- /dev/null
+++ b/flink-shaded-netty-4/pom.xml
@@ -0,0 +1,112 @@
+<?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>1.0</version>
+ <relativePath>..</relativePath>
+ </parent>
+
+ <artifactId>flink-shaded-netty-4</artifactId>
+ <name>flink-shaded-netty-4</name>
+ <version>1.0-${netty.version}</version>
+
+ <properties>
+ <!-- Don't upgrade for now. Netty versions >= 4.0.28.Final
+ contain an improvement by Netty, which slices a Netty buffer
+ instead of doing a memory copy [1] in the
+ LengthFieldBasedFrameDecoder. In some situations, this
+ interacts badly with our Netty pipeline leading to OutOfMemory
+ errors.
+
+ [1] https://github.com/netty/netty/issues/3704 -->
+ <netty.version>4.0.27.Final</netty.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-all</artifactId>
+ <version>${netty.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>tv.cntt</groupId>
+ <artifactId>netty-router</artifactId>
+ <version>1.10</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>tv.cntt:*</include>
+ <include>io.netty:*</include>
+ </includes>
+ </artifactSet>
+ <relocations>
+ <relocation>
+ <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 -->
+ <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>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 15e7c6c..f60c259 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,6 +57,7 @@ under the License.
<modules>
<module>flink-shaded-guava-18</module>
+ <module>flink-shaded-netty-4</module>
</modules>
<build>
[flink-shaded] 20/47: (#19) Increment parent version to 2.0
Posted by ch...@apache.org.
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 c69612962a61d21f22fa2a8c93e90fc49f069819
Author: zentol <ch...@apache.org>
AuthorDate: Tue Aug 22 15:19:57 2017 +0200
(#19) Increment parent version to 2.0
---
flink-shaded-asm-5/pom.xml | 2 +-
flink-shaded-guava-18/pom.xml | 2 +-
flink-shaded-netty-4/pom.xml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/flink-shaded-asm-5/pom.xml b/flink-shaded-asm-5/pom.xml
index 5dc630a..1402d76 100644
--- a/flink-shaded-asm-5/pom.xml
+++ b/flink-shaded-asm-5/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded</artifactId>
- <version>1.0</version>
+ <version>2.0</version>
<relativePath>..</relativePath>
</parent>
diff --git a/flink-shaded-guava-18/pom.xml b/flink-shaded-guava-18/pom.xml
index e44f404..3cabddc 100644
--- a/flink-shaded-guava-18/pom.xml
+++ b/flink-shaded-guava-18/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded</artifactId>
- <version>1.0</version>
+ <version>2.0</version>
<relativePath>..</relativePath>
</parent>
diff --git a/flink-shaded-netty-4/pom.xml b/flink-shaded-netty-4/pom.xml
index 5ceb179..7f47d06 100644
--- a/flink-shaded-netty-4/pom.xml
+++ b/flink-shaded-netty-4/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded</artifactId>
- <version>1.0</version>
+ <version>2.0</version>
<relativePath>..</relativePath>
</parent>
[flink-shaded] 22/47: Increment version to 3.0
Posted by ch...@apache.org.
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 0c4e83f87d36060c0a5c6c139e00b9afec4f5d19
Author: zentol <ch...@apache.org>
AuthorDate: Mon Oct 30 15:55:11 2017 +0100
Increment version to 3.0
---
flink-shaded-asm-5/pom.xml | 4 ++--
flink-shaded-guava-18/pom.xml | 4 ++--
flink-shaded-jackson-2/pom.xml | 4 ++--
flink-shaded-netty-4/pom.xml | 4 ++--
pom.xml | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/flink-shaded-asm-5/pom.xml b/flink-shaded-asm-5/pom.xml
index 1402d76..ebebfc6 100644
--- a/flink-shaded-asm-5/pom.xml
+++ b/flink-shaded-asm-5/pom.xml
@@ -25,13 +25,13 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded</artifactId>
- <version>2.0</version>
+ <version>3.0</version>
<relativePath>..</relativePath>
</parent>
<artifactId>flink-shaded-asm</artifactId>
<name>flink-shaded-asm-5</name>
- <version>${asm.version}-2.0</version>
+ <version>${asm.version}-3.0</version>
<packaging>jar</packaging>
diff --git a/flink-shaded-guava-18/pom.xml b/flink-shaded-guava-18/pom.xml
index 3cabddc..b178183 100644
--- a/flink-shaded-guava-18/pom.xml
+++ b/flink-shaded-guava-18/pom.xml
@@ -25,13 +25,13 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded</artifactId>
- <version>2.0</version>
+ <version>3.0</version>
<relativePath>..</relativePath>
</parent>
<artifactId>flink-shaded-guava</artifactId>
<name>flink-shaded-guava-18</name>
- <version>${guava.version}-2.0</version>
+ <version>${guava.version}-3.0</version>
<packaging>jar</packaging>
diff --git a/flink-shaded-jackson-2/pom.xml b/flink-shaded-jackson-2/pom.xml
index 63a5e49..22d307c 100644
--- a/flink-shaded-jackson-2/pom.xml
+++ b/flink-shaded-jackson-2/pom.xml
@@ -25,13 +25,13 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded</artifactId>
- <version>2.0</version>
+ <version>3.0</version>
<relativePath>..</relativePath>
</parent>
<artifactId>flink-shaded-jackson</artifactId>
<name>flink-shaded-jackson-2</name>
- <version>${jackson.version}-2.0</version>
+ <version>${jackson.version}-3.0</version>
<properties>
<jackson.version>2.7.9</jackson.version>
diff --git a/flink-shaded-netty-4/pom.xml b/flink-shaded-netty-4/pom.xml
index 7f47d06..4018920 100644
--- a/flink-shaded-netty-4/pom.xml
+++ b/flink-shaded-netty-4/pom.xml
@@ -25,13 +25,13 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded</artifactId>
- <version>2.0</version>
+ <version>3.0</version>
<relativePath>..</relativePath>
</parent>
<artifactId>flink-shaded-netty</artifactId>
<name>flink-shaded-netty-4</name>
- <version>${netty.version}-2.0</version>
+ <version>${netty.version}-3.0</version>
<properties>
<!-- Don't upgrade for now. Netty versions >= 4.0.28.Final
diff --git a/pom.xml b/pom.xml
index 8e84f7c..f82a2e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@ under the License.
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded</artifactId>
- <version>2.0</version>
+ <version>3.0</version>
<name>flink-shaded</name>
<packaging>pom</packaging>
[flink-shaded] 18/47: (#18) Add flink-shaded-jackson-2 module
Posted by ch...@apache.org.
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 2e2fdcca6a655e2208d840d1f6a105681124bac6
Author: zentol <ch...@apache.org>
AuthorDate: Wed Aug 2 14:24:13 2017 +0200
(#18) Add flink-shaded-jackson-2 module
---
flink-shaded-jackson-2/pom.xml | 103 +++++++++++++++++++++++++++++++++++++++++
pom.xml | 1 +
2 files changed, 104 insertions(+)
diff --git a/flink-shaded-jackson-2/pom.xml b/flink-shaded-jackson-2/pom.xml
new file mode 100644
index 0000000..328d5e4
--- /dev/null
+++ b/flink-shaded-jackson-2/pom.xml
@@ -0,0 +1,103 @@
+<?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>1.0</version>
+ <relativePath>..</relativePath>
+ </parent>
+
+ <artifactId>flink-shaded-jackson</artifactId>
+ <name>flink-shaded-jackson-2</name>
+ <version>${jackson.version}-1.0</version>
+
+ <properties>
+ <jackson.version>2.7.9</jackson.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson.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>com.fasterxml.jackson.core:*</include>
+ </includes>
+ </artifactSet>
+ <relocations>
+ <relocation>
+ <pattern>com.fasterxml.jackson</pattern>
+ <shadedPattern>org.apache.flink.shaded.jackson2.com.fasterxml.jackson</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>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 3c90875..09183d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,6 +55,7 @@ under the License.
<module>flink-shaded-asm-5</module>
<module>flink-shaded-guava-18</module>
<module>flink-shaded-netty-4</module>
+ <module>flink-shaded-jackson-2</module>
</modules>
<profiles>
[flink-shaded] 29/47: (#37) Include jackson-dataformat-yaml and
snakeyaml
Posted by ch...@apache.org.
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 6f68171f8aac6884bc62fd336943acdfa1679635
Author: zentol <ch...@apache.org>
AuthorDate: Mon Feb 19 13:50:47 2018 +0100
(#37) Include jackson-dataformat-yaml and snakeyaml
---
.../flink-shaded-jackson-2/pom.xml | 35 ++++++++++++++++++++++
1 file changed, 35 insertions(+)
diff --git a/flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml b/flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml
index 6a72eca..167020a 100644
--- a/flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml
+++ b/flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml
@@ -32,4 +32,39 @@ under the License.
<artifactId>flink-shaded-jackson</artifactId>
<name>flink-shaded-jackson-2</name>
+ <dependencies>
+ <dependency>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-yaml</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>shade-flink</id>
+ <configuration>
+ <artifactSet>
+ <includes combine.children="append">
+ <include>org.yaml:snakeyaml</include>
+ </includes>
+ </artifactSet>
+ <relocations combine.children="append">
+ <relocation>
+ <pattern>org.yaml</pattern>
+ <shadedPattern>org.apache.flink.shaded.jackson2.org.yaml
+ </shadedPattern>
+ </relocation>
+ </relocations>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
[flink-shaded] 06/47: Add shade plugin to pluginManagement
Posted by ch...@apache.org.
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 7e3e6f0e739b771f0511b022ed1c724ec1c12e88
Author: zentol <ch...@apache.org>
AuthorDate: Tue Jun 27 16:34:56 2017 +0200
Add shade plugin to pluginManagement
---
pom.xml | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/pom.xml b/pom.xml
index 5c535ee..15e7c6c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,6 +60,16 @@ under the License.
</modules>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>2.4.1</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
<plugins>
<plugin>
<groupId>org.apache.rat</groupId>
[flink-shaded] 03/47: Remove reference to nonexisting child module
Posted by ch...@apache.org.
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 99ec784c4f5ba3813b3be6135f3e431cb5eca9d7
Author: zentol <ch...@apache.org>
AuthorDate: Mon Jun 26 14:51:55 2017 +0200
Remove reference to nonexisting child module
---
pom.xml | 4 ----
1 file changed, 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index e5ad57f..4d530fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,10 +55,6 @@ under the License.
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/flink-shaded.git</developerConnection>
</scm>
- <modules>
- <module>flink-shaded-guava</module>
- </modules>
-
<build>
<plugins>
<plugin>
[flink-shaded] 35/47: [release] Add modular release scripts
Posted by ch...@apache.org.
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 2014030963fe8e8a7414fd14afa86dd5c91e2745
Author: zentol <ch...@apache.org>
AuthorDate: Wed May 30 10:52:59 2018 +0200
[release] Add modular release scripts
Reworks the release scripts to be module.
This converges the release process for flink and flink-shaded.
---
.gitignore | 3 +-
pom.xml | 2 +
tools/create_release_branch.sh | 57 +++++++++
tools/create_release_files.sh | 206 -------------------------------
tools/releasing/create_release_branch.sh | 57 +++++++++
tools/releasing/create_source_release.sh | 76 ++++++++++++
tools/releasing/deploy_staging_jars.sh | 43 +++++++
tools/releasing/update_branch_version.sh | 60 +++++++++
8 files changed, 297 insertions(+), 207 deletions(-)
diff --git a/.gitignore b/.gitignore
index aac6e70..8f7a660 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
.cache
.idea
target
-*.iml
\ No newline at end of file
+*.iml
+tools/release
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index bbac628..900d71a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -190,6 +190,8 @@ under the License.
<exclude>**/target/**</exclude>
<!-- the licenses that are re-bundled -->
<exclude>**/packaged_licenses/LICENSE.*.txt</exclude>
+ <!-- release files -->
+ <exclude>**/release/**</exclude>
</excludes>
</configuration>
</plugin>
diff --git a/tools/create_release_branch.sh b/tools/create_release_branch.sh
new file mode 100644
index 0000000..71fd87c
--- /dev/null
+++ b/tools/create_release_branch.sh
@@ -0,0 +1,57 @@
+#!/usr/bin/env bash
+
+#
+# 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.
+#
+
+##
+## Variables with defaults (if not overwritten by environment)
+##
+RELEASE_CANDIDATE=${RELEASE_CANDIDATE:-none}
+MVN=${MVN:-mvn}
+
+# fail immediately
+set -o errexit
+set -o nounset
+# print command before executing
+set -o xtrace
+
+CURR_DIR=`pwd`
+if [[ `basename ${CURR_DIR}` != "tools" ]] ; then
+ echo "You have to call the script from the tools/ dir"
+ exit 1
+fi
+
+###########################
+
+if [ -z "${RELEASE_VERSION}" ]; then
+ echo "RELEASE_VERSION is unset"
+ exit 1
+fi
+
+cd ..
+
+target_branch=release-${RELEASE_VERSION}
+if [ "${RELEASE_CANDIDATE}" != "none" ]; then
+ target_branch=${target_branch}-rc${RELEASE_CANDIDATE}
+fi
+
+git checkout -b ${target_branch}
+
+RELEASE_HASH=`git rev-parse HEAD`
+echo "Echo created release hash $RELEASE_HASH"
+
+echo "Done. Don't forget to create the release tag on GitHub and push the changes."
diff --git a/tools/create_release_files.sh b/tools/create_release_files.sh
deleted file mode 100755
index 7d51f46..0000000
--- a/tools/create_release_files.sh
+++ /dev/null
@@ -1,206 +0,0 @@
-#!/usr/bin/env bash
-
-#
-# 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.
-#
-
-# Quick-and-dirty automation of making maven and binary releases. Not robust at all.
-# Publishes releases to Maven and packages/copies binary release artifacts.
-# Expects to be run in a totally empty directory.
-#
-
-#
-# NOTE: The code in this file is based on code from the Apache Spark
-# project, licensed under the Apache License v 2.0
-#
-# https://github.com/apache/spark/blob/branch-1.4/dev/create-release/create-release.sh
-#
-
-##
-#
-# Flink-shaded release script
-# ===================
-#
-# Can be called like this:
-#
-# sonatype_user=APACHEID sonatype_pw=APACHEIDPASSWORD \
-# RELEASE_CANDIDATE="rc1" RELEASE_BRANCH=release-2.0
-# RELEASE_VERSION=2.0 \
-# USER_NAME=APACHEID \
-# GPG_PASSPHRASE=XXX \
-# GPG_KEY=KEYID \
-# GIT_AUTHOR="`git config --get user.name` <`git config --get user.email`>" \
-# ./create_release_files.sh
-#
-##
-
-
-# fail immediately
-set -o errexit
-set -o nounset
-# print command before executing
-set -o xtrace
-
-CURR_DIR=`pwd`
-if [[ `basename $CURR_DIR` != "tools" ]] ; then
- echo "You have to call the script from the tools/ dir"
- exit 1
-fi
-
-##
-## Variables with defaults (if not overwritten by environment)
-##
-GPG_PASSPHRASE=${GPG_PASSPHRASE:-XXX}
-GPG_KEY=${GPG_KEY:-XXX}
-GIT_AUTHOR=${GIT_AUTHOR:-"Your name <yo...@apache.org>"}
-RELEASE_VERSION=${RELEASE_VERSION:-none}
-RELEASE_CANDIDATE=${RELEASE_CANDIDATE:-none}
-RELEASE_BRANCH=${RELEASE_BRANCH:-master}
-USER_NAME=${USER_NAME:-yourapacheidhere}
-MVN=${MVN:-mvn}
-GPG=${GPG:-gpg}
-sonatype_user=${sonatype_user:-yourapacheidhere}
-sonatype_pw=${sonatype_pw:-XXX}
-# whether only build the dist local and don't release to apache
-IS_LOCAL_DIST=${IS_LOCAL_DIST:-false}
-GIT_REPO=${GIT_REPO:-github.com/apache/flink-shaded.git}
-
-if [ "$(uname)" == "Darwin" ]; then
- SHASUM="shasum -a 512"
- MD5SUM="md5 -r"
-else
- SHASUM="sha512sum"
- MD5SUM="md5sum"
-fi
-
-usage() {
- set +x
- echo "./create_release_files.sh"
- echo ""
- echo "usage:"
- echo ""
- echo "example 1: build apache release"
- echo " sonatype_user=APACHEID sonatype_pw=APACHEIDPASSWORD \ "
- echo " RELEASE_VERSION=2.0 RELEASE_CANDIDATE="rc1" RELEASE_BRANCH=release-2.0 \ "
- echo " USER_NAME=APACHEID GPG_PASSPHRASE=XXX GPG_KEY=KEYID \ "
- echo " GIT_AUTHOR=\"`git config --get user.name` <`git config --get user.email`>\" \ "
- echo " GIT_REPO=github.com/apache/flink-shaded.git \ "
- echo " ./create_release_files.sh"
- echo ""
- echo "example 2: build local release"
- echo " RELEASE_VERSION=1.2.0 RELEASE_BRANCH=master \ "
- echo " GPG_PASSPHRASE=XXX GPG_KEY=XXX IS_LOCAL_DIST=true \ "
- echo " ./create_release_files.sh"
-
- exit 1
-}
-
-# Parse arguments
-while (( "$#" )); do
- case $1 in
- --help)
- usage
- ;;
- *)
- break
- ;;
- esac
- shift
-done
-
-###########################
-
-prepare() {
- # prepare
- target_branch=release-$RELEASE_VERSION
- if [ "$RELEASE_CANDIDATE" != "none" ]; then
- target_branch=$target_branch-$RELEASE_CANDIDATE
- fi
-
- if [ -d ./flink-shaded ]; then
- rm -rf flink-shaded
- fi
- git clone http://$GIT_REPO flink-shaded
-
- cd flink-shaded
-
- git checkout -b $target_branch origin/$RELEASE_BRANCH
- rm -rf .gitignore .gitattributes .travis.yml deploysettings.xml CHANGELOG .github
-
- cd ..
-}
-
-# create source package
-make_source_release() {
-
- cd flink-shaded
-
- # local dist have no need to commit to remote
- if [ "$IS_LOCAL_DIST" == "false" ]; then
- git commit --author="$GIT_AUTHOR" -am "Commit for release $RELEASE_VERSION"
- git remote add asf_push https://$USER_NAME@$GIT_REPO
- RELEASE_HASH=`git rev-parse HEAD`
- echo "Echo created release hash $RELEASE_HASH"
- fi
-
- cd ..
-
- echo "Creating source package"
- rsync -a --exclude ".git" flink-shaded flink-shaded-$RELEASE_VERSION
- tar czf flink-shaded-${RELEASE_VERSION}-src.tgz flink-shaded-$RELEASE_VERSION
- echo $GPG_PASSPHRASE | $GPG --batch --default-key $GPG_KEY --passphrase-fd 0 --armour --output flink-shaded-$RELEASE_VERSION-src.tgz.asc \
- --detach-sig flink-shaded-$RELEASE_VERSION-src.tgz
- $MD5SUM flink-shaded-$RELEASE_VERSION-src.tgz > flink-shaded-$RELEASE_VERSION-src.tgz.md5
- $SHASUM flink-shaded-$RELEASE_VERSION-src.tgz > flink-shaded-$RELEASE_VERSION-src.tgz.sha
- rm -rf flink-shaded-$RELEASE_VERSION
-}
-
-deploy_to_maven() {
- echo "Deploying to repository.apache.org"
-
- cd flink-shaded
- cp ../../deploysettings.xml .
-
- $MVN clean deploy -Prelease --settings deploysettings.xml -DskipTests -Dgpg.executable=$GPG -Dgpg.keyname=$GPG_KEY -Dgpg.passphrase=$GPG_PASSPHRASE -DretryFailedDeploymentCount=10
-
-}
-
-copy_data() {
- # Copy data
- echo "Copying release tarballs"
- folder=flink-shaded-$RELEASE_VERSION
- # candidate is not none, append it
- if [ "$RELEASE_CANDIDATE" != "none" ]; then
- folder=$folder-$RELEASE_CANDIDATE
- fi
- sftp $USER_NAME@home.apache.org <<EOF
-mkdir public_html/$folder
-put flink-*.tgz* public_html/$folder
-bye
-EOF
- echo "copy done"
-}
-
-prepare
-
-make_source_release
-
-if [ "$IS_LOCAL_DIST" == "false" ] ; then
- copy_data
- deploy_to_maven
-fi
-
-echo "Done. Don't forget to commit the release version"
diff --git a/tools/releasing/create_release_branch.sh b/tools/releasing/create_release_branch.sh
new file mode 100644
index 0000000..71fd87c
--- /dev/null
+++ b/tools/releasing/create_release_branch.sh
@@ -0,0 +1,57 @@
+#!/usr/bin/env bash
+
+#
+# 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.
+#
+
+##
+## Variables with defaults (if not overwritten by environment)
+##
+RELEASE_CANDIDATE=${RELEASE_CANDIDATE:-none}
+MVN=${MVN:-mvn}
+
+# fail immediately
+set -o errexit
+set -o nounset
+# print command before executing
+set -o xtrace
+
+CURR_DIR=`pwd`
+if [[ `basename ${CURR_DIR}` != "tools" ]] ; then
+ echo "You have to call the script from the tools/ dir"
+ exit 1
+fi
+
+###########################
+
+if [ -z "${RELEASE_VERSION}" ]; then
+ echo "RELEASE_VERSION is unset"
+ exit 1
+fi
+
+cd ..
+
+target_branch=release-${RELEASE_VERSION}
+if [ "${RELEASE_CANDIDATE}" != "none" ]; then
+ target_branch=${target_branch}-rc${RELEASE_CANDIDATE}
+fi
+
+git checkout -b ${target_branch}
+
+RELEASE_HASH=`git rev-parse HEAD`
+echo "Echo created release hash $RELEASE_HASH"
+
+echo "Done. Don't forget to create the release tag on GitHub and push the changes."
diff --git a/tools/releasing/create_source_release.sh b/tools/releasing/create_source_release.sh
new file mode 100644
index 0000000..1df5994
--- /dev/null
+++ b/tools/releasing/create_source_release.sh
@@ -0,0 +1,76 @@
+#!/usr/bin/env bash
+
+#
+# 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.
+#
+
+##
+## Variables with defaults (if not overwritten by environment)
+##
+MVN=${MVN:-mvn}
+
+# fail immediately
+set -o errexit
+set -o nounset
+# print command before executing
+set -o xtrace
+
+CURR_DIR=`pwd`
+if [[ `basename $CURR_DIR` != "tools" ]] ; then
+ echo "You have to call the script from the tools/ dir"
+ exit 1
+fi
+
+if [ "$(uname)" == "Darwin" ]; then
+ SHASUM="shasum -a 512"
+else
+ SHASUM="sha512sum"
+fi
+
+###########################
+
+RELEASE_VERSION=${RELEASE_VERSION}
+
+if [ -z "${RELEASE_VERSION}" ]; then
+ echo "RELEASE_VERSION is unset"
+ exit 1
+fi
+
+rm -rf release
+mkdir release
+cd ..
+
+echo "Creating source package"
+
+# create a temporary git clone to ensure that we have a pristine source release
+git clone . tools/release/flink-shaded-tmp-clone
+cd tools/release/flink-shaded-tmp-clone
+
+trap 'cd ${CURR_DIR};rm -rf release' ERR
+
+rsync -a \
+ --exclude ".git" --exclude ".gitignore" --exclude ".gitattributes" \
+ --exclude "deploysettings.xml" --exclude "target" \
+ --exclude ".idea" --exclude "*.iml" --exclude ".DS_Store" \
+ . flink-shaded-$RELEASE_VERSION
+
+tar czf flink-shaded-${RELEASE_VERSION}-src.tgz flink-shaded-$RELEASE_VERSION
+gpg --armor --detach-sig flink-shaded-$RELEASE_VERSION-src.tgz
+$SHASUM flink-shaded-$RELEASE_VERSION-src.tgz > flink-shaded-$RELEASE_VERSION-src.tgz.sha512
+
+mv flink-shaded-$RELEASE_VERSION-src.* ../
+cd ..
+rm -rf flink-shaded-tmp-clone
diff --git a/tools/releasing/deploy_staging_jars.sh b/tools/releasing/deploy_staging_jars.sh
new file mode 100644
index 0000000..8a5e229
--- /dev/null
+++ b/tools/releasing/deploy_staging_jars.sh
@@ -0,0 +1,43 @@
+#!/usr/bin/env bash
+
+#
+# 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.
+#
+
+##
+## Variables with defaults (if not overwritten by environment)
+##
+MVN=${MVN:-mvn}
+
+# fail immediately
+set -o errexit
+set -o nounset
+# print command before executing
+set -o xtrace
+
+CURR_DIR=`pwd`
+if [[ `basename $CURR_DIR` != "tools" ]] ; then
+ echo "You have to call the script from the tools/ dir"
+ exit 1
+fi
+
+###########################
+
+cd ..
+
+echo "Deploying to repository.apache.org"
+$MVN clean deploy -Prelease -DskipTests -DretryFailedDeploymentCount=10
+
diff --git a/tools/releasing/update_branch_version.sh b/tools/releasing/update_branch_version.sh
new file mode 100644
index 0000000..ef89fe2
--- /dev/null
+++ b/tools/releasing/update_branch_version.sh
@@ -0,0 +1,60 @@
+#!/usr/bin/env bash
+
+#
+# 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.
+#
+
+##
+## Variables with defaults (if not overwritten by environment)
+##
+MVN=${MVN:-mvn}
+
+# fail immediately
+set -o errexit
+set -o nounset
+# print command before executing
+set -o xtrace
+
+CURR_DIR=`pwd`
+if [[ `basename $CURR_DIR` != "tools" ]] ; then
+ echo "You have to call the script from the tools/ dir"
+ exit 1
+fi
+
+###########################
+
+OLD_VERSION=${OLD_VERSION}
+NEW_VERSION=${NEW_VERSION}
+
+
+if [ -z "${OLD_VERSION}" ]; then
+ echo "OLD_VERSION is unset"
+ exit 1
+fi
+
+if [ -z "${NEW_VERSION}" ]; then
+ echo "NEW_VERSION is unset"
+ exit 1
+fi
+
+cd ..
+
+#change version in all pom files
+find . -name 'pom.xml' -type f -exec perl -pi -e 's#<version>'$OLD_VERSION'</version>#<version>'$NEW_VERSION'</version>#' {} \;
+
+git commit -am "Update version to $NEW_VERSION"
+
+echo "Don't forget to push the change."
[flink-shaded] 36/47: Update version to 5.0
Posted by ch...@apache.org.
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 49c9fa878cab53ab76f3e4302e4f48920566a2e2
Author: zentol <ch...@apache.org>
AuthorDate: Wed May 30 11:40:20 2018 +0200
Update version to 5.0
---
flink-shaded-asm-5/pom.xml | 2 +-
flink-shaded-force-shading/pom.xml | 2 +-
flink-shaded-guava-18/pom.xml | 2 +-
flink-shaded-jackson-parent/pom.xml | 2 +-
flink-shaded-netty-4/pom.xml | 2 +-
pom.xml | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/flink-shaded-asm-5/pom.xml b/flink-shaded-asm-5/pom.xml
index dcd11d4..b8d6d00 100644
--- a/flink-shaded-asm-5/pom.xml
+++ b/flink-shaded-asm-5/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded</artifactId>
- <version>4.0</version>
+ <version>5.0</version>
<relativePath>..</relativePath>
</parent>
diff --git a/flink-shaded-force-shading/pom.xml b/flink-shaded-force-shading/pom.xml
index d21e3ba..5f2abc7 100644
--- a/flink-shaded-force-shading/pom.xml
+++ b/flink-shaded-force-shading/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<artifactId>flink-shaded</artifactId>
<groupId>org.apache.flink</groupId>
- <version>4.0</version>
+ <version>5.0</version>
</parent>
<artifactId>flink-shaded-force-shading</artifactId>
diff --git a/flink-shaded-guava-18/pom.xml b/flink-shaded-guava-18/pom.xml
index f12eb85..747642c 100644
--- a/flink-shaded-guava-18/pom.xml
+++ b/flink-shaded-guava-18/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded</artifactId>
- <version>4.0</version>
+ <version>5.0</version>
<relativePath>..</relativePath>
</parent>
diff --git a/flink-shaded-jackson-parent/pom.xml b/flink-shaded-jackson-parent/pom.xml
index bdffc4c..fa12f54 100644
--- a/flink-shaded-jackson-parent/pom.xml
+++ b/flink-shaded-jackson-parent/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded</artifactId>
- <version>4.0</version>
+ <version>5.0</version>
<relativePath>..</relativePath>
</parent>
diff --git a/flink-shaded-netty-4/pom.xml b/flink-shaded-netty-4/pom.xml
index 5708f14..c2f8b6f 100644
--- a/flink-shaded-netty-4/pom.xml
+++ b/flink-shaded-netty-4/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded</artifactId>
- <version>4.0</version>
+ <version>5.0</version>
<relativePath>..</relativePath>
</parent>
diff --git a/pom.xml b/pom.xml
index 900d71a..e39a244 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@ under the License.
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded</artifactId>
- <version>4.0</version>
+ <version>5.0</version>
<name>flink-shaded</name>
<packaging>pom</packaging>
[flink-shaded] 28/47: Increment version to 4.0
Posted by ch...@apache.org.
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 50aba8c57ffcf3809d4ee377463c1b9b0636c112
Author: zentol <ch...@apache.org>
AuthorDate: Mon Feb 19 12:15:08 2018 +0100
Increment version to 4.0
---
flink-shaded-asm-5/pom.xml | 4 ++--
flink-shaded-force-shading/pom.xml | 2 +-
flink-shaded-guava-18/pom.xml | 4 ++--
flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml | 2 +-
.../flink-shaded-jackson-module-jsonSchema-2/pom.xml | 2 +-
flink-shaded-jackson-parent/pom.xml | 4 ++--
flink-shaded-netty-4/pom.xml | 4 ++--
pom.xml | 2 +-
8 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/flink-shaded-asm-5/pom.xml b/flink-shaded-asm-5/pom.xml
index ebebfc6..dcd11d4 100644
--- a/flink-shaded-asm-5/pom.xml
+++ b/flink-shaded-asm-5/pom.xml
@@ -25,13 +25,13 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded</artifactId>
- <version>3.0</version>
+ <version>4.0</version>
<relativePath>..</relativePath>
</parent>
<artifactId>flink-shaded-asm</artifactId>
<name>flink-shaded-asm-5</name>
- <version>${asm.version}-3.0</version>
+ <version>${asm.version}-4.0</version>
<packaging>jar</packaging>
diff --git a/flink-shaded-force-shading/pom.xml b/flink-shaded-force-shading/pom.xml
index 3a767b4..d21e3ba 100644
--- a/flink-shaded-force-shading/pom.xml
+++ b/flink-shaded-force-shading/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<artifactId>flink-shaded</artifactId>
<groupId>org.apache.flink</groupId>
- <version>3.0</version>
+ <version>4.0</version>
</parent>
<artifactId>flink-shaded-force-shading</artifactId>
diff --git a/flink-shaded-guava-18/pom.xml b/flink-shaded-guava-18/pom.xml
index b178183..f12eb85 100644
--- a/flink-shaded-guava-18/pom.xml
+++ b/flink-shaded-guava-18/pom.xml
@@ -25,13 +25,13 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded</artifactId>
- <version>3.0</version>
+ <version>4.0</version>
<relativePath>..</relativePath>
</parent>
<artifactId>flink-shaded-guava</artifactId>
<name>flink-shaded-guava-18</name>
- <version>${guava.version}-3.0</version>
+ <version>${guava.version}-4.0</version>
<packaging>jar</packaging>
diff --git a/flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml b/flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml
index d82fb72..6a72eca 100644
--- a/flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml
+++ b/flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-jackson-parent</artifactId>
- <version>2.7.9-3.0</version>
+ <version>2.7.9-4.0</version>
<relativePath>..</relativePath>
</parent>
diff --git a/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/pom.xml b/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/pom.xml
index 6535640..e7407f6 100644
--- a/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/pom.xml
+++ b/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-jackson-parent</artifactId>
- <version>2.7.9-3.0</version>
+ <version>2.7.9-4.0</version>
<relativePath>..</relativePath>
</parent>
diff --git a/flink-shaded-jackson-parent/pom.xml b/flink-shaded-jackson-parent/pom.xml
index 0bb4058..0e3073e 100644
--- a/flink-shaded-jackson-parent/pom.xml
+++ b/flink-shaded-jackson-parent/pom.xml
@@ -25,14 +25,14 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded</artifactId>
- <version>3.0</version>
+ <version>4.0</version>
<relativePath>..</relativePath>
</parent>
<artifactId>flink-shaded-jackson-parent</artifactId>
<name>flink-shaded-jackson-parent</name>
<packaging>pom</packaging>
- <version>2.7.9-3.0</version>
+ <version>2.7.9-4.0</version>
<properties>
<jackson.version>2.7.9</jackson.version>
diff --git a/flink-shaded-netty-4/pom.xml b/flink-shaded-netty-4/pom.xml
index 9817538..3ac5c25 100644
--- a/flink-shaded-netty-4/pom.xml
+++ b/flink-shaded-netty-4/pom.xml
@@ -25,13 +25,13 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded</artifactId>
- <version>3.0</version>
+ <version>4.0</version>
<relativePath>..</relativePath>
</parent>
<artifactId>flink-shaded-netty</artifactId>
<name>flink-shaded-netty-4</name>
- <version>${netty.version}-3.0</version>
+ <version>${netty.version}-4.0</version>
<properties>
<netty.version>4.0.56.Final</netty.version>
diff --git a/pom.xml b/pom.xml
index 6b40f9e..ef77e64 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@ under the License.
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded</artifactId>
- <version>3.0</version>
+ <version>4.0</version>
<name>flink-shaded</name>
<packaging>pom</packaging>
[flink-shaded] 02/47: Extend version for minor version
Posted by ch...@apache.org.
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 d99dd8c98f69c53e600618489404bd03b5c12a94
Author: zentol <ch...@apache.org>
AuthorDate: Mon Jun 26 14:50:18 2017 +0200
Extend version for minor version
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 13ad9a6..e5ad57f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,10 +30,10 @@ under the License.
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded</artifactId>
- <version>1</version>
+ <version>1.0</version>
<properties>
- <shaded.version>1</shaded.version>
+ <shaded.version>1.0</shaded.version>
</properties>
<name>flink-shaded</name>
[flink-shaded] 38/47: [hotfix] Delete redundant release script
Posted by ch...@apache.org.
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 53799dd9aca13c18a3c2186ecfe865917663279c
Author: zentol <ch...@apache.org>
AuthorDate: Wed Jun 6 08:58:57 2018 +0200
[hotfix] Delete redundant release script
---
tools/create_release_branch.sh | 57 ------------------------------------------
1 file changed, 57 deletions(-)
diff --git a/tools/create_release_branch.sh b/tools/create_release_branch.sh
deleted file mode 100644
index 71fd87c..0000000
--- a/tools/create_release_branch.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/bin/env bash
-
-#
-# 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.
-#
-
-##
-## Variables with defaults (if not overwritten by environment)
-##
-RELEASE_CANDIDATE=${RELEASE_CANDIDATE:-none}
-MVN=${MVN:-mvn}
-
-# fail immediately
-set -o errexit
-set -o nounset
-# print command before executing
-set -o xtrace
-
-CURR_DIR=`pwd`
-if [[ `basename ${CURR_DIR}` != "tools" ]] ; then
- echo "You have to call the script from the tools/ dir"
- exit 1
-fi
-
-###########################
-
-if [ -z "${RELEASE_VERSION}" ]; then
- echo "RELEASE_VERSION is unset"
- exit 1
-fi
-
-cd ..
-
-target_branch=release-${RELEASE_VERSION}
-if [ "${RELEASE_CANDIDATE}" != "none" ]; then
- target_branch=${target_branch}-rc${RELEASE_CANDIDATE}
-fi
-
-git checkout -b ${target_branch}
-
-RELEASE_HASH=`git rev-parse HEAD`
-echo "Echo created release hash $RELEASE_HASH"
-
-echo "Done. Don't forget to create the release tag on GitHub and push the changes."
[flink-shaded] 05/47: Configure dependencyReducedPomLocation
Posted by ch...@apache.org.
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 ca93f00104c90810b24e4295fe676a7316f84ca9
Author: zentol <ch...@apache.org>
AuthorDate: Tue Jun 27 14:36:12 2017 +0200
Configure dependencyReducedPomLocation
---
flink-shaded-guava-18/pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/flink-shaded-guava-18/pom.xml b/flink-shaded-guava-18/pom.xml
index 7e63fd0..56262b1 100644
--- a/flink-shaded-guava-18/pom.xml
+++ b/flink-shaded-guava-18/pom.xml
@@ -61,6 +61,7 @@ under the License.
</goals>
<configuration>
<createDependencyReducedPom>true</createDependencyReducedPom>
+ <dependencyReducedPomLocation>${project.basedir}/target/dependency-reduced-pom.xml</dependencyReducedPomLocation>
<artifactSet>
<includes>
<include>com.google.guava:*</include>
[flink-shaded] 26/47: (#31) Hard-code jackson-parent version
Posted by ch...@apache.org.
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 eb064f6e24e98f3ae91bdfd91fc96a32c821620d
Author: zentol <ch...@apache.org>
AuthorDate: Wed Jan 31 09:50:33 2018 +0100
(#31) Hard-code jackson-parent version
---
flink-shaded-jackson-parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/flink-shaded-jackson-parent/pom.xml b/flink-shaded-jackson-parent/pom.xml
index 46b4e00..0bb4058 100644
--- a/flink-shaded-jackson-parent/pom.xml
+++ b/flink-shaded-jackson-parent/pom.xml
@@ -32,7 +32,7 @@ under the License.
<artifactId>flink-shaded-jackson-parent</artifactId>
<name>flink-shaded-jackson-parent</name>
<packaging>pom</packaging>
- <version>${jackson.version}-3.0</version>
+ <version>2.7.9-3.0</version>
<properties>
<jackson.version>2.7.9</jackson.version>
[flink-shaded] 16/47: (#16) Simplify artifact version scheme
Posted by ch...@apache.org.
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 290526022bb99a276220afd73d0c5ffb0eb2cc59
Author: zentol <ch...@apache.org>
AuthorDate: Mon Jul 24 13:31:10 2017 +0200
(#16) Simplify artifact version scheme
---
flink-shaded-asm-5/pom.xml | 4 ++--
flink-shaded-guava-18/pom.xml | 4 ++--
flink-shaded-netty-4/pom.xml | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/flink-shaded-asm-5/pom.xml b/flink-shaded-asm-5/pom.xml
index a729537..b7b6767 100644
--- a/flink-shaded-asm-5/pom.xml
+++ b/flink-shaded-asm-5/pom.xml
@@ -29,9 +29,9 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-shaded-asm-5</artifactId>
+ <artifactId>flink-shaded-asm</artifactId>
<name>flink-shaded-asm-5</name>
- <version>1.0-${asm.version}</version>
+ <version>${asm.version}-1.0</version>
<packaging>jar</packaging>
diff --git a/flink-shaded-guava-18/pom.xml b/flink-shaded-guava-18/pom.xml
index 56262b1..e634bc8 100644
--- a/flink-shaded-guava-18/pom.xml
+++ b/flink-shaded-guava-18/pom.xml
@@ -29,9 +29,9 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-shaded-guava-18</artifactId>
+ <artifactId>flink-shaded-guava</artifactId>
<name>flink-shaded-guava-18</name>
- <version>1.0-${guava.version}</version>
+ <version>${guava.version}-1.0</version>
<packaging>jar</packaging>
diff --git a/flink-shaded-netty-4/pom.xml b/flink-shaded-netty-4/pom.xml
index b831c44..5658fab 100644
--- a/flink-shaded-netty-4/pom.xml
+++ b/flink-shaded-netty-4/pom.xml
@@ -29,9 +29,9 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-shaded-netty-4</artifactId>
+ <artifactId>flink-shaded-netty</artifactId>
<name>flink-shaded-netty-4</name>
- <version>1.0-${netty.version}</version>
+ <version>${netty.version}-1.0</version>
<properties>
<!-- Don't upgrade for now. Netty versions >= 4.0.28.Final
[flink-shaded] 44/47: [FLINK-11154][network] Bump netty to 4.1.32
Posted by ch...@apache.org.
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 735c20c1e63f654e8608696a66cc9357aba81f87
Author: Nico Kruber <ni...@gmail.com>
AuthorDate: Fri Jan 11 11:54:33 2019 +0100
[FLINK-11154][network] Bump netty to 4.1.32
Notable changes since 4.1.24:
- big improvements (performance, feature set) for using openSSL based
SSL engine (useful for FLINK-9816)
- allow multiple shaded versions of the same netty artifact (as long
as the shaded prefix is different)
- Ensure ByteToMessageDecoder.Cumulator implementations always release
- Don't re-arm timerfd each epoll_wait
- Use a non-volatile read for ensureAccessible() whenever possible to
reduce overhead and allow better inlining.
- Do not fail on runtime when an older version of Log4J2 is on the
classpath
- Fix leak and corruption bugs in CompositeByteBuf
- Add support for TLSv1.3
- Harden ref-counting concurrency semantics
- bug fixes
- Java 9-12 related fixes
---
flink-shaded-netty-4/pom.xml | 2 +-
flink-shaded-netty-4/src/main/resources/META-INF/NOTICE | 9 +++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/flink-shaded-netty-4/pom.xml b/flink-shaded-netty-4/pom.xml
index c837f88..65f35fa 100644
--- a/flink-shaded-netty-4/pom.xml
+++ b/flink-shaded-netty-4/pom.xml
@@ -34,7 +34,7 @@ under the License.
<version>${netty.version}-6.0</version>
<properties>
- <netty.version>4.1.24.Final</netty.version>
+ <netty.version>4.1.32.Final</netty.version>
</properties>
<dependencies>
diff --git a/flink-shaded-netty-4/src/main/resources/META-INF/NOTICE b/flink-shaded-netty-4/src/main/resources/META-INF/NOTICE
new file mode 100644
index 0000000..f2224d0
--- /dev/null
+++ b/flink-shaded-netty-4/src/main/resources/META-INF/NOTICE
@@ -0,0 +1,9 @@
+flink-shaded-netty
+Copyright 2014-2018 The Apache Software Foundation
+
+This project includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+This project bundles the following dependencies under the Apache Software License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+- io.netty:netty-all:4.1.32.Final
[flink-shaded] 24/47: (#32) Add flink-shaded-force-shading
Posted by ch...@apache.org.
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 36dc4840b3624fd83a0d00295013a933297801b7
Author: zentol <ch...@apache.org>
AuthorDate: Tue Jan 16 13:12:01 2018 +0100
(#32) Add flink-shaded-force-shading
---
flink-shaded-force-shading/pom.xml | 35 +++++++++++++++++++++++++++++++++++
pom.xml | 1 +
2 files changed, 36 insertions(+)
diff --git a/flink-shaded-force-shading/pom.xml b/flink-shaded-force-shading/pom.xml
new file mode 100644
index 0000000..3a767b4
--- /dev/null
+++ b/flink-shaded-force-shading/pom.xml
@@ -0,0 +1,35 @@
+<?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>
+ <artifactId>flink-shaded</artifactId>
+ <groupId>org.apache.flink</groupId>
+ <version>3.0</version>
+ </parent>
+
+ <artifactId>flink-shaded-force-shading</artifactId>
+ <name>flink-shaded-force-shading</name>
+ <packaging>jar</packaging>
+
+</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 934ee39..81e2c39 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,6 +52,7 @@ under the License.
</scm>
<modules>
+ <module>flink-shaded-force-shading</module>
<module>flink-shaded-asm-5</module>
<module>flink-shaded-guava-18</module>
<module>flink-shaded-netty-4</module>
[flink-shaded] 43/47: Update version to 6.0
Posted by ch...@apache.org.
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 e39999a6cb630deead648ab45d47c10fcbe2d908
Author: zentol <ch...@apache.org>
AuthorDate: Wed Oct 10 14:36:01 2018 +0200
Update version to 6.0
---
flink-shaded-asm-5/pom.xml | 4 ++--
flink-shaded-asm-6/pom.xml | 4 ++--
flink-shaded-force-shading/pom.xml | 2 +-
flink-shaded-guava-18/pom.xml | 4 ++--
flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml | 2 +-
.../flink-shaded-jackson-module-jsonSchema-2/pom.xml | 2 +-
flink-shaded-jackson-parent/pom.xml | 4 ++--
flink-shaded-netty-4/pom.xml | 4 ++--
pom.xml | 2 +-
9 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/flink-shaded-asm-5/pom.xml b/flink-shaded-asm-5/pom.xml
index 50da34a..e2f2b96 100644
--- a/flink-shaded-asm-5/pom.xml
+++ b/flink-shaded-asm-5/pom.xml
@@ -25,13 +25,13 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded</artifactId>
- <version>5.0</version>
+ <version>6.0</version>
<relativePath>..</relativePath>
</parent>
<artifactId>flink-shaded-asm</artifactId>
<name>flink-shaded-asm-5</name>
- <version>${asm.version}-5.0</version>
+ <version>${asm.version}-6.0</version>
<packaging>jar</packaging>
diff --git a/flink-shaded-asm-6/pom.xml b/flink-shaded-asm-6/pom.xml
index 85b7855..04f9a1c 100644
--- a/flink-shaded-asm-6/pom.xml
+++ b/flink-shaded-asm-6/pom.xml
@@ -25,12 +25,12 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded</artifactId>
- <version>5.0</version>
+ <version>6.0</version>
<relativePath>..</relativePath>
</parent>
<artifactId>flink-shaded-asm-${asm.major.version}</artifactId>
- <version>${asm.version}-5.0</version>
+ <version>${asm.version}-6.0</version>
<packaging>jar</packaging>
diff --git a/flink-shaded-force-shading/pom.xml b/flink-shaded-force-shading/pom.xml
index 5f2abc7..2303eab 100644
--- a/flink-shaded-force-shading/pom.xml
+++ b/flink-shaded-force-shading/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<artifactId>flink-shaded</artifactId>
<groupId>org.apache.flink</groupId>
- <version>5.0</version>
+ <version>6.0</version>
</parent>
<artifactId>flink-shaded-force-shading</artifactId>
diff --git a/flink-shaded-guava-18/pom.xml b/flink-shaded-guava-18/pom.xml
index daedcf0..1921e7f 100644
--- a/flink-shaded-guava-18/pom.xml
+++ b/flink-shaded-guava-18/pom.xml
@@ -25,13 +25,13 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded</artifactId>
- <version>5.0</version>
+ <version>6.0</version>
<relativePath>..</relativePath>
</parent>
<artifactId>flink-shaded-guava</artifactId>
<name>flink-shaded-guava-18</name>
- <version>${guava.version}-5.0</version>
+ <version>${guava.version}-6.0</version>
<packaging>jar</packaging>
diff --git a/flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml b/flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml
index ffbad81..7873258 100644
--- a/flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml
+++ b/flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-jackson-parent</artifactId>
- <version>2.7.9-5.0</version>
+ <version>2.7.9-6.0</version>
<relativePath>..</relativePath>
</parent>
diff --git a/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/pom.xml b/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/pom.xml
index 7b5a9a5..6847524 100644
--- a/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/pom.xml
+++ b/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-jackson-parent</artifactId>
- <version>2.7.9-5.0</version>
+ <version>2.7.9-6.0</version>
<relativePath>..</relativePath>
</parent>
diff --git a/flink-shaded-jackson-parent/pom.xml b/flink-shaded-jackson-parent/pom.xml
index 1c3e3d0..b536b8f 100644
--- a/flink-shaded-jackson-parent/pom.xml
+++ b/flink-shaded-jackson-parent/pom.xml
@@ -25,14 +25,14 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded</artifactId>
- <version>5.0</version>
+ <version>6.0</version>
<relativePath>..</relativePath>
</parent>
<artifactId>flink-shaded-jackson-parent</artifactId>
<name>flink-shaded-jackson-parent</name>
<packaging>pom</packaging>
- <version>2.7.9-5.0</version>
+ <version>2.7.9-6.0</version>
<properties>
<jackson.version>2.7.9</jackson.version>
diff --git a/flink-shaded-netty-4/pom.xml b/flink-shaded-netty-4/pom.xml
index 9c43a59..c837f88 100644
--- a/flink-shaded-netty-4/pom.xml
+++ b/flink-shaded-netty-4/pom.xml
@@ -25,13 +25,13 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded</artifactId>
- <version>5.0</version>
+ <version>6.0</version>
<relativePath>..</relativePath>
</parent>
<artifactId>flink-shaded-netty</artifactId>
<name>flink-shaded-netty-4</name>
- <version>${netty.version}-5.0</version>
+ <version>${netty.version}-6.0</version>
<properties>
<netty.version>4.1.24.Final</netty.version>
diff --git a/pom.xml b/pom.xml
index e1e9505..b607a07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@ under the License.
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded</artifactId>
- <version>5.0</version>
+ <version>6.0</version>
<name>flink-shaded</name>
<packaging>pom</packaging>
[flink-shaded] 40/47: [FLINK-10458][build] Enable dependency
convergence
Posted by ch...@apache.org.
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 d7c817e7d9f6325362518c15821fe6bf8aca5275
Author: zentol <ch...@apache.org>
AuthorDate: Fri Sep 28 12:57:07 2018 +0200
[FLINK-10458][build] Enable dependency convergence
---
pom.xml | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/pom.xml b/pom.xml
index e39a244..7581102 100644
--- a/pom.xml
+++ b/pom.xml
@@ -137,6 +137,24 @@ under the License.
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>dependency-convergence</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <dependencyConvergence/>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<version>0.11</version><!--$NO-MVN-MAN-VER$-->
[flink-shaded] 21/47: (#25) Add profile to create shaded source-jars
Posted by ch...@apache.org.
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 4c324d398172a861fde16825b8262ed0b16c61ec
Author: zentol <ch...@apache.org>
AuthorDate: Mon Aug 28 13:40:08 2017 +0200
(#25) Add profile to create shaded source-jars
---
README.md | 6 ++++++
pom.xml | 22 ++++++++++++++++++++++
2 files changed, 28 insertions(+)
diff --git a/README.md b/README.md
index acffca5..05d4bb2 100644
--- a/README.md
+++ b/README.md
@@ -27,6 +27,12 @@ The shaded dependencies contained here do not expose any transitive dependencies
When using these dependencies it is recommended to work directly against the shaded namespaces.
+## Sources
+
+We currently do not release jars containing the shaded sources due to the unanswered legal questions raised [here](https://github.com/apache/flink-shaded/issues/25).
+
+However, it is possible to build these jars locally by cloning the repository and calling `mvn package -Dshade-sources`.
+
## About
Apache Flink is an open source project of [The Apache Software Foundation](https://apache.org/) (ASF).
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 09183d5..8e84f7c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,6 +80,28 @@ under the License.
</plugins>
</build>
</profile>
+ <profile>
+ <id>shade-sources</id>
+ <activation>
+ <property>
+ <name>shade-sources</name>
+ </property>
+ </activation>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <configuration combine.children="append">
+ <createSourcesJar>true</createSourcesJar>
+ <shadeSourcesContent>true</shadeSourcesContent>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
</profiles>
<build>
[flink-shaded] 10/47: [FLINK-7026] Add flink-shaded-asm-5 module
Posted by ch...@apache.org.
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 2bae90ea80f335cb55cddc754aeeb33168430937
Author: zentol <ch...@apache.org>
AuthorDate: Wed Jun 28 13:13:34 2017 +0200
[FLINK-7026] Add flink-shaded-asm-5 module
---
flink-shaded-asm-5/pom.xml | 94 ++++++++++++++++++++++++++++++++++++++++++++++
pom.xml | 1 +
2 files changed, 95 insertions(+)
diff --git a/flink-shaded-asm-5/pom.xml b/flink-shaded-asm-5/pom.xml
new file mode 100644
index 0000000..a729537
--- /dev/null
+++ b/flink-shaded-asm-5/pom.xml
@@ -0,0 +1,94 @@
+<?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>1.0</version>
+ <relativePath>..</relativePath>
+ </parent>
+
+ <artifactId>flink-shaded-asm-5</artifactId>
+ <name>flink-shaded-asm-5</name>
+ <version>1.0-${asm.version}</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>
+ <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 f60c259..cb6012b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,6 +56,7 @@ under the License.
</scm>
<modules>
+ <module>flink-shaded-asm-5</module>
<module>flink-shaded-guava-18</module>
<module>flink-shaded-netty-4</module>
</modules>
[flink-shaded] 42/47: [FLINK-8033] Add flink-shaded-asm6
Posted by ch...@apache.org.
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 <ch...@apache.org>
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>
[flink-shaded] 15/47: (#13) Add release profile
Posted by ch...@apache.org.
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 fd3033ba9ead310478963bf43e09cd50d1e36d71
Author: zentol <ch...@apache.org>
AuthorDate: Mon Jul 17 12:00:44 2017 +0200
(#13) Add release profile
---
pom.xml | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/pom.xml b/pom.xml
index 867c150..7f2231f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,6 +61,30 @@ under the License.
<module>flink-shaded-netty-4</module>
</modules>
+ <profiles>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.4</version>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
<build>
<pluginManagement>
<plugins>
[flink-shaded] 08/47: [FLINK-7007] Add README.md
Posted by ch...@apache.org.
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 236b7430d2b302e5f6785b210109c3978d11a690
Author: zentol <ch...@apache.org>
AuthorDate: Tue Jun 27 12:44:23 2017 +0200
[FLINK-7007] Add README.md
---
README.md | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..b0657d0
--- /dev/null
+++ b/README.md
@@ -0,0 +1,32 @@
+<!--
+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.
+-->
+
+# Apache Flink Shaded Dependencies
+
+This repository contains a number of shaded dependencies for the [Apache Flink](https://flink.apache.org/) project.
+
+The purpose of these dependencies is to provide a single instance of a shaded dependency in the Flink distribution, instead of each individual module shading the dependency.
+
+The shaded dependencies contained here do not expose any transitive dependencies. They may or may not be self-contained.
+
+When using these dependencies it is recommended to work directly against the shaded namespaces.
+
+## About
+
+Apache Flink is an open source project of The Apache Software Foundation (ASF).
\ No newline at end of file
[flink-shaded] 34/47: [release] Enforce java 1.8
Posted by ch...@apache.org.
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 4892bf4da3a5b5bca378a609e45a7bd516384d62
Author: zentol <ch...@apache.org>
AuthorDate: Tue May 29 14:24:13 2018 +0200
[release] Enforce java 1.8
For consistency with the flink project we enforce usage of java 8 for flink-shaded.
---
pom.xml | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/pom.xml b/pom.xml
index ef77e64..bbac628 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,6 +78,25 @@ under the License.
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-maven</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireJavaVersion>
+ <version>1.8.0</version>
+ </requireJavaVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
[flink-shaded] 25/47: (#31) Add extended
flink-shadaed-jackson-module-jsonSchema module
Posted by ch...@apache.org.
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 f7f3eca859b417a1dcb2aa4c53b1bd9076fce43e
Author: zentol <ch...@apache.org>
AuthorDate: Wed Dec 13 16:45:08 2017 +0100
(#31) Add extended flink-shadaed-jackson-module-jsonSchema module
---
.../flink-shaded-jackson-2/pom.xml | 35 ++++++++++++++++++
.../pom.xml | 43 ++++++++++++++++++++++
.../pom.xml | 13 +++++--
pom.xml | 2 +-
4 files changed, 88 insertions(+), 5 deletions(-)
diff --git a/flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml b/flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml
new file mode 100644
index 0000000..d82fb72
--- /dev/null
+++ b/flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml
@@ -0,0 +1,35 @@
+<?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-jackson-parent</artifactId>
+ <version>2.7.9-3.0</version>
+ <relativePath>..</relativePath>
+ </parent>
+
+ <artifactId>flink-shaded-jackson</artifactId>
+ <name>flink-shaded-jackson-2</name>
+
+</project>
\ No newline at end of file
diff --git a/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/pom.xml b/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/pom.xml
new file mode 100644
index 0000000..6535640
--- /dev/null
+++ b/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/pom.xml
@@ -0,0 +1,43 @@
+<?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-jackson-parent</artifactId>
+ <version>2.7.9-3.0</version>
+ <relativePath>..</relativePath>
+ </parent>
+
+ <artifactId>flink-shaded-jackson-module-jsonSchema</artifactId>
+ <name>flink-shaded-jackson-module-jsonSchema-2</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>com.fasterxml.jackson.module</groupId>
+ <artifactId>jackson-module-jsonSchema</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/flink-shaded-jackson-2/pom.xml b/flink-shaded-jackson-parent/pom.xml
similarity index 93%
rename from flink-shaded-jackson-2/pom.xml
rename to flink-shaded-jackson-parent/pom.xml
index 22d307c..46b4e00 100644
--- a/flink-shaded-jackson-2/pom.xml
+++ b/flink-shaded-jackson-parent/pom.xml
@@ -29,14 +29,20 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-shaded-jackson</artifactId>
- <name>flink-shaded-jackson-2</name>
+ <artifactId>flink-shaded-jackson-parent</artifactId>
+ <name>flink-shaded-jackson-parent</name>
+ <packaging>pom</packaging>
<version>${jackson.version}-3.0</version>
<properties>
<jackson.version>2.7.9</jackson.version>
</properties>
+ <modules>
+ <module>flink-shaded-jackson-2</module>
+ <module>flink-shaded-jackson-module-jsonSchema-2</module>
+ </modules>
+
<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
@@ -72,7 +78,7 @@ under the License.
<dependencyReducedPomLocation>${project.basedir}/target/dependency-reduced-pom.xml</dependencyReducedPomLocation>
<artifactSet>
<includes>
- <include>com.fasterxml.jackson.core:*</include>
+ <include>com.fasterxml.jackson.*:*</include>
</includes>
</artifactSet>
<relocations>
@@ -99,5 +105,4 @@ under the License.
</plugins>
</build>
-
</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 81e2c39..6b40f9e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,7 @@ under the License.
<module>flink-shaded-asm-5</module>
<module>flink-shaded-guava-18</module>
<module>flink-shaded-netty-4</module>
- <module>flink-shaded-jackson-2</module>
+ <module>flink-shaded-jackson-parent</module>
</modules>
<profiles>
[flink-shaded] 09/47: Add link to ASF to README.md
Posted by ch...@apache.org.
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 3d9ca91cbc2d9800efac71c1c2801bb0b3c245d8
Author: zentol <ch...@apache.org>
AuthorDate: Wed Jun 28 11:03:45 2017 +0200
Add link to ASF to README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index b0657d0..acffca5 100644
--- a/README.md
+++ b/README.md
@@ -29,4 +29,4 @@ When using these dependencies it is recommended to work directly against the sha
## About
-Apache Flink is an open source project of The Apache Software Foundation (ASF).
\ No newline at end of file
+Apache Flink is an open source project of [The Apache Software Foundation](https://apache.org/) (ASF).
\ No newline at end of file
[flink-shaded] 47/47: [FLINK-11022] Add NOTICE files
Posted by ch...@apache.org.
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 daa73170523d1c1a02836de095aa5d6c1e1781a4
Author: zentol <ch...@apache.org>
AuthorDate: Wed Dec 12 13:42:51 2018 +0100
[FLINK-11022] Add NOTICE files
---
flink-shaded-asm-5/src/main/resources/META-INF/NOTICE | 10 ++++++++++
flink-shaded-asm-6/src/main/resources/META-INF/NOTICE | 12 ++++++++++++
flink-shaded-guava-18/src/main/resources/META-INF/NOTICE | 9 +++++++++
.../src/main/resources/META-INF/NOTICE | 14 ++++++++++++++
.../src/main/resources/META-INF/NOTICE | 13 +++++++++++++
5 files changed, 58 insertions(+)
diff --git a/flink-shaded-asm-5/src/main/resources/META-INF/NOTICE b/flink-shaded-asm-5/src/main/resources/META-INF/NOTICE
new file mode 100644
index 0000000..a3065f2
--- /dev/null
+++ b/flink-shaded-asm-5/src/main/resources/META-INF/NOTICE
@@ -0,0 +1,10 @@
+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-6/src/main/resources/META-INF/NOTICE b/flink-shaded-asm-6/src/main/resources/META-INF/NOTICE
new file mode 100644
index 0000000..41874b4
--- /dev/null
+++ b/flink-shaded-asm-6/src/main/resources/META-INF/NOTICE
@@ -0,0 +1,12 @@
+flink-shaded-asm6
+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:6.2.1
+- org.ow2.asm:asm-analysis:6.2.1
+- org.ow2.asm:asm-tree:6.2.1
\ No newline at end of file
diff --git a/flink-shaded-guava-18/src/main/resources/META-INF/NOTICE b/flink-shaded-guava-18/src/main/resources/META-INF/NOTICE
new file mode 100644
index 0000000..df39ba5
--- /dev/null
+++ b/flink-shaded-guava-18/src/main/resources/META-INF/NOTICE
@@ -0,0 +1,9 @@
+flink-shaded-guava-18
+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 Apache Software License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+- com.google.guava:guava:18.0
\ No newline at end of file
diff --git a/flink-shaded-jackson-parent/flink-shaded-jackson-2/src/main/resources/META-INF/NOTICE b/flink-shaded-jackson-parent/flink-shaded-jackson-2/src/main/resources/META-INF/NOTICE
new file mode 100644
index 0000000..9e92604
--- /dev/null
+++ b/flink-shaded-jackson-parent/flink-shaded-jackson-2/src/main/resources/META-INF/NOTICE
@@ -0,0 +1,14 @@
+flink-shaded-jackson
+Copyright 2014-2018 The Apache Software Foundation
+
+This project includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+This project bundles the following dependencies under the Apache Software License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+- com.fasterxml.jackson.core:jackson-annotations:2.7.9
+- com.fasterxml.jackson.core:jackson-core:2.7.9
+- com.fasterxml.jackson.core:jackson-databind:2.7.9
+- com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.7.9
+- com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.7.9
+- org.yaml:snakeyaml:1.15
\ No newline at end of file
diff --git a/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/src/main/resources/META-INF/NOTICE b/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/src/main/resources/META-INF/NOTICE
new file mode 100644
index 0000000..876cd28
--- /dev/null
+++ b/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/src/main/resources/META-INF/NOTICE
@@ -0,0 +1,13 @@
+flink-shaded-jackson-module-jsonSchema
+Copyright 2014-2018 The Apache Software Foundation
+
+This project includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+This project bundles the following dependencies under the Apache Software License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+- com.fasterxml.jackson.core:jackson-annotations:2.7.9
+- com.fasterxml.jackson.core:jackson-core:2.7.9
+- com.fasterxml.jackson.core:jackson-databind:2.7.9
+- com.fasterxml.jackson.module:jackson-module-jsonSchema:2.7.9
+- javax.validation:validation-api:1.1.0.Final
\ No newline at end of file
[flink-shaded] 17/47: (#19) Increment version to 2.0
Posted by ch...@apache.org.
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 fd060ecdb6f4586250d1ef530df3418dab07baac
Author: zentol <ch...@apache.org>
AuthorDate: Wed Aug 2 14:25:37 2017 +0200
(#19) Increment version to 2.0
---
flink-shaded-asm-5/pom.xml | 2 +-
flink-shaded-guava-18/pom.xml | 2 +-
flink-shaded-netty-4/pom.xml | 2 +-
pom.xml | 6 +-----
4 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/flink-shaded-asm-5/pom.xml b/flink-shaded-asm-5/pom.xml
index b7b6767..5dc630a 100644
--- a/flink-shaded-asm-5/pom.xml
+++ b/flink-shaded-asm-5/pom.xml
@@ -31,7 +31,7 @@ under the License.
<artifactId>flink-shaded-asm</artifactId>
<name>flink-shaded-asm-5</name>
- <version>${asm.version}-1.0</version>
+ <version>${asm.version}-2.0</version>
<packaging>jar</packaging>
diff --git a/flink-shaded-guava-18/pom.xml b/flink-shaded-guava-18/pom.xml
index e634bc8..e44f404 100644
--- a/flink-shaded-guava-18/pom.xml
+++ b/flink-shaded-guava-18/pom.xml
@@ -31,7 +31,7 @@ under the License.
<artifactId>flink-shaded-guava</artifactId>
<name>flink-shaded-guava-18</name>
- <version>${guava.version}-1.0</version>
+ <version>${guava.version}-2.0</version>
<packaging>jar</packaging>
diff --git a/flink-shaded-netty-4/pom.xml b/flink-shaded-netty-4/pom.xml
index 5658fab..5ceb179 100644
--- a/flink-shaded-netty-4/pom.xml
+++ b/flink-shaded-netty-4/pom.xml
@@ -31,7 +31,7 @@ under the License.
<artifactId>flink-shaded-netty</artifactId>
<name>flink-shaded-netty-4</name>
- <version>${netty.version}-1.0</version>
+ <version>${netty.version}-2.0</version>
<properties>
<!-- Don't upgrade for now. Netty versions >= 4.0.28.Final
diff --git a/pom.xml b/pom.xml
index 7f2231f..3c90875 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,11 +30,7 @@ under the License.
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded</artifactId>
- <version>1.0</version>
-
- <properties>
- <shaded.version>1.0</shaded.version>
- </properties>
+ <version>2.0</version>
<name>flink-shaded</name>
<packaging>pom</packaging>
[flink-shaded] 01/47: Initialize flink-shaded repository
Posted by ch...@apache.org.
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 f5f5e5d1a124a7f7e901a5e76a92fa2d29ecee37
Author: zentol <ch...@apache.org>
AuthorDate: Thu Jun 22 09:17:35 2017 +0200
Initialize flink-shaded repository
---
.gitignore | 4 ++
LICENSE | 201 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
NOTICE | 5 ++
pom.xml | 122 +++++++++++++++++++++++++++++++++++++
4 files changed, 332 insertions(+)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..aac6e70
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+.cache
+.idea
+target
+*.iml
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..261eeb9
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,201 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 0000000..051e1ff
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,5 @@
+Apache Flink
+Copyright 2014-2017 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..13ad9a6
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,122 @@
+<?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</groupId>
+ <artifactId>apache</artifactId>
+ <version>18</version>
+ </parent>
+
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-shaded</artifactId>
+ <version>1</version>
+
+ <properties>
+ <shaded.version>1</shaded.version>
+ </properties>
+
+ <name>flink-shaded</name>
+ <packaging>pom</packaging>
+ <url>http://flink.apache.org</url>
+ <inceptionYear>2014</inceptionYear>
+
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+ <scm>
+ <url>https://github.com/apache/flink-shaded</url>
+ <connection>git@github.com:apache/flink-shaded.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/flink-shaded.git</developerConnection>
+ </scm>
+
+ <modules>
+ <module>flink-shaded-guava</module>
+ </modules>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.11</version><!--$NO-MVN-MAN-VER$-->
+ <inherited>false</inherited>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <excludeSubProjects>false</excludeSubProjects>
+ <numUnapprovedLicenses>0</numUnapprovedLicenses>
+ <licenses>
+ <!-- Enforce this license:
+ 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.
+ -->
+ <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
+ <licenseFamilyCategory>AL2</licenseFamilyCategory>
+ <licenseFamilyName>Apache License 2.0</licenseFamilyName>
+ <notes/>
+ <patterns>
+ <pattern>Licensed to the Apache Software Foundation (ASF) under one</pattern>
+ </patterns>
+ </license>
+ </licenses>
+ <licenseFamilies>
+ <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily">
+ <familyName>Apache License 2.0</familyName>
+ </licenseFamily>
+ </licenseFamilies>
+ <excludes>
+ <!-- Build files -->
+ <exclude>**/*.iml</exclude>
+ <!-- Generated content -->
+ <exclude>**/target/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
[flink-shaded] 19/47: (#18) Bump jackson flink-shaded version to 2.0
Posted by ch...@apache.org.
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 bc490412c4fa1e2f56b627e51f5a5c93439dbc24
Author: zentol <ch...@apache.org>
AuthorDate: Tue Aug 22 11:41:30 2017 +0200
(#18) Bump jackson flink-shaded version to 2.0
---
flink-shaded-jackson-2/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/flink-shaded-jackson-2/pom.xml b/flink-shaded-jackson-2/pom.xml
index 328d5e4..63a5e49 100644
--- a/flink-shaded-jackson-2/pom.xml
+++ b/flink-shaded-jackson-2/pom.xml
@@ -25,13 +25,13 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded</artifactId>
- <version>1.0</version>
+ <version>2.0</version>
<relativePath>..</relativePath>
</parent>
<artifactId>flink-shaded-jackson</artifactId>
<name>flink-shaded-jackson-2</name>
- <version>${jackson.version}-1.0</version>
+ <version>${jackson.version}-2.0</version>
<properties>
<jackson.version>2.7.9</jackson.version>
[flink-shaded] 27/47: (#35) Bump netty to 4.0.56
Posted by ch...@apache.org.
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 1233f1bb0e2b9fafa4260603aa130b7eb9995a7a
Author: zentol <ch...@apache.org>
AuthorDate: Mon Feb 19 11:56:26 2018 +0100
(#35) Bump netty to 4.0.56
---
flink-shaded-netty-4/pom.xml | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/flink-shaded-netty-4/pom.xml b/flink-shaded-netty-4/pom.xml
index 4018920..9817538 100644
--- a/flink-shaded-netty-4/pom.xml
+++ b/flink-shaded-netty-4/pom.xml
@@ -34,15 +34,7 @@ under the License.
<version>${netty.version}-3.0</version>
<properties>
- <!-- Don't upgrade for now. Netty versions >= 4.0.28.Final
- contain an improvement by Netty, which slices a Netty buffer
- instead of doing a memory copy [1] in the
- LengthFieldBasedFrameDecoder. In some situations, this
- interacts badly with our Netty pipeline leading to OutOfMemory
- errors.
-
- [1] https://github.com/netty/netty/issues/3704 -->
- <netty.version>4.0.27.Final</netty.version>
+ <netty.version>4.0.56.Final</netty.version>
</properties>
<dependencies>
[flink-shaded] 45/47: [FLINK-11022] Define transformers in parent
pom
Posted by ch...@apache.org.
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 80befaf1a8fd1613400df1a796efba877957434f
Author: zentol <ch...@apache.org>
AuthorDate: Wed Dec 12 13:40:00 2018 +0100
[FLINK-11022] Define transformers in parent pom
---
flink-shaded-asm-5/pom.xml | 11 -----------
flink-shaded-asm-6/pom.xml | 11 -----------
flink-shaded-guava-18/pom.xml | 11 -----------
flink-shaded-jackson-parent/pom.xml | 11 -----------
flink-shaded-netty-4/pom.xml | 11 -----------
pom.xml | 10 ++++++++++
6 files changed, 10 insertions(+), 55 deletions(-)
diff --git a/flink-shaded-asm-5/pom.xml b/flink-shaded-asm-5/pom.xml
index e2f2b96..f129faa 100644
--- a/flink-shaded-asm-5/pom.xml
+++ b/flink-shaded-asm-5/pom.xml
@@ -73,17 +73,6 @@ under the License.
<shadedPattern>org.apache.flink.shaded.asm5.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>
diff --git a/flink-shaded-asm-6/pom.xml b/flink-shaded-asm-6/pom.xml
index 04f9a1c..099f52b 100644
--- a/flink-shaded-asm-6/pom.xml
+++ b/flink-shaded-asm-6/pom.xml
@@ -87,17 +87,6 @@ under the License.
<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>
diff --git a/flink-shaded-guava-18/pom.xml b/flink-shaded-guava-18/pom.xml
index 1921e7f..a5b70cd 100644
--- a/flink-shaded-guava-18/pom.xml
+++ b/flink-shaded-guava-18/pom.xml
@@ -73,17 +73,6 @@ under the License.
<shadedPattern>org.apache.flink.shaded.guava18.com.google</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>
diff --git a/flink-shaded-jackson-parent/pom.xml b/flink-shaded-jackson-parent/pom.xml
index b536b8f..f0eacf0 100644
--- a/flink-shaded-jackson-parent/pom.xml
+++ b/flink-shaded-jackson-parent/pom.xml
@@ -89,17 +89,6 @@ under the License.
<shadedPattern>org.apache.flink.shaded.jackson2.com.fasterxml.jackson</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>
diff --git a/flink-shaded-netty-4/pom.xml b/flink-shaded-netty-4/pom.xml
index 65f35fa..eb244a3 100644
--- a/flink-shaded-netty-4/pom.xml
+++ b/flink-shaded-netty-4/pom.xml
@@ -71,17 +71,6 @@ under the License.
<shadedPattern>org.apache.flink.shaded.netty4.io.netty</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>
diff --git a/pom.xml b/pom.xml
index b607a07..1dfe053 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,6 +132,16 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.0.0</version>
+ <configuration>
+ <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">
+ <projectName>Apache Flink-shaded</projectName>
+ </transformer>
+ </transformers>
+ </configuration>
</plugin>
</plugins>
</pluginManagement>
[flink-shaded] 12/47: (#10) Update developerConnection in root pom
Posted by ch...@apache.org.
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 57d803a96a3808edd56fa5d2f5617b06f90027e7
Author: zentol <ch...@apache.org>
AuthorDate: Wed Jul 12 17:04:29 2017 +0200
(#10) Update developerConnection in root pom
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 9db6be2..867c150 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,7 @@ under the License.
<scm>
<url>https://github.com/apache/flink-shaded</url>
<connection>git@github.com:apache/flink-shaded.git</connection>
- <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/flink-shaded.git</developerConnection>
+ <developerConnection>scm:git:https://github.com/apache/flink-shaded.git</developerConnection>
</scm>
<modules>
[flink-shaded] 14/47: (#12) Add release script
Posted by ch...@apache.org.
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 1605a9c4719178f4c15a52e36f056ca2e057d22b
Author: zentol <ch...@apache.org>
AuthorDate: Mon Jul 17 14:47:02 2017 +0200
(#12) Add release script
---
tools/create_release_files.sh | 206 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 206 insertions(+)
diff --git a/tools/create_release_files.sh b/tools/create_release_files.sh
new file mode 100755
index 0000000..7d51f46
--- /dev/null
+++ b/tools/create_release_files.sh
@@ -0,0 +1,206 @@
+#!/usr/bin/env bash
+
+#
+# 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.
+#
+
+# Quick-and-dirty automation of making maven and binary releases. Not robust at all.
+# Publishes releases to Maven and packages/copies binary release artifacts.
+# Expects to be run in a totally empty directory.
+#
+
+#
+# NOTE: The code in this file is based on code from the Apache Spark
+# project, licensed under the Apache License v 2.0
+#
+# https://github.com/apache/spark/blob/branch-1.4/dev/create-release/create-release.sh
+#
+
+##
+#
+# Flink-shaded release script
+# ===================
+#
+# Can be called like this:
+#
+# sonatype_user=APACHEID sonatype_pw=APACHEIDPASSWORD \
+# RELEASE_CANDIDATE="rc1" RELEASE_BRANCH=release-2.0
+# RELEASE_VERSION=2.0 \
+# USER_NAME=APACHEID \
+# GPG_PASSPHRASE=XXX \
+# GPG_KEY=KEYID \
+# GIT_AUTHOR="`git config --get user.name` <`git config --get user.email`>" \
+# ./create_release_files.sh
+#
+##
+
+
+# fail immediately
+set -o errexit
+set -o nounset
+# print command before executing
+set -o xtrace
+
+CURR_DIR=`pwd`
+if [[ `basename $CURR_DIR` != "tools" ]] ; then
+ echo "You have to call the script from the tools/ dir"
+ exit 1
+fi
+
+##
+## Variables with defaults (if not overwritten by environment)
+##
+GPG_PASSPHRASE=${GPG_PASSPHRASE:-XXX}
+GPG_KEY=${GPG_KEY:-XXX}
+GIT_AUTHOR=${GIT_AUTHOR:-"Your name <yo...@apache.org>"}
+RELEASE_VERSION=${RELEASE_VERSION:-none}
+RELEASE_CANDIDATE=${RELEASE_CANDIDATE:-none}
+RELEASE_BRANCH=${RELEASE_BRANCH:-master}
+USER_NAME=${USER_NAME:-yourapacheidhere}
+MVN=${MVN:-mvn}
+GPG=${GPG:-gpg}
+sonatype_user=${sonatype_user:-yourapacheidhere}
+sonatype_pw=${sonatype_pw:-XXX}
+# whether only build the dist local and don't release to apache
+IS_LOCAL_DIST=${IS_LOCAL_DIST:-false}
+GIT_REPO=${GIT_REPO:-github.com/apache/flink-shaded.git}
+
+if [ "$(uname)" == "Darwin" ]; then
+ SHASUM="shasum -a 512"
+ MD5SUM="md5 -r"
+else
+ SHASUM="sha512sum"
+ MD5SUM="md5sum"
+fi
+
+usage() {
+ set +x
+ echo "./create_release_files.sh"
+ echo ""
+ echo "usage:"
+ echo ""
+ echo "example 1: build apache release"
+ echo " sonatype_user=APACHEID sonatype_pw=APACHEIDPASSWORD \ "
+ echo " RELEASE_VERSION=2.0 RELEASE_CANDIDATE="rc1" RELEASE_BRANCH=release-2.0 \ "
+ echo " USER_NAME=APACHEID GPG_PASSPHRASE=XXX GPG_KEY=KEYID \ "
+ echo " GIT_AUTHOR=\"`git config --get user.name` <`git config --get user.email`>\" \ "
+ echo " GIT_REPO=github.com/apache/flink-shaded.git \ "
+ echo " ./create_release_files.sh"
+ echo ""
+ echo "example 2: build local release"
+ echo " RELEASE_VERSION=1.2.0 RELEASE_BRANCH=master \ "
+ echo " GPG_PASSPHRASE=XXX GPG_KEY=XXX IS_LOCAL_DIST=true \ "
+ echo " ./create_release_files.sh"
+
+ exit 1
+}
+
+# Parse arguments
+while (( "$#" )); do
+ case $1 in
+ --help)
+ usage
+ ;;
+ *)
+ break
+ ;;
+ esac
+ shift
+done
+
+###########################
+
+prepare() {
+ # prepare
+ target_branch=release-$RELEASE_VERSION
+ if [ "$RELEASE_CANDIDATE" != "none" ]; then
+ target_branch=$target_branch-$RELEASE_CANDIDATE
+ fi
+
+ if [ -d ./flink-shaded ]; then
+ rm -rf flink-shaded
+ fi
+ git clone http://$GIT_REPO flink-shaded
+
+ cd flink-shaded
+
+ git checkout -b $target_branch origin/$RELEASE_BRANCH
+ rm -rf .gitignore .gitattributes .travis.yml deploysettings.xml CHANGELOG .github
+
+ cd ..
+}
+
+# create source package
+make_source_release() {
+
+ cd flink-shaded
+
+ # local dist have no need to commit to remote
+ if [ "$IS_LOCAL_DIST" == "false" ]; then
+ git commit --author="$GIT_AUTHOR" -am "Commit for release $RELEASE_VERSION"
+ git remote add asf_push https://$USER_NAME@$GIT_REPO
+ RELEASE_HASH=`git rev-parse HEAD`
+ echo "Echo created release hash $RELEASE_HASH"
+ fi
+
+ cd ..
+
+ echo "Creating source package"
+ rsync -a --exclude ".git" flink-shaded flink-shaded-$RELEASE_VERSION
+ tar czf flink-shaded-${RELEASE_VERSION}-src.tgz flink-shaded-$RELEASE_VERSION
+ echo $GPG_PASSPHRASE | $GPG --batch --default-key $GPG_KEY --passphrase-fd 0 --armour --output flink-shaded-$RELEASE_VERSION-src.tgz.asc \
+ --detach-sig flink-shaded-$RELEASE_VERSION-src.tgz
+ $MD5SUM flink-shaded-$RELEASE_VERSION-src.tgz > flink-shaded-$RELEASE_VERSION-src.tgz.md5
+ $SHASUM flink-shaded-$RELEASE_VERSION-src.tgz > flink-shaded-$RELEASE_VERSION-src.tgz.sha
+ rm -rf flink-shaded-$RELEASE_VERSION
+}
+
+deploy_to_maven() {
+ echo "Deploying to repository.apache.org"
+
+ cd flink-shaded
+ cp ../../deploysettings.xml .
+
+ $MVN clean deploy -Prelease --settings deploysettings.xml -DskipTests -Dgpg.executable=$GPG -Dgpg.keyname=$GPG_KEY -Dgpg.passphrase=$GPG_PASSPHRASE -DretryFailedDeploymentCount=10
+
+}
+
+copy_data() {
+ # Copy data
+ echo "Copying release tarballs"
+ folder=flink-shaded-$RELEASE_VERSION
+ # candidate is not none, append it
+ if [ "$RELEASE_CANDIDATE" != "none" ]; then
+ folder=$folder-$RELEASE_CANDIDATE
+ fi
+ sftp $USER_NAME@home.apache.org <<EOF
+mkdir public_html/$folder
+put flink-*.tgz* public_html/$folder
+bye
+EOF
+ echo "copy done"
+}
+
+prepare
+
+make_source_release
+
+if [ "$IS_LOCAL_DIST" == "false" ] ; then
+ copy_data
+ deploy_to_maven
+fi
+
+echo "Done. Don't forget to commit the release version"
[flink-shaded] 23/47: (#28) Bump maven-shade-plugin version to 3.0.0
Posted by ch...@apache.org.
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 2b69aa648a7d5c689c1e3c2709d7e55cb765b0a2
Author: zentol <ch...@apache.org>
AuthorDate: Mon Nov 20 14:03:12 2017 +0100
(#28) Bump maven-shade-plugin version to 3.0.0
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index f82a2e8..934ee39 100644
--- a/pom.xml
+++ b/pom.xml
@@ -110,7 +110,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>2.4.1</version>
+ <version>3.0.0</version>
</plugin>
</plugins>
</pluginManagement>
[flink-shaded] 11/47: (#6) - Include licenses of shaded
dependencies in jars
Posted by ch...@apache.org.
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 2cea9ea3461622137fd6c71a4f96df21b30bff8b
Author: zentol <ch...@apache.org>
AuthorDate: Wed Jul 12 15:48:33 2017 +0200
(#6) - Include licenses of shaded dependencies in jars
---
.../packaged_licenses/LICENSE.asm.txt | 31 ++++++++++++++++++++++
.../packaged_licenses/LICENSE.jauter.txt | 20 ++++++++++++++
.../packaged_licenses/LICENSE.netty_router.txt | 20 ++++++++++++++
pom.xml | 29 ++++++++++++++++++++
4 files changed, 100 insertions(+)
diff --git a/flink-shaded-asm-5/packaged_licenses/LICENSE.asm.txt b/flink-shaded-asm-5/packaged_licenses/LICENSE.asm.txt
new file mode 100644
index 0000000..62ffbcc
--- /dev/null
+++ b/flink-shaded-asm-5/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-netty-4/packaged_licenses/LICENSE.jauter.txt b/flink-shaded-netty-4/packaged_licenses/LICENSE.jauter.txt
new file mode 100644
index 0000000..373fc69
--- /dev/null
+++ b/flink-shaded-netty-4/packaged_licenses/LICENSE.jauter.txt
@@ -0,0 +1,20 @@
+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
new file mode 100644
index 0000000..63a131f
--- /dev/null
+++ b/flink-shaded-netty-4/packaged_licenses/LICENSE.netty_router.txt
@@ -0,0 +1,20 @@
+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/pom.xml b/pom.xml
index cb6012b..9db6be2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,9 +125,38 @@ under the License.
<exclude>**/*.iml</exclude>
<!-- Generated content -->
<exclude>**/target/**</exclude>
+ <!-- the licenses that are re-bundled -->
+ <exclude>**/packaged_licenses/LICENSE.*.txt</exclude>
</excludes>
</configuration>
</plugin>
+ <!-- make sure all licenses that need to be repackaged are in the target folder -->
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ <executions>
+ <execution>
+ <id>copy-packaged-licenses</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${basedir}/target/classes/META-INF/licenses/</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/packaged_licenses</directory>
+ <includes>
+ <include>LICENSE.*.txt</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
[flink-shaded] 33/47: [FLINK-9463] Rename native libraries in netty
when shading
Posted by ch...@apache.org.
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 02c6a24ce522a1709a805952b01c70085f90f079
Author: zentol <ch...@apache.org>
AuthorDate: Mon May 28 18:12:10 2018 +0200
[FLINK-9463] Rename native libraries in netty when shading
---
flink-shaded-netty-4/pom.xml | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/flink-shaded-netty-4/pom.xml b/flink-shaded-netty-4/pom.xml
index 0aa734b..5708f14 100644
--- a/flink-shaded-netty-4/pom.xml
+++ b/flink-shaded-netty-4/pom.xml
@@ -91,6 +91,33 @@ under the License.
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>rename-native-library</id>
+ <phase>package</phase>
+ <configuration>
+ <target>
+ <echo message="unpacking netty jar" />
+ <unzip src="${project.build.directory}/${artifactId}-${version}.jar" dest="${project.build.directory}/unpacked/" />
+ <echo message="renaming native epoll library" />
+ <move todir="${project.build.directory}/unpacked/META-INF/native" includeemptydirs="false">
+ <fileset dir="${project.build.directory}/unpacked/META-INF/native"/>
+ <mapper type="glob" from="libnetty_transport_native_epoll_x86_64.so" to="liborg_apache_flink_shaded_netty4_netty_transport_native_epoll_x86_64.so"/>
+ </move>
+ <echo message="repackaging netty jar" />
+ <jar destfile="${project.build.directory}/${artifactId}-${version}.jar" basedir="${project.build.directory}/unpacked" />
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
[flink-shaded] 37/47: (#44) Remove remaining references to netty
router
Posted by ch...@apache.org.
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 <ch...@apache.org>
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 -->
[flink-shaded] 13/47: (#8) Add deploysettings.xml
Posted by ch...@apache.org.
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 37f5d03762643d185b6cb7193e829c7e493d4f38
Author: zentol <ch...@apache.org>
AuthorDate: Wed Jul 12 14:30:54 2017 +0200
(#8) Add deploysettings.xml
---
deploysettings.xml | 38 ++++++++++++++++++++++++++++++++++++++
1 file changed, 38 insertions(+)
diff --git a/deploysettings.xml b/deploysettings.xml
new file mode 100644
index 0000000..e36d848
--- /dev/null
+++ b/deploysettings.xml
@@ -0,0 +1,38 @@
+<!--
+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.
+
+-->
+
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+ http://maven.apache.org/xsd/settings-1.0.0.xsd">
+ <servers>
+ <server>
+ <id>apache.snapshots.https</id>
+ <username>${sonatype_user}</username>
+ <password>${sonatype_pw}</password>
+ </server>
+ <server>
+ <id>apache.releases.https</id>
+ <username>${sonatype_user}</username>
+ <password>${sonatype_pw}</password>
+ </server>
+ </servers>
+</settings>
+
[flink-shaded] 39/47: [FLINK-9817] Update sub-module versions to 5.0
Posted by ch...@apache.org.
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 8c88fdb9e7a51f81e641b8aed4c7bf05fd18832f
Author: Nico Kruber <ni...@gmail.com>
AuthorDate: Mon Jul 16 14:16:17 2018 +0200
[FLINK-9817] Update sub-module versions to 5.0
---
flink-shaded-asm-5/pom.xml | 2 +-
flink-shaded-guava-18/pom.xml | 2 +-
flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml | 2 +-
.../flink-shaded-jackson-module-jsonSchema-2/pom.xml | 2 +-
flink-shaded-jackson-parent/pom.xml | 2 +-
flink-shaded-netty-4/pom.xml | 2 +-
tools/releasing/update_branch_version.sh | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/flink-shaded-asm-5/pom.xml b/flink-shaded-asm-5/pom.xml
index b8d6d00..50da34a 100644
--- a/flink-shaded-asm-5/pom.xml
+++ b/flink-shaded-asm-5/pom.xml
@@ -31,7 +31,7 @@ under the License.
<artifactId>flink-shaded-asm</artifactId>
<name>flink-shaded-asm-5</name>
- <version>${asm.version}-4.0</version>
+ <version>${asm.version}-5.0</version>
<packaging>jar</packaging>
diff --git a/flink-shaded-guava-18/pom.xml b/flink-shaded-guava-18/pom.xml
index 747642c..daedcf0 100644
--- a/flink-shaded-guava-18/pom.xml
+++ b/flink-shaded-guava-18/pom.xml
@@ -31,7 +31,7 @@ under the License.
<artifactId>flink-shaded-guava</artifactId>
<name>flink-shaded-guava-18</name>
- <version>${guava.version}-4.0</version>
+ <version>${guava.version}-5.0</version>
<packaging>jar</packaging>
diff --git a/flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml b/flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml
index 4a7c753..611fb18 100644
--- a/flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml
+++ b/flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-jackson-parent</artifactId>
- <version>2.7.9-4.0</version>
+ <version>2.7.9-5.0</version>
<relativePath>..</relativePath>
</parent>
diff --git a/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/pom.xml b/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/pom.xml
index e723489..7b5a9a5 100644
--- a/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/pom.xml
+++ b/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-jackson-parent</artifactId>
- <version>2.7.9-4.0</version>
+ <version>2.7.9-5.0</version>
<relativePath>..</relativePath>
</parent>
diff --git a/flink-shaded-jackson-parent/pom.xml b/flink-shaded-jackson-parent/pom.xml
index fa12f54..1c3e3d0 100644
--- a/flink-shaded-jackson-parent/pom.xml
+++ b/flink-shaded-jackson-parent/pom.xml
@@ -32,7 +32,7 @@ under the License.
<artifactId>flink-shaded-jackson-parent</artifactId>
<name>flink-shaded-jackson-parent</name>
<packaging>pom</packaging>
- <version>2.7.9-4.0</version>
+ <version>2.7.9-5.0</version>
<properties>
<jackson.version>2.7.9</jackson.version>
diff --git a/flink-shaded-netty-4/pom.xml b/flink-shaded-netty-4/pom.xml
index 8b5c65e..9c43a59 100644
--- a/flink-shaded-netty-4/pom.xml
+++ b/flink-shaded-netty-4/pom.xml
@@ -31,7 +31,7 @@ under the License.
<artifactId>flink-shaded-netty</artifactId>
<name>flink-shaded-netty-4</name>
- <version>${netty.version}-4.0</version>
+ <version>${netty.version}-5.0</version>
<properties>
<netty.version>4.1.24.Final</netty.version>
diff --git a/tools/releasing/update_branch_version.sh b/tools/releasing/update_branch_version.sh
index ef89fe2..429dfd3 100644
--- a/tools/releasing/update_branch_version.sh
+++ b/tools/releasing/update_branch_version.sh
@@ -53,7 +53,7 @@ fi
cd ..
#change version in all pom files
-find . -name 'pom.xml' -type f -exec perl -pi -e 's#<version>'$OLD_VERSION'</version>#<version>'$NEW_VERSION'</version>#' {} \;
+find . -name 'pom.xml' -type f -exec perl -pi -e 's#<version>'$OLD_VERSION'</version>#<version>'$NEW_VERSION'</version>#; s#-'$OLD_VERSION'</version>#-'$NEW_VERSION'</version>#' {} \;
git commit -am "Update version to $NEW_VERSION"
[flink-shaded] 41/47: Include jackson-dataformat-csv in
flink-shaded-jackson
Posted by ch...@apache.org.
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 30367cd5e1ffaa6b26909463cd16dc63068e669c
Author: Timo Walther <tw...@apache.org>
AuthorDate: Fri Sep 7 17:36:04 2018 +0200
Include jackson-dataformat-csv in flink-shaded-jackson
---
flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml b/flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml
index 611fb18..ffbad81 100644
--- a/flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml
+++ b/flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml
@@ -50,6 +50,11 @@ under the License.
<artifactId>jackson-dataformat-yaml</artifactId>
<version>${jackson.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-csv</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
</dependencies>
<build>
[flink-shaded] 31/47: (#39) Properly hide jackson dependencies
Posted by ch...@apache.org.
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 d53464bb80d08ff6f8538faecb9b479f9caf34d2
Author: zentol <ch...@apache.org>
AuthorDate: Wed Feb 28 14:19:28 2018 +0100
(#39) Properly hide jackson dependencies
---
.../flink-shaded-jackson-2/pom.xml | 12 ++++++++
.../pom.xml | 12 ++++++++
flink-shaded-jackson-parent/pom.xml | 36 ++++++++++++----------
3 files changed, 43 insertions(+), 17 deletions(-)
diff --git a/flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml b/flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml
index 167020a..4a7c753 100644
--- a/flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml
+++ b/flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml
@@ -34,6 +34,18 @@ under the License.
<dependencies>
<dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
<version>${jackson.version}</version>
diff --git a/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/pom.xml b/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/pom.xml
index 9079575..e723489 100644
--- a/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/pom.xml
+++ b/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/pom.xml
@@ -34,6 +34,18 @@ under the License.
<dependencies>
<dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jsonSchema</artifactId>
<version>${jackson.version}</version>
diff --git a/flink-shaded-jackson-parent/pom.xml b/flink-shaded-jackson-parent/pom.xml
index 0e3073e..bdffc4c 100644
--- a/flink-shaded-jackson-parent/pom.xml
+++ b/flink-shaded-jackson-parent/pom.xml
@@ -43,23 +43,25 @@ under the License.
<module>flink-shaded-jackson-module-jsonSchema-2</module>
</modules>
- <dependencies>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- </dependencies>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<build>
<plugins>
[flink-shaded] 46/47: [FLINK-11022] Sync license packaging with
Flink
Posted by ch...@apache.org.
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 d0807f73bf0903ea337da2e057e73dcfb13d3f6f
Author: zentol <ch...@apache.org>
AuthorDate: Wed Dec 12 13:41:36 2018 +0100
[FLINK-11022] Sync license packaging with Flink
---
.../main/resources/META-INF/licenses/LICENSE.asm | 0
.../main/resources/META-INF/licenses/LICENSE.asm | 0
pom.xml | 29 +---------------------
3 files changed, 1 insertion(+), 28 deletions(-)
diff --git a/flink-shaded-asm-6/packaged_licenses/LICENSE.asm.txt b/flink-shaded-asm-5/src/main/resources/META-INF/licenses/LICENSE.asm
similarity index 100%
rename from flink-shaded-asm-6/packaged_licenses/LICENSE.asm.txt
rename to flink-shaded-asm-5/src/main/resources/META-INF/licenses/LICENSE.asm
diff --git a/flink-shaded-asm-5/packaged_licenses/LICENSE.asm.txt b/flink-shaded-asm-6/src/main/resources/META-INF/licenses/LICENSE.asm
similarity index 100%
rename from flink-shaded-asm-5/packaged_licenses/LICENSE.asm.txt
rename to flink-shaded-asm-6/src/main/resources/META-INF/licenses/LICENSE.asm
diff --git a/pom.xml b/pom.xml
index 1dfe053..e37eb31 100644
--- a/pom.xml
+++ b/pom.xml
@@ -218,39 +218,12 @@ under the License.
<!-- Generated content -->
<exclude>**/target/**</exclude>
<!-- the licenses that are re-bundled -->
- <exclude>**/packaged_licenses/LICENSE.*.txt</exclude>
+ <exclude>**/licenses/LICENSE.*</exclude>
<!-- release files -->
<exclude>**/release/**</exclude>
</excludes>
</configuration>
</plugin>
- <!-- make sure all licenses that need to be repackaged are in the target folder -->
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <configuration>
- <encoding>UTF-8</encoding>
- </configuration>
- <executions>
- <execution>
- <id>copy-packaged-licenses</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}/target/classes/META-INF/licenses/</outputDirectory>
- <resources>
- <resource>
- <directory>${basedir}/packaged_licenses</directory>
- <includes>
- <include>LICENSE.*.txt</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>