Skip to content

Commit d77df70

Browse files
authored
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
1 parent 84bad5c commit d77df70

File tree

6 files changed

+20
-35
lines changed

6 files changed

+20
-35
lines changed

.github/workflows/pr-build-workflow.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ jobs:
1212
runs-on: ubuntu-latest
1313

1414
steps:
15-
- uses: actions/checkout@v2
16-
- name: Set up JDK 11
17-
uses: actions/setup-java@v1
18-
with:
19-
java-version: 11
20-
21-
- name: Run Gradle
22-
uses: burrunan/gradle-cache-action@v1
23-
env:
24-
GRADLE_ENTERPRISE_URL: https://ge.spring.io/
25-
with:
26-
arguments: check
15+
- uses: actions/checkout@v2
16+
- name: Set up JDK 11
17+
uses: actions/setup-java@v1
18+
with:
19+
java-version: 11
20+
21+
- name: Run Gradle
22+
uses: burrunan/gradle-cache-action@v1
23+
env:
24+
GRADLE_ENTERPRISE_URL: https://ge.spring.io/
25+
with:
26+
arguments: check

.travis.yml

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

build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ ext {
4141
linkScmUrl = 'https://github.com/spring-projects/spring-kafka'
4242
linkScmConnection = 'https://github.com/spring-projects/spring-kafka.git'
4343
linkScmDevConnection = '[email protected]:spring-projects/spring-kafka.git'
44-
docResourcesVersion = '0.2.1.RELEASE'
44+
docResourcesVersion = '0.2.4'
4545

4646

4747
if (gitPresent) {
@@ -149,7 +149,7 @@ subprojects { subproject ->
149149
eclipse.project.natures += 'org.springframework.ide.eclipse.core.springnature'
150150

151151
jacoco {
152-
toolVersion = '0.8.5'
152+
toolVersion = '0.8.6'
153153
}
154154

155155
// dependencies that are common across all java projects
@@ -185,7 +185,7 @@ subprojects { subproject ->
185185

186186
checkstyle {
187187
configDirectory.set(rootProject.file("src/checkstyle"))
188-
toolVersion = '8.24'
188+
toolVersion = '8.38'
189189
}
190190

191191
jacocoTestReport {
@@ -220,7 +220,7 @@ subprojects { subproject ->
220220
}
221221

222222
task updateCopyrights {
223-
onlyIf { gitPresent && !System.getenv('TRAVIS') && !System.getenv('bamboo_buildKey') }
223+
onlyIf { gitPresent && !System.getenv('GITHUB_ACTION') && !System.getenv('bamboo_buildKey') }
224224
if (gitPresent) {
225225
inputs.files(modifiedFiles.filter { f -> f.path.contains(subproject.name) })
226226
}

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ distributionPath=wrapper/dists
33
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6+
distributionSha256Sum=3239b5ed86c3838a37d983ac100573f64c1f3fd8e1eb6c89fa5f9529b5ec091d

spring-kafka/src/main/java/org/springframework/kafka/core/KafkaProducerException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public KafkaProducerException(ProducerRecord<?, ?> failedProducerRecord, String
5151
*/
5252
@SuppressWarnings("unchecked")
5353
public <K, V> ProducerRecord<K, V> getFailedProducerRecord() {
54-
return (ProducerRecord<K, V>) producerRecord;
54+
return (ProducerRecord<K, V>) this.producerRecord;
5555
}
5656

5757
}

src/checkstyle/checkstyle.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@
1313
<property name="headerFile" value="${config_loc}/checkstyle-header.txt"/>
1414
<property name="fileExtensions" value="java"/>
1515
</module>
16-
<module name="NewlineAtEndOfFile">
17-
<property name="lineSeparator" value="lf"/>
18-
</module>
16+
<module name="NewlineAtEndOfFile"/>
1917

2018
<!-- TreeWalker Checks -->
2119
<module name="TreeWalker">
@@ -111,7 +109,7 @@
111109
<property name="authorFormat" value=".+\s.+"/>
112110
</module>
113111
<module name="JavadocMethod">
114-
<property name="allowMissingJavadoc" value="true"/>
112+
<property name="scope" value="public"/>
115113
</module>
116114
<module name="JavadocVariable">
117115
<property name="scope" value="public"/>

0 commit comments

Comments
 (0)