Merge remote-tracking branch 'upstream/master' into multi-row-inserts-pg

LICENSE

@@ -186,7 +186,7 @@ Apache License
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright {yyyy} {name of copyright owner}
+   Copyright 2021 Aiven Oy and jdbc-connector-for-apache-kafka project contributors
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

README.md

@@ -1,7 +1,7 @@
-# Aiven's JDBC Sink and Source Connectors for Apache Kafka
+# Aiven's JDBC Sink and Source Connectors for Apache Kafka®
 
 This repository includes a Sink and Source
-[Kafka Connect](http://kafka.apache.org/documentation.html#connect)
+[Apache Kafka Connect](http://kafka.apache.org/documentation.html#connect)
 connectors for JDBC-compatible databases.
 
 The project originates from Confluent
@@ -33,4 +33,7 @@ The project is licensed under the
 
 ## Security
 
-Security policies can be found [here](SECURITY.md) and the list of known vulnerabilities [here](cve-list.md)
+Security policies can be found [here](SECURITY.md) and the list of known vulnerabilities [here](cve-list.md)
+
+## Trademark
+Apache Kafka, Apache Kafka Connect are either registered trademarks or trademarks of the Apache Software Foundation in the United States and/or other countries. Kafka Connect JDBC is trademark and property of their respective owners. All product and service names used in this page are for identification purposes only and do not imply endorsement.

build.gradle

@@ -32,7 +32,7 @@ plugins {
 }
 
 repositories {
-    jcenter()
+    mavenCentral()
 }
 
 java {
@@ -42,7 +42,7 @@ java {
 
 checkstyle {
     toolVersion "8.35"
-    configDir rootProject.file("checkstyle/")
+    configDirectory.set(rootProject.file("checkstyle/"))
     println configFile
 }
 
@@ -126,9 +126,9 @@ dependencies {
     testImplementation "org.apache.kafka:connect-api:$kafkaVersion"
     testImplementation "commons-io:commons-io:2.6"
     testImplementation "org.apache.derby:derby:10.11.1.1"
-    testRuntime "org.slf4j:slf4j-log4j12:$slf4jVersion"
     testImplementation 'org.assertj:assertj-core:3.19.0'
 
+    testRuntimeOnly "org.slf4j:slf4j-log4j12:$slf4jVersion"
 }
 
 processResources {

checkstyle/java.header

@@ -1,7 +1,7 @@
 /\*
- \* Copyright 20(19|2[0-9]) (Aiven Oy|Meroxa)
+ \* Copyright (20(19|2[0-9]) - )?20(19|2[0-9]) (Aiven Oy and jdbc-connector-for-apache-kafka project contributors|Meroxa)
  \* Copyright 201[5-9] Confluent Inc.
- \* Copyright 20(19|2[0-9]) (Aiven Oy|Meroxa)
+ \* Copyright (20(19|2[0-9]) - )?20(19|2[0-9]) (Aiven Oy and jdbc-connector-for-apache-kafka project contributors|Meroxa)
  \*
  \* Licensed under the Apache License, Version 2.0 \(the "License"\);
  \* you may not use this file except in compliance with the License.

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionSha256Sum=b13f5d97f08000996bf12d9dd70af3f2c6b694c2c663ab1b545e9695562ad1ee