jbonofre commented on code in PR #18663: URL: https://github.com/apache/iceberg/pull/18663#discussion_r4513923052
########## kafka-connect/kafka-connect-runtime/hive/LICENSE: ########## @@ -573,45 +1014,37 @@ License: MIT -------------------------------------------------------------------------------- -This product bundles Nimbus Content Type. - -Project URL: https://bitbucket.org/connect2id/nimbus-content-type -License: Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0 - --------------------------------------------------------------------------------- - -This product bundles Nimbus Lang Tag. - -Project URL: https://bitbucket.org/connect2id/nimbus-language-tags -License: Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0 - --------------------------------------------------------------------------------- - -This product bundles Nimbus Jose JWT. - -Project URL: https://bitbucket.org/connect2id/nimbus-jose-jwt -License: Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0 - --------------------------------------------------------------------------------- +This product bundles MSAL4J Persistence Extension. -This product bundles Nimbus OIDC SDK. +Project URL: https://github.com/AzureAD/microsoft-authentication-library-for-java +License: MIT -Project URL: https://bitbucket.org/connect2id/oauth-2.0-sdk-with-openid-connect-extensions -License: Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0 +| Copyright (c) Microsoft Corporation. All rights reserved. +| +| 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 -------------------------------------------------------------------------------- -This product bundles JAXB. +This product bundles JAXB (jaxb-api and jaxb-impl). Project URL: http://jaxb.java.net/ -License: CDDL 1.1 - https://glassfish.java.net/public/CDDL+GPL_1_1.html - --------------------------------------------------------------------------------- - -This product bundles Apache Commons Beanutils. - -Project URL: https://commons.apache.org/proper/commons-beanutils/ -License: Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0 +License: CDDL 1.0 - https://spdx.org/licenses/CDDL-1.0.html Review Comment: This changes the JAXB license from CDDL 1.1 to CDDL 1.0, which doesn't match the jar we ship now. jaxb-api 2.2.11 declares `Bundle-License: https://glassfish.java.net/public/CDDL+GPL_1_1.html` in its manifest. CDDL 1.0 was only correct for jaxb-api 2.2.2. The previous hive entry was right. `main/LICENSE` needs the same fix. ```suggestion License: CDDL 1.1 - https://glassfish.java.net/public/CDDL+GPL_1_1.html ``` ########## kafka-connect/kafka-connect-runtime/hive/NOTICE: ########## @@ -113,193 +876,144 @@ This product bundles Datanucleus with the following in its NOTICE file: | Marcus Mennemeier | Xuan Baldauf | Eric Sultan -| -| +| +| | =================================================================== | This product also includes software developed by the TJDO project | (http://tjdo.sourceforge.net/). | =================================================================== -------------------------------------------------------------------------------- -This product bundles AWS SDK for Java with the following in its NOTICE file: -| AWS SDK for Java 2.0 -| Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. -| -| This product includes software developed by -| Amazon Technologies, Inc (http://www.amazon.com/). -| -| ********************** -| THIRD PARTY COMPONENTS -| ********************** -| This software includes third party software subject to the following copyrights: -| - XML parsing and utility functions from JetS3t - Copyright 2006-2009 James Murty. -| - PKCS#1 PEM encoded private key parsing and utility functions from oauth.googlecode.com - Copyright 1998-2010 AOL Inc. -| - Apache Commons Lang - https://github.com/apache/commons-lang -| - Netty Reactive Streams - https://github.com/playframework/netty-reactive-streams -| - Jackson-core - https://github.com/FasterXML/jackson-core -| - Jackson-dataformat-cbor - https://github.com/FasterXML/jackson-dataformats-binary -| -| The licenses for these third party components are included in LICENSE.txt -| -| - For Apache Commons Lang see also this required NOTICE: -| Apache Commons Lang -| Copyright 2001-2020 The Apache Software Foundation -| -| This product includes software developed at -| The Apache Software Foundation (https://www.apache.org/). - --------------------------------------------------------------------------------- - -This product bundles Guice with the following in its NOTICE file: -| Google Guice - Core Library -| Copyright 2006-2015 Google, Inc. -| -| This product includes software developed at -| The Apache Software Foundation (http://www.apache.org/). - --------------------------------------------------------------------------------- - -This product bundles reload4j with the following in its NOTICE file: Review Comment: This reload4j section is removed, but `reload4j` and `slf4j-reload4j` are still in `hive/runtime-deps.txt`. The reload4j jar ships a `META-INF/NOTICE`. Even if the NOTICE is the one from Apache, `reload4j` is not ASF project, so we should keep it. Can this section be restored? ########## kafka-connect/build.gradle: ########## @@ -74,6 +74,10 @@ project(':iceberg-kafka-connect:iceberg-kafka-connect-runtime') { hive { extendsFrom runtimeClasspath } + runtimeClasspath { + // keep the hive distribution a superset of main by resolving shared jars to the same versions + shouldResolveConsistentlyWith(hive) Review Comment: This lets the hive graph decide which versions main ships. Per the commit message, main moves to newer commons-logging (1.2 -> 1.3), jaxb-api and jakarta.activation-api, and drops stax-api. The hive zip is built only from `configuration.hive`, so the two distributions don't need matching versions to package correctly. The gain is that `hive/LICENSE` can be `main/LICENSE` plus additions. I would rather not change the default distribution jars as a side effect of a hive only fix. Also, commons-logging 1.3 changes how it discovers a logging backend: it now prefers the Log4j API or SL4J. That changes how logging behaves in main. Could this commit come out of this PR, with hive keeping its own versions and licensing them in `hive/LICENSE`? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
