Skip to content

Commit 87ba8b6

Browse files
authored
Merge pull request #307 from Bouncheck/merge-4.18.0
Merge 4.18.0 from upstream
2 parents 07dfa3e + dfee08f commit 87ba8b6

File tree

2,041 files changed

+20914
-12103
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,041 files changed

+20914
-12103
lines changed

.github/workflows/dep-lic-scan.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
#
117
name: Dependency and License Scan
218
on:
319
push:

.github/workflows/snyk-cli-scan.yml

Lines changed: 0 additions & 47 deletions
This file was deleted.

.github/workflows/snyk-pr-cleanup.yml

Lines changed: 0 additions & 16 deletions
This file was deleted.

.snyk

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
117
# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
218
version: v1.22.2
319
# ignores vulnerabilities until expiry date; change duration by modifying expiry date

.snyk.ignore.example

Lines changed: 0 additions & 9 deletions
This file was deleted.

.travis.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
118
language: java
219
dist: trusty
320
sudo: false

CONTRIBUTING.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
<!--
2+
Licensed to the Apache Software Foundation (ASF) under one
3+
or more contributor license agreements. See the NOTICE file
4+
distributed with this work for additional information
5+
regarding copyright ownership. The ASF licenses this file
6+
to you under the Apache License, Version 2.0 (the
7+
"License"); you may not use this file except in compliance
8+
with the License. You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing,
13+
software distributed under the License is distributed on an
14+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
KIND, either express or implied. See the License for the
16+
specific language governing permissions and limitations
17+
under the License.
18+
-->
19+
120
# Contributing guidelines
221

322
## Reaching out

Jenkinsfile

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,22 @@
11
#!groovy
2+
/*
3+
* Licensed to the Apache Software Foundation (ASF) under one
4+
* or more contributor license agreements. See the NOTICE file
5+
* distributed with this work for additional information
6+
* regarding copyright ownership. The ASF licenses this file
7+
* to you under the Apache License, Version 2.0 (the
8+
* "License"); you may not use this file except in compliance
9+
* with the License. You may obtain a copy of the License at
10+
*
11+
* http://www.apache.org/licenses/LICENSE-2.0
12+
*
13+
* Unless required by applicable law or agreed to in writing,
14+
* software distributed under the License is distributed on an
15+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
16+
* KIND, either express or implied. See the License for the
17+
* specific language governing permissions and limitations
18+
* under the License.
19+
*/
220

321
def initializeEnvironment() {
422
env.DRIVER_DISPLAY_NAME = 'CassandraⓇ Java Driver'

LICENSE

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,3 +200,24 @@
200200
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201201
See the License for the specific language governing permissions and
202202
limitations under the License.
203+
204+
Apache Cassandra Java Driver bundles code and files from the following projects:
205+
206+
JNR project
207+
Copyright (C) 2008-2010 Wayne Meissner
208+
This product includes software developed as part of the JNR project ( https://github.com/jnr/jnr-ffi )s.
209+
see core/src/main/java/com/datastax/oss/driver/internal/core/os/CpuInfo.java
210+
211+
Protocol Buffers
212+
Copyright 2008 Google Inc.
213+
This product includes software developed as part of the Protocol Buffers project ( https://developers.google.com/protocol-buffers/ ).
214+
see core/src/main/java/com/datastax/oss/driver/internal/core/type/util/VIntCoding.java
215+
216+
Guava
217+
Copyright (C) 2007 The Guava Authors
218+
This product includes software developed as part of the Guava project ( https://guava.dev ).
219+
see core/src/main/java/com/datastax/oss/driver/internal/core/util/CountingIterator.java
220+
221+
Copyright (C) 2018 Christian Stein
222+
This product includes software developed by Christian Stein
223+
see ci/install-jdk.sh

0 commit comments

Comments
 (0)