diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index d73e1c6862312..1297f604ea65f 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -577,31 +577,6 @@ Bouncy Castle License - org.bouncycastle-bcprov-jdk18on-1.78.1.jar - org.bouncycastle-bcutil-jdk18on-1.78.1.jar -Datastax - - com.datastax.oss-managed-ledger-3.1.4.13-SNAPSHOT.jar - - com.datastax.oss-pulsar-broker-3.1.4.13-SNAPSHOT.jar - - com.datastax.oss-pulsar-broker-auth-oidc-3.1.4.13-SNAPSHOT.jar - - com.datastax.oss-pulsar-broker-auth-sasl-3.1.4.13-SNAPSHOT.jar - - com.datastax.oss-pulsar-broker-common-3.1.4.13-SNAPSHOT.jar - - com.datastax.oss-pulsar-config-validation-3.1.4.13-SNAPSHOT.jar - - com.datastax.oss-pulsar-docs-tools-3.1.4.13-SNAPSHOT.jar - - com.datastax.oss-pulsar-functions-api-3.1.4.13-SNAPSHOT.jar - - com.datastax.oss-pulsar-functions-instance-3.1.4.13-SNAPSHOT.jar - - com.datastax.oss-pulsar-functions-local-runner-original-3.1.4.13-SNAPSHOT.jar - - com.datastax.oss-pulsar-functions-proto-3.1.4.13-SNAPSHOT.jar - - com.datastax.oss-pulsar-functions-runtime-3.1.4.13-SNAPSHOT.jar - - com.datastax.oss-pulsar-functions-secrets-3.1.4.13-SNAPSHOT.jar - - com.datastax.oss-pulsar-functions-utils-3.1.4.13-SNAPSHOT.jar - - com.datastax.oss-pulsar-functions-worker-3.1.4.13-SNAPSHOT.jar - - com.datastax.oss-pulsar-io-core-3.1.4.13-SNAPSHOT.jar - - com.datastax.oss-pulsar-metadata-3.1.4.13-SNAPSHOT.jar - - com.datastax.oss-pulsar-proxy-3.1.4.13-SNAPSHOT.jar - - com.datastax.oss-pulsar-testclient-3.1.4.13-SNAPSHOT.jar - - com.datastax.oss-pulsar-transaction-common-3.1.4.13-SNAPSHOT.jar - - com.datastax.oss-pulsar-transaction-coordinator-3.1.4.13-SNAPSHOT.jar - - com.datastax.oss-testmocks-3.1.4.13-SNAPSHOT.jar - - com.datastax.oss-jetcd-core-shaded-3.1.4.13-SNAPSHOT.jar - ------------------------ Additionaly, Netty includes code with the following licenses: diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE index 2cdf9c5bf2be5..ee8348a054ad6 100644 --- a/pulsar-sql/presto-distribution/LICENSE +++ b/pulsar-sql/presto-distribution/LICENSE @@ -272,7 +272,6 @@ The Apache Software License, Version 2.0 - grpc-stub-1.55.3.jar - grpc-util-1.60.0.jar * JEtcd - shaded - - jetcd-core-shaded-3.1.4.13-SNAPSHOT.jar * Vertx - shaded * Joda Time - joda-time-2.10.10.jar diff --git a/src/check-binary-license.sh b/src/check-binary-license.sh index 3a6d266345f30..c7f3eea90d26a 100755 --- a/src/check-binary-license.sh +++ b/src/check-binary-license.sh @@ -66,6 +66,11 @@ for J in $JARS; do continue fi + echo $J | grep -q "com.datastax.oss" + if [ $? == 0 ]; then + continue + fi + echo "$LICENSE" | grep -q $J if [ $? != 0 ]; then echo $J unaccounted for in LICENSE diff --git a/src/update-datastax-license-version.sh b/src/update-datastax-license-version.sh deleted file mode 100755 index e500016ebda24..0000000000000 --- a/src/update-datastax-license-version.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/env bash -# -# 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. -# - -set -e -if [ "$#" -ne 3 ]; then - echo "Usage: $0 " - exit 1 -fi - -FILENAME="$1" -CURRENT_VERSION="$2" -NEXT_VERSION="$3" - -echo "$FILENAME" -echo "$CURRENT_VERSION" -echo "$NEXT_VERSION" - -if [ ! -f "$FILENAME" ]; then - echo "Error: File '$FILENAME' not found!" - exit 1 -fi - -while IFS= read -r LINE; do - if [[ "$LINE" == *"$CURRENT_VERSION"* ]]; then - UPDATED_LINE="${LINE/$CURRENT_VERSION/$NEXT_VERSION}" - echo "$UPDATED_LINE" - else - echo "$LINE" - fi -done < "$FILENAME" > "$FILENAME.new" - -mv "$FILENAME.new" "$FILENAME" -echo "License file '$FILENAME' updated successfully." \ No newline at end of file