You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by mc...@apache.org on 2023/11/28 19:41:58 UTC
(cassandra-java-driver) branch 4.6.1_fixes updated: Add LICENSE and NOTICE.txt/NOTICE_binary to published jars LICENSE + NOTICE.txt is added to source jars, LICENSE + NOTICE_binary.txt is added to regular jars. Make parent project inherit from apache pom. Updated NOTICE wording to "developed at ..." per latest instructions.
This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch 4.6.1_fixes
in repository https://gitbox.apache.org/repos/asf/cassandra-java-driver.git
The following commit(s) were added to refs/heads/4.6.1_fixes by this push:
new 96a26835a Add LICENSE and NOTICE.txt/NOTICE_binary to published jars LICENSE + NOTICE.txt is added to source jars, LICENSE + NOTICE_binary.txt is added to regular jars. Make parent project inherit from apache pom. Updated NOTICE wording to "developed at ..." per latest instructions.
96a26835a is described below
commit 96a26835aa651b376b2997e50b8d3117e08daf13
Author: Henry Hughes <he...@datastax.com>
AuthorDate: Thu Nov 16 23:15:10 2023 -0800
Add LICENSE and NOTICE.txt/NOTICE_binary to published jars
LICENSE + NOTICE.txt is added to source jars, LICENSE + NOTICE_binary.txt
is added to regular jars. Make parent project inherit from apache pom.
Updated NOTICE wording to "developed at ..." per latest instructions.
patch by Henry Hughes; reviewed by Mick Semb Wever for CASSANDRA-18969
---
NOTICE.txt | 243 +--------------------
NOTICE.txt => NOTICE_binary.txt | 5 +-
core-shaded/pom.xml | 20 +-
core/pom.xml | 8 +
.../api/core/cql/continuous/ContinuousSession.java | 4 +-
distribution/src/assembly/binary-tarball.xml | 1 +
mapper-processor/pom.xml | 13 ++
mapper-runtime/pom.xml | 13 ++
pom.xml | 21 ++
query-builder/pom.xml | 13 ++
test-infra/pom.xml | 13 ++
11 files changed, 106 insertions(+), 248 deletions(-)
diff --git a/NOTICE.txt b/NOTICE.txt
index b7a91be23..8e27ae3e5 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,246 +1,5 @@
Apache Cassandra Java Driver
Copyright 2012- The Apache Software Foundation
-This product includes software developed by The Apache Software
+This product includes software developed at The Apache Software
Foundation (http://www.apache.org/).
-
-==================================================================
-io.netty:netty-handler NOTICE.txt
-==================================================================
-This product contains the extensions to Java Collections Framework which has
-been derived from the works by JSR-166 EG, Doug Lea, and Jason T. Greene:
-
- * LICENSE:
- * license/LICENSE.jsr166y.txt (Public Domain)
- * HOMEPAGE:
- * http://gee.cs.oswego.edu/cgi-bin/viewcvs.cgi/jsr166/
- * http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbosscache/experimental/jsr166/
-
-This product contains a modified version of Robert Harder's Public Domain
-Base64 Encoder and Decoder, which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.base64.txt (Public Domain)
- * HOMEPAGE:
- * http://iharder.sourceforge.net/current/java/base64/
-
-This product contains a modified portion of 'Webbit', an event based
-WebSocket and HTTP server, which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.webbit.txt (BSD License)
- * HOMEPAGE:
- * https://github.com/joewalnes/webbit
-
-This product contains a modified portion of 'SLF4J', a simple logging
-facade for Java, which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.slf4j.txt (MIT License)
- * HOMEPAGE:
- * https://www.slf4j.org/
-
-This product contains a modified portion of 'Apache Harmony', an open source
-Java SE, which can be obtained at:
-
- * NOTICE:
- * license/NOTICE.harmony.txt
- * LICENSE:
- * license/LICENSE.harmony.txt (Apache License 2.0)
- * HOMEPAGE:
- * https://archive.apache.org/dist/harmony/
-
-This product contains a modified portion of 'jbzip2', a Java bzip2 compression
-and decompression library written by Matthew J. Francis. It can be obtained at:
-
- * LICENSE:
- * license/LICENSE.jbzip2.txt (MIT License)
- * HOMEPAGE:
- * https://code.google.com/p/jbzip2/
-
-This product contains a modified portion of 'libdivsufsort', a C API library to construct
-the suffix array and the Burrows-Wheeler transformed string for any input string of
-a constant-size alphabet written by Yuta Mori. It can be obtained at:
-
- * LICENSE:
- * license/LICENSE.libdivsufsort.txt (MIT License)
- * HOMEPAGE:
- * https://github.com/y-256/libdivsufsort
-
-This product contains a modified portion of Nitsan Wakart's 'JCTools', Java Concurrency Tools for the JVM,
- which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.jctools.txt (ASL2 License)
- * HOMEPAGE:
- * https://github.com/JCTools/JCTools
-
-This product optionally depends on 'JZlib', a re-implementation of zlib in
-pure Java, which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.jzlib.txt (BSD style License)
- * HOMEPAGE:
- * http://www.jcraft.com/jzlib/
-
-This product optionally depends on 'Compress-LZF', a Java library for encoding and
-decoding data in LZF format, written by Tatu Saloranta. It can be obtained at:
-
- * LICENSE:
- * license/LICENSE.compress-lzf.txt (Apache License 2.0)
- * HOMEPAGE:
- * https://github.com/ning/compress
-
-This product optionally depends on 'lz4', a LZ4 Java compression
-and decompression library written by Adrien Grand. It can be obtained at:
-
- * LICENSE:
- * license/LICENSE.lz4.txt (Apache License 2.0)
- * HOMEPAGE:
- * https://github.com/jpountz/lz4-java
-
-This product optionally depends on 'lzma-java', a LZMA Java compression
-and decompression library, which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.lzma-java.txt (Apache License 2.0)
- * HOMEPAGE:
- * https://github.com/jponge/lzma-java
-
-This product optionally depends on 'zstd-jni', a zstd-jni Java compression
-and decompression library, which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.zstd-jni.txt (Apache License 2.0)
- * HOMEPAGE:
- * https://github.com/luben/zstd-jni
-
-This product contains a modified portion of 'jfastlz', a Java port of FastLZ compression
-and decompression library written by William Kinney. It can be obtained at:
-
- * LICENSE:
- * license/LICENSE.jfastlz.txt (MIT License)
- * HOMEPAGE:
- * https://code.google.com/p/jfastlz/
-
-This product contains a modified portion of and optionally depends on 'Protocol Buffers', Google's data
-interchange format, which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.protobuf.txt (New BSD License)
- * HOMEPAGE:
- * https://github.com/google/protobuf
-
-This product optionally depends on 'Bouncy Castle Crypto APIs' to generate
-a temporary self-signed X.509 certificate when the JVM does not provide the
-equivalent functionality. It can be obtained at:
-
- * LICENSE:
- * license/LICENSE.bouncycastle.txt (MIT License)
- * HOMEPAGE:
- * https://www.bouncycastle.org/
-
-This product optionally depends on 'Snappy', a compression library produced
-by Google Inc, which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.snappy.txt (New BSD License)
- * HOMEPAGE:
- * https://github.com/google/snappy
-
-This product optionally depends on 'JBoss Marshalling', an alternative Java
-serialization API, which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.jboss-marshalling.txt (Apache License 2.0)
- * HOMEPAGE:
- * https://github.com/jboss-remoting/jboss-marshalling
-
-This product optionally depends on 'Caliper', Google's micro-
-benchmarking framework, which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.caliper.txt (Apache License 2.0)
- * HOMEPAGE:
- * https://github.com/google/caliper
-
-This product optionally depends on 'Apache Commons Logging', a logging
-framework, which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.commons-logging.txt (Apache License 2.0)
- * HOMEPAGE:
- * https://commons.apache.org/logging/
-
-This product optionally depends on 'Apache Log4J', a logging framework, which
-can be obtained at:
-
- * LICENSE:
- * license/LICENSE.log4j.txt (Apache License 2.0)
- * HOMEPAGE:
- * https://logging.apache.org/log4j/
-
-This product optionally depends on 'Aalto XML', an ultra-high performance
-non-blocking XML processor, which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.aalto-xml.txt (Apache License 2.0)
- * HOMEPAGE:
- * https://wiki.fasterxml.com/AaltoHome
-
-This product contains a modified version of 'HPACK', a Java implementation of
-the HTTP/2 HPACK algorithm written by Twitter. It can be obtained at:
-
- * LICENSE:
- * license/LICENSE.hpack.txt (Apache License 2.0)
- * HOMEPAGE:
- * https://github.com/twitter/hpack
-
-This product contains a modified version of 'HPACK', a Java implementation of
-the HTTP/2 HPACK algorithm written by Cory Benfield. It can be obtained at:
-
- * LICENSE:
- * license/LICENSE.hyper-hpack.txt (MIT License)
- * HOMEPAGE:
- * https://github.com/python-hyper/hpack/
-
-This product contains a modified version of 'HPACK', a Java implementation of
-the HTTP/2 HPACK algorithm written by Tatsuhiro Tsujikawa. It can be obtained at:
-
- * LICENSE:
- * license/LICENSE.nghttp2-hpack.txt (MIT License)
- * HOMEPAGE:
- * https://github.com/nghttp2/nghttp2/
-
-This product contains a modified portion of 'Apache Commons Lang', a Java library
-provides utilities for the java.lang API, which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.commons-lang.txt (Apache License 2.0)
- * HOMEPAGE:
- * https://commons.apache.org/proper/commons-lang/
-
-
-This product contains the Maven wrapper scripts from 'Maven Wrapper', that provides an easy way to ensure a user has everything necessary to run the Maven build.
-
- * LICENSE:
- * license/LICENSE.mvn-wrapper.txt (Apache License 2.0)
- * HOMEPAGE:
- * https://github.com/takari/maven-wrapper
-
-This product contains the dnsinfo.h header file, that provides a way to retrieve the system DNS configuration on MacOS.
-This private header is also used by Apple's open source
- mDNSResponder (https://opensource.apple.com/tarballs/mDNSResponder/).
-
- * LICENSE:
- * license/LICENSE.dnsinfo.txt (Apple Public Source License 2.0)
- * HOMEPAGE:
- * https://www.opensource.apple.com/source/configd/configd-453.19/dnsinfo/dnsinfo.h
-
-This product optionally depends on 'Brotli4j', Brotli compression and
-decompression for Java., which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.brotli4j.txt (Apache License 2.0)
- * HOMEPAGE:
- * https://github.com/hyperxpro/Brotli4j
diff --git a/NOTICE.txt b/NOTICE_binary.txt
similarity index 97%
copy from NOTICE.txt
copy to NOTICE_binary.txt
index b7a91be23..c60d8ceb2 100644
--- a/NOTICE.txt
+++ b/NOTICE_binary.txt
@@ -1,9 +1,12 @@
Apache Cassandra Java Driver
Copyright 2012- The Apache Software Foundation
-This product includes software developed by The Apache Software
+This product includes software developed at The Apache Software
Foundation (http://www.apache.org/).
+This compiled product also includes Apache-licensed dependencies
+that contain the following NOTICE information:
+
==================================================================
io.netty:netty-handler NOTICE.txt
==================================================================
diff --git a/core-shaded/pom.xml b/core-shaded/pom.xml
index 87d4c7901..0aea42f56 100644
--- a/core-shaded/pom.xml
+++ b/core-shaded/pom.xml
@@ -129,6 +129,19 @@
4) assembly plugin re-creates the shaded jar by packing target/classes + manifest + shaded pom
-->
<build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>${project.basedir}/..</directory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE_binary.txt</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
+ </resources>
<plugins>
<plugin>
<artifactId>maven-shade-plugin</artifactId>
@@ -183,9 +196,10 @@
<!-- Exclude everything under META-INF -->
<filter>
<artifact>com.datastax.oss:*</artifact>
- <excludes>
- <exclude>META-INF/**</exclude>
- </excludes>
+ <includes>
+ <include>META-INF/LICENSE</include>
+ <include>META-INF/NOTICE.txt</include>
+ </includes>
</filter>
<filter>
<artifact>io.netty:*</artifact>
diff --git a/core/pom.xml b/core/pom.xml
index be508a588..98ae6d3c6 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -198,6 +198,14 @@
</excludes>
<filtering>false</filtering>
</resource>
+ <resource>
+ <directory>${project.basedir}/..</directory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE_binary.txt</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
</resources>
<testResources>
<testResource>
diff --git a/core/src/main/java/com/datastax/dse/driver/api/core/cql/continuous/ContinuousSession.java b/core/src/main/java/com/datastax/dse/driver/api/core/cql/continuous/ContinuousSession.java
index b99c54410..4433bbb1c 100644
--- a/core/src/main/java/com/datastax/dse/driver/api/core/cql/continuous/ContinuousSession.java
+++ b/core/src/main/java/com/datastax/dse/driver/api/core/cql/continuous/ContinuousSession.java
@@ -33,8 +33,8 @@ import java.util.concurrent.CompletionStage;
* A session that has the ability to execute continuous paging queries.
*
* <p>Continuous paging is a new method of streaming bulk amounts of records from Datastax
- * Enterprise (DSE) to the Java Driver, available since DSE 5.1. It is mainly intended to
- * be leveraged by <a
+ * Enterprise (DSE) to the Java Driver, available since DSE 5.1. It is mainly intended to be
+ * leveraged by <a
* href="https://docs.datastax.com/en/dse/5.1/dse-dev/datastax_enterprise/analytics/analyticsTOC.html">DSE
* Analytics</a> and Apache Spark™, or by any similar analytics tool that needs to read large
* portions of a table in one single operation, as quick and reliably as possible.
diff --git a/distribution/src/assembly/binary-tarball.xml b/distribution/src/assembly/binary-tarball.xml
index 17364aa85..9f4489871 100644
--- a/distribution/src/assembly/binary-tarball.xml
+++ b/distribution/src/assembly/binary-tarball.xml
@@ -157,6 +157,7 @@
<includes>
<include>README*</include>
<include>LICENSE*</include>
+ <include>NOTICE*</include>
</includes>
</fileSet>
<fileSet>
diff --git a/mapper-processor/pom.xml b/mapper-processor/pom.xml
index 1b0141703..1d0bdef13 100644
--- a/mapper-processor/pom.xml
+++ b/mapper-processor/pom.xml
@@ -100,6 +100,19 @@
</dependency>
</dependencies>
<build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>${project.basedir}/..</directory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE_binary.txt</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
+ </resources>
<testResources>
<testResource>
<directory>src/test/resources</directory>
diff --git a/mapper-runtime/pom.xml b/mapper-runtime/pom.xml
index cea3cc089..4fd5b578e 100644
--- a/mapper-runtime/pom.xml
+++ b/mapper-runtime/pom.xml
@@ -97,6 +97,19 @@
</dependency>
</dependencies>
<build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>${project.basedir}/..</directory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE_binary.txt</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
+ </resources>
<testResources>
<testResource>
<directory>src/test/resources</directory>
diff --git a/pom.xml b/pom.xml
index 9b16479e5..8c847208f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,6 +20,11 @@
-->
<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>
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>23</version>
+ </parent>
<groupId>com.datastax.oss</groupId>
<artifactId>java-driver-parent</artifactId>
<version>4.6.1</version>
@@ -683,6 +688,14 @@ limitations under the License.]]></inlineHeader>
<goals>
<goal>jar-no-fork</goal>
</goals>
+ <configuration>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ <excludes>
+ <exclude>NOTICE_binary.txt</exclude>
+ </excludes>
+ </configuration>
</execution>
</executions>
</plugin>
@@ -835,6 +848,14 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.7.0</version>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
<profiles>
diff --git a/query-builder/pom.xml b/query-builder/pom.xml
index be0b1f96a..3c21a0303 100644
--- a/query-builder/pom.xml
+++ b/query-builder/pom.xml
@@ -82,6 +82,19 @@
</dependency>
</dependencies>
<build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>${project.basedir}/..</directory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE_binary.txt</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
+ </resources>
<testResources>
<testResource>
<directory>src/test/resources</directory>
diff --git a/test-infra/pom.xml b/test-infra/pom.xml
index 1401e553a..790f1dd27 100644
--- a/test-infra/pom.xml
+++ b/test-infra/pom.xml
@@ -72,6 +72,19 @@
</dependency>
</dependencies>
<build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>${project.basedir}/..</directory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE_binary.txt</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
+ </resources>
<plugins>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org