From eddad99123525211c900102206384dacaf8385fc Mon Sep 17 00:00:00 2001 From: Chesnay Schepler Date: Wed, 11 Dec 2019 10:31:24 +0100 Subject: [PATCH] [FLINK-15008][legal] Update licensing --- flink-dist/src/main/resources/META-INF/NOTICE | 3 ++- .../flink-oss-fs-hadoop/src/main/resources/META-INF/NOTICE | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/flink-dist/src/main/resources/META-INF/NOTICE b/flink-dist/src/main/resources/META-INF/NOTICE index 2714eda6631..be9dd915025 100644 --- a/flink-dist/src/main/resources/META-INF/NOTICE +++ b/flink-dist/src/main/resources/META-INF/NOTICE @@ -53,7 +53,8 @@ See bundled license files for details. This project bundles the following dependencies under the CDDL 1.1 license. See bundled license files for details. -- javax.xml.bind:jaxb-api:2.3.0 +- javax.activation:javax.activation-api:1.2.0 +- javax.xml.bind:jaxb-api:2.3.1 This project bundles "org.tukaani:xz:1.5". This Java implementation of XZ has been put into the public domain, thus you can do 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 89a39f3e899..06a0dbd414a 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 @@ -87,7 +87,6 @@ See bundled license files for details. This project bundles the following dependencies under the Common Development and Distribution License (CDDL) 1.0. See bundled license files for details. -- javax.activation:activation:1.1 - javax.ws.rs:jsr311-api:1.1.1 - javax.xml.stream:stax-api:1.0-2 - stax:stax-api:1.0.1 @@ -100,9 +99,10 @@ See bundled license files for details. - com.sun.jersey:jersey-server:1.19 - com.sun.jersey:jersey-servlet:1.19 - com.sun.xml.bind:jaxb-impl:2.2.3-1 +- javax.activation:activation-api:1.2.0 - javax.servlet.jsp:jsp-api:2.1 - javax.servlet:javax.servlet-api:3.1.0 -- javax.xml.bind:jaxb-api:2.2.2 +- javax.xml.bind:jaxb-api:2.3.1 This project bundles the following dependencies under the Go License (https://golang.org/LICENSE). See bundled license files for details.