Skip to content

Commit e1b1579

Browse files
big-andy-coatesbig-andy-coates
authored
Merge branch 'main' into dependabot/gradle/io.github.gradle-nexus-publish-plugin-v2.0.0
2 parents 32159d3 + d9917b6 commit e1b1579

File tree

65 files changed

+132
-91
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+132
-91
lines changed

‎.github/workflows/build.yml‎

Lines changed: 34 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,32 @@ jobs:
3434
if: (!startsWith(github.ref, 'refs/tags/'))
3535
run: git fetch --tag --unshallow
3636
- name: Set up JDK
37-
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
37+
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
3838
with:
3939
java-version: '17'
4040
distribution: 'adopt'
4141
- name: Setup Gradle
42-
uses: gradle/gradle-build-action@ac2d340dc04d9e1113182899e983b5400c17cda1 # v3.5.0
42+
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
4343
with:
4444
gradle-home-cache-cleanup: true
4545
- name: Build
4646
env:
4747
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
48-
run: ./gradlew build coveralls --stacktrace
48+
run: ./gradlew build coveralls
49+
- name: Upload Reports
50+
if: failure()
51+
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
52+
with:
53+
name: reports-linux
54+
path: '**/build/reports/**/*.xml'
55+
retention-days: 5
56+
- name: Upload Test Results
57+
if: failure()
58+
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
59+
with:
60+
name: test-results-linux
61+
path: '**/build/test-results/**/*.xml'
62+
retention-days: 5
4963
- name: Publish
5064
if: github.event_name == 'push' || github.event.inputs.publish_artifacts == 'true'
5165
env:
@@ -67,23 +81,37 @@ jobs:
6781
run: |
6882
./gradlew -Dgradle.publish.key="$GRADLE_PUBLISH_KEY" -Dgradle.publish.secret="$GRADLE_PUBLISH_SECRET" publishPlugins
6983
70-
# Until Creek fully supports Windows, minimal check:
84+
# Until Creek fully supports Windows, minimal check:
7185
build_windows:
7286
runs-on: windows-latest
7387
steps:
7488
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
7589
- uses: gradle/wrapper-validation-action@f9c9c575b8b21b6485636a91ffecd10e558c62f6 # v3.5.0
7690
- name: Set up JDK
77-
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
91+
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
7892
with:
7993
java-version: '17'
8094
distribution: 'adopt'
8195
- name: Setup Gradle
82-
uses: gradle/gradle-build-action@ac2d340dc04d9e1113182899e983b5400c17cda1 # v3.5.0
96+
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
8397
with:
8498
gradle-home-cache-cleanup: true
8599
- name: Build
86100
run: ./gradlew.bat build -PexcludeContainerised
101+
- name: Upload Reports
102+
if: failure()
103+
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
104+
with:
105+
name: reports-win
106+
path: '**/build/reports/**/*.xml'
107+
retention-days: 5
108+
- name: Upload Test Results
109+
if: failure()
110+
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
111+
with:
112+
name: test-results-win
113+
path: '**/build/test-results/**/*.xml'
114+
retention-days: 5
87115

88116
create-gh-release:
89117
if: startsWith(github.ref, 'refs/tags/') && !endsWith(github.ref, '-alpha')

