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 2021/11/23 15:37:52 UTC
[flink-shaded] branch master updated: [FLINK-25017] Drop Zookeeper 3.4
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink-shaded.git
The following commit(s) were added to refs/heads/master by this push:
new d0b6a91 [FLINK-25017] Drop Zookeeper 3.4
d0b6a91 is described below
commit d0b6a919aeef3b2f091017b3b8ed82b87a80707b
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Tue Nov 23 14:31:40 2021 +0100
[FLINK-25017] Drop Zookeeper 3.4
---
.../flink-shaded-zookeeper-34/pom.xml | 141 ---------------------
.../src/main/resources/META-INF/NOTICE | 13 --
flink-shaded-zookeeper-parent/pom.xml | 1 -
3 files changed, 155 deletions(-)
diff --git a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-34/pom.xml b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-34/pom.xml
deleted file mode 100644
index 6cc0bd9..0000000
--- a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-34/pom.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-shaded-zookeeper-parent</artifactId>
- <version>15.0</version>
- <relativePath>..</relativePath>
- </parent>
-
- <artifactId>flink-shaded-zookeeper-3</artifactId>
- <name>flink-shaded-zookeeper-3.4</name>
- <version>${zookeeper.version}-15.0</version>
-
- <properties>
- <zookeeper.version>3.4.14</zookeeper.version>
- <curator.version>4.2.0</curator.version>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- <exclusions>
- <exclusion>
- <!-- only required for ZK servers, not clients -->
- <groupId>io.netty</groupId>
- <artifactId>netty</artifactId>
- </exclusion>
- <exclusion>
- <!-- only required for ZK console shell -->
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
- </exclusion>
- <exclusion>
- <!-- Flink distribution provides logging classes -->
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- <exclusion>
- <!-- not relevant at runtime -->
- <groupId>org.apache.yetus</groupId>
- <artifactId>audience-annotations</artifactId>
- </exclusion>
- <exclusion>
- <!-- Flink distribution provides logging classes -->
- <groupId>org.slf4j</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <!-- not relevant at runtime -->
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
- <exclusion>
- <!-- not relevant at runtime -->
- <groupId>com.github.spotbugs</groupId>
- <artifactId>spotbugs-annotations</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-recipes</artifactId>
- <version>${curator.version}</version>
- <exclusions>
- <exclusion>
- <!-- not relevant at runtime -->
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
- <exclusion>
- <!-- not relevant at runtime -->
- <groupId>com.google.errorprone</groupId>
- <artifactId>error_prone_annotations</artifactId>
- </exclusion>
- <exclusion>
- <!-- supposedly not required -->
- <groupId>com.google.guava</groupId>
- <artifactId>failureaccess</artifactId>
- </exclusion>
- <exclusion>
- <!-- supposedly not required -->
- <groupId>com.google.guava</groupId>
- <artifactId>listenablefuture</artifactId>
- </exclusion>
- <exclusion>
- <!-- not relevant at runtime -->
- <groupId>com.google.j2objc</groupId>
- <artifactId>j2objc-annotations</artifactId>
- </exclusion>
- <exclusion>
- <!-- not relevant at runtime -->
- <groupId>org.checkerframework</groupId>
- <artifactId>checker-qual</artifactId>
- </exclusion>
- <exclusion>
- <!-- not relevant at runtime -->
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-annotations</artifactId>
- </exclusion>
- <exclusion>
- <!-- Flink distribution provides logging classes -->
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- <version>${zookeeper.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-</project>
\ No newline at end of file
diff --git a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-34/src/main/resources/META-INF/NOTICE b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-34/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index 82e33b6..0000000
--- a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-34/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,13 +0,0 @@
-flink-shaded-zookeeper-3
-Copyright 2014-2021 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:27.0.1-jre
-- org.apache.curator:curator-client:4.2.0
-- org.apache.curator:curator-framework:4.2.0
-- org.apache.curator:curator-recipes:4.2.0
-- org.apache.zookeeper:zookeeper:3.4.14
diff --git a/flink-shaded-zookeeper-parent/pom.xml b/flink-shaded-zookeeper-parent/pom.xml
index 5c9d756..3835d56 100644
--- a/flink-shaded-zookeeper-parent/pom.xml
+++ b/flink-shaded-zookeeper-parent/pom.xml
@@ -34,7 +34,6 @@ under the License.
<packaging>pom</packaging>
<modules>
- <module>flink-shaded-zookeeper-34</module>
<module>flink-shaded-zookeeper-35</module>
</modules>