Some dependencies upgrades (#1652)

* Some dependencies upgrades

* This PR is also for trying GH Actions in action

* * Fix `pr-build-workflow.yml` trailing whitespaces and indents
* Fix Checkstyle upgrade compatibility
* Fix Checkstyle violations in the code

* * Remove `.travis.yml`
* Fix `updateCopyrights` task to rely on the `GITHUB_ACTION` env var now
* Add `distributionSha256Sum` into `gradle-wrapper.properties` as it is recommended by GH Actions
This commit is contained in:
Artem Bilan
2020-12-04 16:22:28 -05:00
committed by GitHub
parent 84bad5cdcd
commit d77df70a69
6 changed files with 20 additions and 35 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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) })
}

View File

@@ -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

View File

@@ -51,7 +51,7 @@ public class KafkaProducerException extends KafkaException {
*/
@SuppressWarnings("unchecked")
public <K, V> ProducerRecord<K, V> getFailedProducerRecord() {
return (ProducerRecord<K, V>) producerRecord;
return (ProducerRecord<K, V>) this.producerRecord;
}
}

View File

@@ -13,9 +13,7 @@
<property name="headerFile" value="${config_loc}/checkstyle-header.txt"/>
<property name="fileExtensions" value="java"/>
</module>
<module name="NewlineAtEndOfFile">
<property name="lineSeparator" value="lf"/>
</module>
<module name="NewlineAtEndOfFile"/>
<!-- TreeWalker Checks -->
<module name="TreeWalker">
@@ -111,7 +109,7 @@
<property name="authorFormat" value=".+\s.+"/>
</module>
<module name="JavadocMethod">
<property name="allowMissingJavadoc" value="true"/>
<property name="scope" value="public"/>
</module>
<module name="JavadocVariable">
<property name="scope" value="public"/>