diff --git a/.github/workflows/pr-build-workflow.yml b/.github/workflows/pr-build-workflow.yml index 418c807f..55a27aa1 100644 --- a/.github/workflows/pr-build-workflow.yml +++ b/.github/workflows/pr-build-workflow.yml @@ -12,15 +12,15 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - name: Set up JDK 11 - uses: actions/setup-java@v1 - with: - java-version: 11 - - - name: Run Gradle - uses: burrunan/gradle-cache-action@v1 - env: - GRADLE_ENTERPRISE_URL: https://ge.spring.io/ - with: - arguments: check + - uses: actions/checkout@v2 + - name: Set up JDK 11 + uses: actions/setup-java@v1 + with: + java-version: 11 + + - name: Run Gradle + uses: burrunan/gradle-cache-action@v1 + env: + GRADLE_ENTERPRISE_URL: https://ge.spring.io/ + with: + arguments: check diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 5b541382..00000000 --- a/.travis.yml +++ /dev/null @@ -1,14 +0,0 @@ -dist: bionic -language: java -jdk: openjdk11 -install: true -before_cache: - - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock -cache: - directories: - - $HOME/.gradle/caches/ - - $HOME/.gradle/wrapper/ -env: - - GRADLE_ENTERPRISE_URL=https://ge.spring.io/ -script: - - ./gradlew check --no-daemon diff --git a/build.gradle b/build.gradle index b0fd77c6..711fd849 100644 --- a/build.gradle +++ b/build.gradle @@ -41,7 +41,7 @@ ext { linkScmUrl = 'https://github.com/spring-projects/spring-kafka' linkScmConnection = 'https://github.com/spring-projects/spring-kafka.git' linkScmDevConnection = 'git@github.com:spring-projects/spring-kafka.git' - docResourcesVersion = '0.2.1.RELEASE' + docResourcesVersion = '0.2.4' if (gitPresent) { @@ -149,7 +149,7 @@ subprojects { subproject -> eclipse.project.natures += 'org.springframework.ide.eclipse.core.springnature' jacoco { - toolVersion = '0.8.5' + toolVersion = '0.8.6' } // dependencies that are common across all java projects @@ -185,7 +185,7 @@ subprojects { subproject -> checkstyle { configDirectory.set(rootProject.file("src/checkstyle")) - toolVersion = '8.24' + toolVersion = '8.38' } jacocoTestReport { @@ -220,7 +220,7 @@ subprojects { subproject -> } task updateCopyrights { - onlyIf { gitPresent && !System.getenv('TRAVIS') && !System.getenv('bamboo_buildKey') } + onlyIf { gitPresent && !System.getenv('GITHUB_ACTION') && !System.getenv('bamboo_buildKey') } if (gitPresent) { inputs.files(modifiedFiles.filter { f -> f.path.contains(subproject.name) }) } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4d9ca164..77c9546f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,3 +3,4 @@ distributionPath=wrapper/dists distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists +distributionSha256Sum=3239b5ed86c3838a37d983ac100573f64c1f3fd8e1eb6c89fa5f9529b5ec091d \ No newline at end of file diff --git a/spring-kafka/src/main/java/org/springframework/kafka/core/KafkaProducerException.java b/spring-kafka/src/main/java/org/springframework/kafka/core/KafkaProducerException.java index 4060a849..30a3d1a0 100644 --- a/spring-kafka/src/main/java/org/springframework/kafka/core/KafkaProducerException.java +++ b/spring-kafka/src/main/java/org/springframework/kafka/core/KafkaProducerException.java @@ -51,7 +51,7 @@ public class KafkaProducerException extends KafkaException { */ @SuppressWarnings("unchecked") public ProducerRecord getFailedProducerRecord() { - return (ProducerRecord) producerRecord; + return (ProducerRecord) this.producerRecord; } } diff --git a/src/checkstyle/checkstyle.xml b/src/checkstyle/checkstyle.xml index 39a78d8c..74d850ba 100644 --- a/src/checkstyle/checkstyle.xml +++ b/src/checkstyle/checkstyle.xml @@ -13,9 +13,7 @@ - - - + @@ -111,7 +109,7 @@ - +