This is an automated email from the ASF dual-hosted git repository.
andor pushed a commit to branch branch-3.6
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/branch-3.6 by this push:
new cea9801 ZOOKEEPER-3924: Netty and JLine Licenses are inconsistent
with jars in the binary tarball in 3.6.2 rc0
cea9801 is described below
commit cea9801bc5564fd170c7f18276b1fbbca52f81fb
Author: Enrico Olivelli <[email protected]>
AuthorDate: Thu Sep 3 11:38:47 2020 +0200
ZOOKEEPER-3924: Netty and JLine Licenses are inconsistent with jars in the
binary tarball in 3.6.2 rc0
- Fix license file names
- Remove legacy pom.template file (for Ant based build ?)
Author: Enrico Olivelli <[email protected]>
Reviewers: [email protected]
Closes #1449 from eolivelli/fix/ZOOKEEPER-3924-netty-lic
(cherry picked from commit d33193a968d4f1ffc5047c40b7a293af04f35a47)
Signed-off-by: Andor Molnar <[email protected]>
---
...e-2.11.LICENSE.txt => jline-2.14.6.LICENSE.txt} | 0
...E.txt => netty-buffer-4.1.50.Final.LICENSE.txt} | 0
...SE.txt => netty-codec-4.1.50.Final.LICENSE.txt} | 0
...E.txt => netty-common-4.1.50.Final.LICENSE.txt} | 0
....txt => netty-handler-4.1.50.Final.LICENSE.txt} | 0
...txt => netty-resolver-4.1.50.Final.LICENSE.txt} | 0
...xt => netty-transport-4.1.50.Final.LICENSE.txt} | 0
...ransport-native-epoll-4.1.50.Final.LICENSE.txt} | 0
...rt-native-unix-common-4.1.50.Final.LICENSE.txt} | 0
zookeeper-server/src/main/resources/pom.template | 41 ----------------------
10 files changed, 41 deletions(-)
diff --git a/zookeeper-server/src/main/resources/lib/jline-2.11.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/jline-2.14.6.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/jline-2.11.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/jline-2.14.6.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.48.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-buffer-4.1.50.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.48.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-buffer-4.1.50.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-transport-native-epoll-4.1.48.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-codec-4.1.50.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-transport-native-epoll-4.1.48.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-codec-4.1.50.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-transport-4.1.48.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-common-4.1.50.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-transport-4.1.48.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-common-4.1.50.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-resolver-4.1.48.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-handler-4.1.50.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-resolver-4.1.48.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-handler-4.1.50.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-handler-4.1.48.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-resolver-4.1.50.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-handler-4.1.48.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-resolver-4.1.50.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-common-4.1.48.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-transport-4.1.50.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-common-4.1.48.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-transport-4.1.50.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-codec-4.1.48.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-transport-native-epoll-4.1.50.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-codec-4.1.48.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-transport-native-epoll-4.1.50.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-buffer-4.1.48.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.50.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-buffer-4.1.48.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.50.Final.LICENSE.txt
diff --git a/zookeeper-server/src/main/resources/pom.template
b/zookeeper-server/src/main/resources/pom.template
deleted file mode 100644
index a02c0b3..0000000
--- a/zookeeper-server/src/main/resources/pom.template
+++ /dev/null
@@ -1,41 +0,0 @@
-SKIP_LINE ***************************************************************
-SKIP_LINE * Licensed to the Apache Software Foundation (ASF) under one
-SKIP_LINE * or more contributor license agreements. See the NOTICE file
-SKIP_LINE * distributed with this work for additional information
-SKIP_LINE * regarding copyright ownership. The ASF licenses this file
-SKIP_LINE * to you under the Apache License, Version 2.0 (the
-SKIP_LINE * "License"); you may not use this file except in compliance
-SKIP_LINE * with the License. You may obtain a copy of the License at
-SKIP_LINE *
-SKIP_LINE * http://www.apache.org/licenses/LICENSE-2.0
-SKIP_LINE *
-SKIP_LINE * Unless required by applicable law or agreed to in writing,
-SKIP_LINE * software distributed under the License is distributed on an
-SKIP_LINE * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-SKIP_LINE * KIND, either express or implied. See the License for the
-SKIP_LINE * specific language governing permissions and limitations
-SKIP_LINE * under the License.
-SKIP_LINE ***************************************************************
-<?xml version="1.0" encoding="UTF-8"?>
-${ivy.pom.license}
-${ivy.pom.header}
-<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>
- <groupId>${ivy.pom.groupId}</groupId>
- <artifactId>${ivy.pom.artifactId}</artifactId>
- <packaging>${ivy.pom.packaging}</packaging>
- <version>${ivy.pom.version}</version>
- <name>${ivy.pom.name}</name>
- <description>${ivy.pom.description}</description>
- <url>${ivy.pom.url}</url>
-
- <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>
-</project>