‎.github/workflows/gh-pages.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,20 @@ jobs:
2424
steps:
2525
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2626
- name: Set up JDK
27-
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
27+
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
2828
with:
2929
java-version: '17'
3030
distribution: 'adopt'
3131
- name: Setup Gradle
32-
uses: gradle/gradle-build-action@ac2d340dc04d9e1113182899e983b5400c17cda1 # v3.5.0
32+
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
3333
with:
3434
gradle-home-cache-cleanup: true
3535
- name: Extract implementation info
3636
run: ./gradlew --quiet extractImplementations
3737
- name: Add results to step summary
3838
run: cat docs/_includes/implementations.json >> $GITHUB_STEP_SUMMARY
3939
- name: Upload Implementations
40-
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
40+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
4141
with:
4242
name: implementations
4343
path: docs/_includes/*
@@ -47,12 +47,12 @@ jobs:
4747
steps:
4848
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4949
- name: Set up JDK
50-
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
50+
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
5151
with:
5252
java-version: '17'
5353
distribution: 'adopt'
5454
- name: Setup Gradle
55-
uses: gradle/gradle-build-action@ac2d340dc04d9e1113182899e983b5400c17cda1 # v3.5.0
55+
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
5656
with:
5757
gradle-home-cache-cleanup: true
5858
- name: Run functional tests
@@ -64,7 +64,7 @@ jobs:
6464
echo "# Specific Draft & Implementation results" >> $GITHUB_STEP_SUMMARY
6565
cat docs/_includes/per-draft.md >> $GITHUB_STEP_SUMMARY
6666
- name: Upload Implementations
67-
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
67+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
6868
with:
6969
name: functional
7070
path: docs/_includes/*
@@ -74,12 +74,12 @@ jobs:
7474
steps:
7575
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
7676
- name: Set up JDK
77-
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
77+
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
7878
with:
7979
java-version: '17'
8080
distribution: 'adopt'
8181
- name: Setup Gradle
82-
uses: gradle/gradle-build-action@ac2d340dc04d9e1113182899e983b5400c17cda1 # v3.5.0
82+
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
8383
with:
8484
gradle-home-cache-cleanup: true
8585
- if: github.event_name == 'pull_request'
@@ -93,7 +93,7 @@ jobs:
9393
echo "# Json Validator Benchmark Results" >> $GITHUB_STEP_SUMMARY
9494
cat docs/_includes/JsonValidateBenchmark.md >> $GITHUB_STEP_SUMMARY
9595
- name: Upload Implementations
96-
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
96+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
9797
with:
9898
name: validateBenchmark
9999
path: docs/_includes/*
@@ -103,12 +103,12 @@ jobs:
103103
steps:
104104
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
105105
- name: Set up JDK
106-
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
106+
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
107107
with:
108108
java-version: '17'
109109
distribution: 'adopt'
110110
- name: Setup Gradle
111-
uses: gradle/gradle-build-action@ac2d340dc04d9e1113182899e983b5400c17cda1 # v3.5.0
111+
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
112112
with:
113113
gradle-home-cache-cleanup: true
114114
- if: github.event_name == 'pull_request'
@@ -122,7 +122,7 @@ jobs:
122122
echo "# Json Serde Benchmark Results" >> $GITHUB_STEP_SUMMARY
123123
cat docs/_includes/JsonSerdeBenchmark.md >> $GITHUB_STEP_SUMMARY
124124
- name: Upload Implementations
125-
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
125+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
126126
with:
127127
name: serdeBenchmark
128128
path: docs/_includes/*

‎build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023 Creek Contributors (https://github.com/creek-service)
2+
* Copyright 2023-2025 Creek Contributors (https://github.com/creek-service)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -37,7 +37,7 @@ val junitPioneerVersion = "2.3.0"
3737
val mockitoVersion = "5.18.0"
3838
val jmhVersion = "1.37"
3939
val confluentVersion = "8.0.0"
40-
val vertxVersion = "5.0.1"
40+
val vertxVersion = "5.0.2"
4141

4242
dependencies {
4343
implementation("org.openjdk.jmh:jmh-core:$jmhVersion")
@@ -53,7 +53,7 @@ dependencies {
5353

5454
implementation("com.github.erosb:everit-json-schema:1.14.6")
5555

56-
implementation("com.github.erosb:json-sKema:0.23.0")
56+
implementation("com.github.erosb:json-sKema:0.24.0")
5757

5858
implementation("io.confluent:kafka-streams-json-schema-serde:$confluentVersion")
5959
implementation("io.confluent:kafka-schema-registry-client:$confluentVersion")

‎buildSrc/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023 Creek Contributors (https://github.com/creek-service)
2+
* Copyright 2023-2025 Creek Contributors (https://github.com/creek-service)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎buildSrc/settings.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023 Creek Contributors (https://github.com/creek-service)
2+
* Copyright 2023-2025 Creek Contributors (https://github.com/creek-service)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎buildSrc/src/main/kotlin/creek-common-convention.gradle.kts‎

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2022-2023 Creek Contributors (https://github.com/creek-service)
2+
* Copyright 2022-2025 Creek Contributors (https://github.com/creek-service)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
2020
* <p>Apply to all java modules, usually excluding the root project in multi-module sets.
2121
*
2222
* <p>Versions:
23+
* - 1.12: XML reporting for spotbugs
2324
* - 1.11: Add explicit checkstyle tool version
2425
* - 1.10: Add ability to exclude containerised tests
2526
* - 1.9: Add `allDeps` task.
@@ -59,7 +60,7 @@ repositories {
5960

6061
dependencies {
6162
spotbugsPlugins("com.h3xstream.findsecbugs:findsecbugs-plugin:1.12.0")
62-
checkstyle("com.puppycrawl.tools:checkstyle:10.12.5")
63+
checkstyle("com.puppycrawl.tools:checkstyle:10.17.0")
6364
}
6465

6566
configurations.all {
@@ -107,15 +108,27 @@ spotbugs {
107108
excludeFilter.set(rootProject.file("config/spotbugs/suppressions.xml"))
108109

109110
tasks.spotbugsMain {
110-
reports.create("html") {
111-
required.set(true)
112-
setStylesheet("fancy-hist.xsl")
111+
reports {
112+
create("html") {
113+
required.set(true)
114+
setStylesheet("fancy-hist.xsl")
115+
}
116+
117+
create("xml") {
118+
required.set(true)
119+
}
113120
}
114121
}
115122
tasks.spotbugsTest {
116-
reports.create("html") {
117-
required.set(true)
118-
setStylesheet("fancy-hist.xsl")
123+
reports {
124+
create("html") {
125+
required.set(true)
126+
setStylesheet("fancy-hist.xsl")
127+
}
128+
129+
create("xml") {
130+
required.set(true)
131+
}
119132
}
120133
}
121134
}

‎buildSrc/src/main/kotlin/creek-coverage-convention.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2022-2023 Creek Contributors (https://github.com/creek-service)
2+
* Copyright 2022-2025 Creek Contributors (https://github.com/creek-service)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎buildSrc/src/main/kotlin/creek-module-convention.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2022-2023 Creek Contributors (https://github.com/creek-service)
2+
* Copyright 2022-2025 Creek Contributors (https://github.com/creek-service)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎buildSrc/src/main/kotlin/creek-plugin-publishing-convention.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2022-2023 Creek Contributors (https://github.com/creek-service)
2+
* Copyright 2022-2025 Creek Contributors (https://github.com/creek-service)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎buildSrc/src/main/kotlin/creek-publishing-convention.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2022-2023 Creek Contributors (https://github.com/creek-service)
2+
* Copyright 2022-2025 Creek Contributors (https://github.com/creek-service)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)