From ed3c016be3eed47b71f31f761f2f1d7fabd186c0 Mon Sep 17 00:00:00 2001 From: Srinivasulu Punuru Date: Thu, 22 Jul 2021 09:01:55 -0700 Subject: [PATCH] License and Notice file updates --- .../fs/azurefs/AbstractAzureFSFactory.java | 4 +-- .../src/main/resources/META-INF/NOTICE | 12 +++++--- .../fs/azurefs/ABFSAzureFSFactoryTest.java | 18 +++++++++++ .../src/main/resources/META-INF/NOTICE | 27 +++++++++++++---- .../src/main/resources/META-INF/NOTICE | 2 +- .../src/main/resources/META-INF/NOTICE | 30 ++++++++++++++----- .../src/main/resources/META-INF/NOTICE | 23 ++++++++++---- 7 files changed, 90 insertions(+), 26 deletions(-) diff --git a/flink-filesystems/flink-azure-fs-hadoop/src/main/java/org/apache/flink/fs/azurefs/AbstractAzureFSFactory.java b/flink-filesystems/flink-azure-fs-hadoop/src/main/java/org/apache/flink/fs/azurefs/AbstractAzureFSFactory.java index a58a98cb85cfd..2f257db9b44df 100644 --- a/flink-filesystems/flink-azure-fs-hadoop/src/main/java/org/apache/flink/fs/azurefs/AbstractAzureFSFactory.java +++ b/flink-filesystems/flink-azure-fs-hadoop/src/main/java/org/apache/flink/fs/azurefs/AbstractAzureFSFactory.java @@ -37,8 +37,8 @@ import static org.apache.flink.util.Preconditions.checkNotNull; /** - * Abstract factory for AzureFS. Subclasses override to specify the correct scheme (wasb / wasbs / abfs/ abfss). - * Based on Azure HDFS support in the hadoop-azure module. */ public abstract class AbstractAzureFSFactory implements FileSystemFactory { diff --git a/flink-filesystems/flink-azure-fs-hadoop/src/main/resources/META-INF/NOTICE b/flink-filesystems/flink-azure-fs-hadoop/src/main/resources/META-INF/NOTICE index 9d487707337d5..824d9bfa03e30 100644 --- a/flink-filesystems/flink-azure-fs-hadoop/src/main/resources/META-INF/NOTICE +++ b/flink-filesystems/flink-azure-fs-hadoop/src/main/resources/META-INF/NOTICE @@ -9,13 +9,17 @@ This project bundles the following dependencies under the Apache Software Licens - com.fasterxml.jackson.core:jackson-annotations:2.12.1 - com.fasterxml.jackson.core:jackson-core:2.12.1 - com.fasterxml.jackson.core:jackson-databind:2.12.1 -- com.google.guava:guava:11.0.2 -- com.microsoft.azure:azure-keyvault-core:0.8.0 -- com.microsoft.azure:azure-storage:5.4.0 +- com.google.guava:guava:20.0 +- com.microsoft.azure:azure-keyvault-core:1.0.0 +- com.microsoft.azure:azure-storage:7.0.1 - commons-codec:commons-codec:1.13 - commons-logging:commons-logging:1.1.3 -- org.apache.hadoop:hadoop-azure:3.1.0 +- org.apache.hadoop:hadoop-azure:3.3.1 +- org.apache.hadoop.thirdparty:hadoop-shaded-guava:1.1.1 - org.apache.httpcomponents:httpclient:4.5.13 - org.apache.httpcomponents:httpcore:4.4.14 +- org.codehaus.jackson:jackson-mapper-asl:1.9.13 +- org.codehaus.jackson:jackson-core-asl:1.9.13 - org.eclipse.jetty:jetty-util:9.3.24.v20180605 - org.eclipse.jetty:jetty-util-ajax:9.3.24.v20180605 +- org.wildfly.openssl:wildfly-openssl:1.0.7.Final diff --git a/flink-filesystems/flink-azure-fs-hadoop/src/test/java/org/apache/flink/fs/azurefs/ABFSAzureFSFactoryTest.java b/flink-filesystems/flink-azure-fs-hadoop/src/test/java/org/apache/flink/fs/azurefs/ABFSAzureFSFactoryTest.java index 17ed5dfd9349a..a331bdc4389ea 100644 --- a/flink-filesystems/flink-azure-fs-hadoop/src/test/java/org/apache/flink/fs/azurefs/ABFSAzureFSFactoryTest.java +++ b/flink-filesystems/flink-azure-fs-hadoop/src/test/java/org/apache/flink/fs/azurefs/ABFSAzureFSFactoryTest.java @@ -1,3 +1,21 @@ +/* + * 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. + */ + package org.apache.flink.fs.azurefs; import org.apache.flink.configuration.Configuration; diff --git a/flink-filesystems/flink-fs-hadoop-shaded/src/main/resources/META-INF/NOTICE b/flink-filesystems/flink-fs-hadoop-shaded/src/main/resources/META-INF/NOTICE index 2d887f242fc19..f95d5ac09430a 100644 --- a/flink-filesystems/flink-fs-hadoop-shaded/src/main/resources/META-INF/NOTICE +++ b/flink-filesystems/flink-fs-hadoop-shaded/src/main/resources/META-INF/NOTICE @@ -6,22 +6,37 @@ 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) -- org.apache.hadoop:hadoop-annotations:3.1.0 -- org.apache.hadoop:hadoop-auth:3.1.0 -- org.apache.hadoop:hadoop-common:3.1.0 +- org.apache.hadoop:hadoop-annotations:3.3.1 +- org.apache.hadoop:hadoop-auth:3.3.1 +- org.apache.hadoop:hadoop-common:3.3.1 +- org.apache.hadoop.thirdparty:hadoop-shaded-guava:1.1.1 +- org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_7:1.1.1 - org.apache.htrace:htrace-core4:4.1.0-incubating +- org.apache.kerby:kerb-core:1.0.1 +- org.apache.kerby:kerby-pkix:1.0.1 +- org.apache.kerby:kerby-asn1:1.0.1 +- org.apache.kerby:kerby-util:1.0.1 - org.apache.commons:commons-configuration2:2.1.1 - org.apache.commons:commons-lang3:3.3.2 +- org.apache.commons:commons-text:1.4 +- org.checkerframework:checker-qual:2.5.2 +- org.codehaus.mojo:animal-sniffer-annotations:1.17 +- org.codehaus.woodstox:stax2-api:4.2.1 +- org.xerial.snappy:snappy-java:1.1.8.3 - commons-lang:commons-lang:2.6 - commons-collections:commons-collections:3.2.2 - commons-io:commons-io:2.8.0 - commons-logging:commons-logging:1.1.3 - commons-beanutils:commons-beanutils:1.9.4 -- com.google.guava:guava:11.0.2 +- com.google.guava:failureaccess:1.0 +- com.google.guava:guava:27.0-jre +- com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava +- com.google.j2objc:j2objc-annotations:1.1 - com.fasterxml.jackson.core:jackson-annotations:2.12.1 - com.fasterxml.jackson.core:jackson-core:2.12.1 - com.fasterxml.jackson.core:jackson-databind:2.12.1 -- com.fasterxml.woodstox:woodstox-core:5.0.3 +- com.fasterxml.woodstox:woodstox-core:5.3.0 +- dnsjava:dnsjava:2.1.7 This project bundles the following dependencies under the Go License (https://golang.org/LICENSE). See bundled license files for details. @@ -33,7 +48,7 @@ See bundled license files for details. - org.codehaus.woodstox:stax2-api:3.1.4 (https://github.com/FasterXML/stax2-api/tree/stax2-api-3.1.4) -This project bundles org.apache.hadoop:*:3.1.0 from which it inherits the following notices: +This project bundles org.apache.hadoop:*:3.3.1 from which it inherits the following notices: The Apache Hadoop project contains subcomponents with separate copyright notices and license terms. Your use of the source code for the these diff --git a/flink-filesystems/flink-oss-fs-hadoop/src/main/resources/META-INF/NOTICE b/flink-filesystems/flink-oss-fs-hadoop/src/main/resources/META-INF/NOTICE index c81d333bc3788..3148ddabf3bbb 100644 --- a/flink-filesystems/flink-oss-fs-hadoop/src/main/resources/META-INF/NOTICE +++ b/flink-filesystems/flink-oss-fs-hadoop/src/main/resources/META-INF/NOTICE @@ -13,7 +13,7 @@ This project bundles the following dependencies under the Apache Software Licens - com.aliyun:aliyun-java-sdk-sts:3.0.0 - commons-codec:commons-codec:1.13 - commons-logging:commons-logging:1.1.3 -- org.apache.hadoop:hadoop-aliyun:3.1.0 +- org.apache.hadoop:hadoop-aliyun:3.3.1 - org.apache.httpcomponents:httpclient:4.5.13 - org.apache.httpcomponents:httpcore:4.4.14 - org.codehaus.jettison:jettison:1.1 diff --git a/flink-filesystems/flink-s3-fs-hadoop/src/main/resources/META-INF/NOTICE b/flink-filesystems/flink-s3-fs-hadoop/src/main/resources/META-INF/NOTICE index ca9c2e3778f3f..ab4add1063b10 100644 --- a/flink-filesystems/flink-s3-fs-hadoop/src/main/resources/META-INF/NOTICE +++ b/flink-filesystems/flink-s3-fs-hadoop/src/main/resources/META-INF/NOTICE @@ -13,24 +13,40 @@ This project bundles the following dependencies under the Apache Software Licens - com.fasterxml.jackson.core:jackson-core:2.12.1 - com.fasterxml.jackson.core:jackson-databind:2.12.1 - com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.12.1 -- com.fasterxml.woodstox:woodstox-core:5.0.3 -- com.google.guava:guava:11.0.2 +- com.fasterxml.woodstox:woodstox-core:5.3.0 +- com.google.guava:failureaccess:1.0 +- com.google.guava:guava:27.0-jre +- com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava +- com.google.j2objc:j2objc-annotations:1.1 - commons-beanutils:commons-beanutils:1.9.4 - commons-codec:commons-codec:1.13 - commons-collections:commons-collections:3.2.2 - commons-io:commons-io:2.8.0 - commons-lang:commons-lang:2.6 - commons-logging:commons-logging:1.1.3 +- dnsjava:dnsjava:2.1.7 - joda-time:joda-time:2.5 - org.apache.commons:commons-configuration2:2.1.1 - org.apache.commons:commons-lang3:3.3.2 -- org.apache.hadoop:hadoop-auth:3.1.0 -- org.apache.hadoop:hadoop-annotations:3.1.0 -- org.apache.hadoop:hadoop-aws:3.1.0 -- org.apache.hadoop:hadoop-common:3.1.0 +- org.apache.commons:commons-text:1.4 +- org.apache.hadoop:hadoop-auth:3.3.1 +- org.apache.hadoop:hadoop-annotations:3.3.1 +- org.apache.hadoop:hadoop-aws:3.3.1 +- org.apache.hadoop:hadoop-common:3.3.1 +- org.apache.hadoop.thirdparty:hadoop-shaded-guava:1.1.1 +- org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_7:1.1.1 - org.apache.htrace:htrace-core4:4.1.0-incubating -- org.apache.httpcomponents:httpcore:4.4.14 - org.apache.httpcomponents:httpclient:4.5.13 +- org.apache.httpcomponents:httpcore:4.4.14 +- org.apache.kerby:kerb-core:1.0.1 +- org.apache.kerby:kerby-pkix:1.0.1 +- org.apache.kerby:kerby-asn1:1.0.1 +- org.apache.kerby:kerby-util:1.0.1 +- org.checkerframework:checker-qual:2.5.2 +- org.codehaus.mojo:animal-sniffer-annotations:1.17 +- org.codehaus.woodstox:stax2-api:4.2.1 +- org.xerial.snappy:snappy-java:1.1.8.3 +- org.wildfly.openssl:wildfly-openssl:1.0.7.Final - software.amazon.ion:ion-java:1.0.2 This project bundles the following dependencies under the CDDL 1.1 license. diff --git a/flink-filesystems/flink-s3-fs-presto/src/main/resources/META-INF/NOTICE b/flink-filesystems/flink-s3-fs-presto/src/main/resources/META-INF/NOTICE index fdd7526e28e5d..024899a14b41e 100644 --- a/flink-filesystems/flink-s3-fs-presto/src/main/resources/META-INF/NOTICE +++ b/flink-filesystems/flink-s3-fs-presto/src/main/resources/META-INF/NOTICE @@ -24,7 +24,7 @@ This project bundles the following dependencies under the Apache Software Licens - com.fasterxml.jackson.core:jackson-core:2.12.1 - com.fasterxml.jackson.core:jackson-databind:2.12.1 - com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.12.1 -- com.fasterxml.woodstox:woodstox-core:5.0.3 +- com.fasterxml.woodstox:woodstox-core:5.3.0 - com.google.guava:guava:21.0 - io.airlift:configuration:0.153 - io.airlift:log:0.153 @@ -34,14 +34,25 @@ This project bundles the following dependencies under the Apache Software Licens - joda-time:joda-time:2.5 - org.apache.commons:commons-configuration2:2.1.1 - org.apache.commons:commons-lang3:3.3.2 -- org.apache.hadoop:hadoop-annotations:3.1.0 -- org.apache.hadoop:hadoop-aws:3.1.0 -- org.apache.hadoop:hadoop-auth:3.1.0 -- org.apache.hadoop:hadoop-common:3.1.0 +- org.apache.commons:commons-text:1.4 +- org.apache.hadoop:hadoop-annotations:3.3.1 +- org.apache.hadoop:hadoop-aws:3.3.1 +- org.apache.hadoop:hadoop-auth:3.3.1 +- org.apache.hadoop:hadoop-common:3.3.1 +- org.apache.hadoop.thirdparty:hadoop-shaded-guava:1.1.1 +- org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_7:1.1.1 - org.apache.htrace:htrace-core4:4.1.0-incubating -- org.apache.httpcomponents:httpcore:4.4.14 - org.apache.httpcomponents:httpclient:4.5.13 +- org.apache.httpcomponents:httpcore:4.4.14 +- org.apache.kerby:kerby-asn1:1.0.1 +- org.apache.kerby:kerb-core:1.0.1 +- org.apache.kerby:kerby-pkix:1.0.1 +- org.apache.kerby:kerby-util:1.0.1 +- org.codehaus.woodstox:stax2-api:4.2.1 +- org.xerial.snappy:snappy-java:1.1.8.3 - org.weakref:jmxutils:1.19 +- org.wildfly.openssl:wildfly-openssl:1.0.7.Final +- dnsjava:dnsjava:2.1.7 - software.amazon.ion:ion-java:1.0.2 This project bundles the following dependencies under the Creative Commons CC0 1.0 Universal Public Domain Dedication License (http://creativecommons.org/publicdomain/zero/1.0/)