Skip to content

Commit

Permalink
Merge commit '105d378fce16804a8af4c26cf732340a0c63b3c9' into merge-4.…
Browse files Browse the repository at this point in the history
…18.0
  • Loading branch information
Bouncheck committed Jun 10, 2024
2 parents 7acacbb + 105d378 commit ac1768e
Show file tree
Hide file tree
Showing 2,041 changed files with 21,099 additions and 12,094 deletions.
36 changes: 36 additions & 0 deletions .asf.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# 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.

notifications:
commits: [email protected]
issues: [email protected]
pullrequests: [email protected]

github:
description: "Java Driver for Apache Cassandra®"
homepage: https://cassandra.apache.org/
enabled_merge_buttons:
squash: false
merge: false
rebase: true
features:
wiki: false
issues: false
projects: false

notifications:
jira_options: link worklog
16 changes: 16 additions & 0 deletions .github/workflows/dep-lic-scan.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
# 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.
#
name: Dependency and License Scan
on:
push:
Expand Down
47 changes: 0 additions & 47 deletions .github/workflows/snyk-cli-scan.yml

This file was deleted.

16 changes: 0 additions & 16 deletions .github/workflows/snyk-pr-cleanup.yml

This file was deleted.

16 changes: 16 additions & 0 deletions .snyk
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
# 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.
# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
version: v1.22.2
# ignores vulnerabilities until expiry date; change duration by modifying expiry date
Expand Down
9 changes: 0 additions & 9 deletions .snyk.ignore.example

This file was deleted.

17 changes: 17 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
# 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.

language: java
dist: trusty
sudo: false
Expand Down
19 changes: 19 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
<!--
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.
-->

# Contributing guidelines

## Reaching out
Expand Down
18 changes: 18 additions & 0 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,22 @@
#!groovy
/*
* 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.
*/

def initializeEnvironment() {
env.DRIVER_DISPLAY_NAME = 'CassandraⓇ Java Driver'
Expand Down
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -200,3 +200,24 @@
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.

Apache Cassandra Java Driver bundles code and files from the following projects:

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

Copyright (C) 2018 Christian Stein
This product includes software developed by Christian Stein
see ci/install-jdk.sh
Loading

0 comments on commit ac1768e

Please sign in to comment.