From 820d7c2a6ce53061907138b175b5db18bb2cfa98 Mon Sep 17 00:00:00 2001 From: Henry Hughes Date: Wed, 8 Nov 2023 12:46:33 -0800 Subject: [PATCH] Copyright fixes patch by Claude Warren; reviewed by Henry Hughes, Mick Semb Wever for CASSANDRA-18969 --- NOTICE.txt | 12 +----------- README.md | 2 +- .../core/PreparedStatementInvalidationTest.java | 16 ---------------- 3 files changed, 2 insertions(+), 28 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 477f0645ed9..5084d4e90cd 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -4,17 +4,7 @@ Copyright 2012- The Apache Software Foundation This product includes software developed by The Apache Software Foundation (http://www.apache.org/). -JNR project -Copyright (C) 2008-2010 Wayne Meissner -This product includes software developed as part of the JNR project ( https://github.com/jnr/jnr-ffi )s. -see core/src/main/java/com/datastax/oss/driver/internal/core/os/CpuInfo.java - Protocol Buffers Copyright 2008 Google Inc. This product includes software developed as part of the Protocol Buffers project ( https://developers.google.com/protocol-buffers/ ). -see core/src/main/java/com/datastax/oss/driver/internal/core/type/util/VIntCoding.java - -Guava -Copyright (C) 2007 The Guava Authors -This product includes software developed as part of the Guava project ( https://guava.dev ). -see core/src/main/java/com/datastax/oss/driver/internal/core/util/CountingIterator.java \ No newline at end of file +see driver-core/src/main/java/com/datastax/driver/core/VIntCoding.java \ No newline at end of file diff --git a/README.md b/README.md index 22e5d041bb2..156830f8a87 100644 --- a/README.md +++ b/README.md @@ -134,7 +134,7 @@ If you are upgrading to _DataStax Enterprise_, use the [DataStax Enterprise Java features and better compatibility. ## License -Copyright 2012-2018, DataStax +© The Apache Software Foundation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/driver-core/src/test/java/com/datastax/driver/core/PreparedStatementInvalidationTest.java b/driver-core/src/test/java/com/datastax/driver/core/PreparedStatementInvalidationTest.java index 0c3ce26c1a4..1a553b82e22 100644 --- a/driver-core/src/test/java/com/datastax/driver/core/PreparedStatementInvalidationTest.java +++ b/driver-core/src/test/java/com/datastax/driver/core/PreparedStatementInvalidationTest.java @@ -15,22 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -/* - * Copyright (C) 2012-2017 DataStax Inc. - * - * Licensed 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 com.datastax.driver.core;