Skip to content

Commit 8fe39b1

Browse files
committed
chore(build): Bulk dependency versions upgrade
1 parent c0ce7c9 commit 8fe39b1

13 files changed

Lines changed: 58 additions & 54 deletions

File tree

.github/workflows/ci.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,10 @@ jobs:
7575
exit 1
7676
fi
7777
78+
- name: Gradle JReleaser Full Release Dry-Run
79+
run: |
80+
JRELEASER_DRY_RUN=true ./gradlew --scan jreleaserFullRelease
81+
7882
- name: Archive Test Results
7983
uses: actions/upload-artifact@v4
8084
if: always()

build-logic/src/main/kotlin/authmgr-jreleaser.gradle.kts

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -71,50 +71,50 @@ gradle.projectsEvaluated {
7171
filter { includes.set(listOf("session")) }
7272
run.set(
7373
"""
74-
echo "### {{command}}" >> ${'$'}GITHUB_STEP_SUMMARY
75-
echo "| Step | Outcome |" >> ${'$'}GITHUB_STEP_SUMMARY
76-
echo "| ---- | ------- |" >> ${'$'}GITHUB_STEP_SUMMARY
77-
"""
74+
echo "### {{command}}" >> ${'$'}GITHUB_STEP_SUMMARY
75+
echo "| Step | Outcome |" >> ${'$'}GITHUB_STEP_SUMMARY
76+
echo "| ---- | ------- |" >> ${'$'}GITHUB_STEP_SUMMARY
77+
"""
7878
.trimIndent()
7979
)
8080
}
8181
success {
8282
filter { excludes.set(listOf("session")) }
8383
run.set(
8484
"""
85-
echo "| {{event.name}} | :white_check_mark: |" >> ${'$'}GITHUB_STEP_SUMMARY
86-
"""
85+
echo "| {{event.name}} | :white_check_mark: |" >> ${'$'}GITHUB_STEP_SUMMARY
86+
"""
8787
.trimIndent()
8888
)
8989
}
9090
success {
9191
filter { includes.set(listOf("session")) }
9292
run.set(
9393
"""
94-
echo "" >> ${'$'}GITHUB_STEP_SUMMARY
95-
"""
94+
echo "" >> ${'$'}GITHUB_STEP_SUMMARY
95+
"""
9696
.trimIndent()
9797
)
9898
}
9999
failure {
100100
filter { excludes.set(listOf("session")) }
101101
run.set(
102102
"""
103-
echo "| {{event.name}} | :x: |" >> ${'$'}GITHUB_STEP_SUMMARY
104-
"""
103+
echo "| {{event.name}} | :x: |" >> ${'$'}GITHUB_STEP_SUMMARY
104+
"""
105105
.trimIndent()
106106
)
107107
}
108108
failure {
109109
filter { includes.set(listOf("session")) }
110110
run.set(
111111
"""
112-
echo "" >> ${'$'}GITHUB_STEP_SUMMARY
113-
echo "### Failure" >> ${'$'}GITHUB_STEP_SUMMARY
114-
echo "\`\`\`" >> ${'$'}GITHUB_STEP_SUMMARY
115-
echo "{{event.stacktrace}}\`\`\`" >> ${'$'}GITHUB_STEP_SUMMARY
116-
echo "" >> ${'$'}GITHUB_STEP_SUMMARY
117-
"""
112+
echo "" >> ${'$'}GITHUB_STEP_SUMMARY
113+
echo "### Failure" >> ${'$'}GITHUB_STEP_SUMMARY
114+
echo "\`\`\`" >> ${'$'}GITHUB_STEP_SUMMARY
115+
echo "{{event.stacktrace}}\`\`\`" >> ${'$'}GITHUB_STEP_SUMMARY
116+
echo "" >> ${'$'}GITHUB_STEP_SUMMARY
117+
"""
118118
.trimIndent()
119119
)
120120
}
@@ -151,18 +151,18 @@ gradle.projectsEvaluated {
151151
categoryTitleFormat.set("### {{categoryTitle}}")
152152
content.set(
153153
"""
154-
## Try It Out
155-
156-
{{projectNameCapitalized}} is available as a Maven artifact from [Maven Central](https://central.sonatype.com/namespace/com.dremio.iceberg.authmgr).
157-
You can also download the latest version from the [GitHub Releases page]({{repoUrl}}/releases).
158-
159-
## Highlights
160-
161-
The full changelog can be found [here]({{repoUrl}}/compare/{{previousTagName}}...{{tagName}}).
162-
163-
{{changelogChanges}}
164-
{{changelogContributors}}
165-
"""
154+
## Try It Out
155+
156+
{{projectNameCapitalized}} is available as a Maven artifact from [Maven Central](https://central.sonatype.com/namespace/com.dremio.iceberg.authmgr).
157+
You can also download the latest version from the [GitHub Releases page]({{repoUrl}}/releases).
158+
159+
## Highlights
160+
161+
The full changelog can be found [here]({{repoUrl}}/compare/{{previousTagName}}...{{tagName}}).
162+
163+
{{changelogChanges}}
164+
{{changelogContributors}}
165+
"""
166166
.trimIndent()
167167
)
168168
contributors {

gradle/libs.versions.toml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818
#
1919

2020
[versions]
21-
errorprone = "2.41.0"
21+
errorprone = "2.43.0"
2222
hadoop = "3.4.1"
2323
iceberg = "1.10.0" # When updating iceberg version, also update the iceberg test versions in gradle.properties
24-
immutables = "2.11.3"
25-
mockito = "5.19.0"
24+
immutables = "2.11.6"
25+
mockito = "5.20.0"
2626
mockserver = "5.15.0"
27-
nimbus-oauth2 = "11.28"
27+
nimbus-oauth2 = "11.30"
2828
nimbus-jose-jwt = "10.5"
2929
slf4j = "2.0.17"
3030

@@ -36,37 +36,37 @@ slf4j = "2.0.17"
3636
# If a dependency is removed, check whether the LICENSE and/or NOTICE files need to be adapted
3737
# (aka mention of the dependency removed).
3838
#
39-
assertj-core = { module = "org.assertj:assertj-core", version = "3.27.4" }
39+
assertj-core = { module = "org.assertj:assertj-core", version = "3.27.6" }
4040
awaitility = { module = "org.awaitility:awaitility", version = "4.3.0" }
41-
bouncycastle-bcpkix = { module = "org.bouncycastle:bcpkix-jdk18on", version = "1.81" }
42-
caffeine = { module = "com.github.ben-manes.caffeine:caffeine", version = "3.2.2" }
41+
bouncycastle-bcpkix = { module = "org.bouncycastle:bcpkix-jdk18on", version = "1.82" }
42+
caffeine = { module = "com.github.ben-manes.caffeine:caffeine", version = "3.2.3" }
4343
errorprone = { module = "com.google.errorprone:error_prone_core", version.ref = "errorprone" }
4444
errorprone-annotations = { module = "com.google.errorprone:error_prone_annotations", version.ref = "errorprone" }
45-
guava = { module = "com.google.guava:guava", version = "33.4.8-jre" }
45+
guava = { module = "com.google.guava:guava", version = "33.5.0-jre" }
4646
hadoop-common = { module = "org.apache.hadoop:hadoop-common", version.ref = "hadoop" }
4747
hadoop-hdfs-client = { module = "org.apache.hadoop:hadoop-hdfs-client", version.ref = "hadoop" }
4848
hadoop-mapreduce-client-core = { module = "org.apache.hadoop:hadoop-mapreduce-client-core", version.ref = "hadoop" }
49-
httpclient5 = { module = "org.apache.httpcomponents.client5:httpclient5", version = "5.5" }
49+
httpclient5 = { module = "org.apache.httpcomponents.client5:httpclient5", version = "5.5.1" }
5050
immutables-builder = { module = "org.immutables:builder", version.ref = "immutables" }
5151
immutables-value-annotations = { module = "org.immutables:value-annotations", version.ref = "immutables" }
5252
immutables-value-processor = { module = "org.immutables:value-processor", version.ref = "immutables" }
5353
iceberg-bom = { module = "org.apache.iceberg:iceberg-bom", version.ref = "iceberg" }
5454
jakarta-annotation-api = { module = "jakarta.annotation:jakarta.annotation-api", version = "3.0.0" }
55-
junit-bom = { module = "org.junit:junit-bom", version = "5.13.4" }
55+
junit-bom = { module = "org.junit:junit-bom", version = "6.0.0" }
5656
junit-pioneer = { module = "org.junit-pioneer:junit-pioneer", version = "2.3.0" }
57-
keycloak-admin-client = { module = "org.keycloak:keycloak-admin-client", version = "26.0.6" }
58-
logback-classic = { module = "ch.qos.logback:logback-classic", version = "1.5.18" }
57+
keycloak-admin-client = { module = "org.keycloak:keycloak-admin-client", version = "26.0.7" }
58+
logback-classic = { module = "ch.qos.logback:logback-classic", version = "1.5.20" }
5959
mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito" }
6060
mockito-junit-jupiter = { module = "org.mockito:mockito-junit-jupiter", version.ref = "mockito" }
6161
mockserver-client-java = { module = "org.mock-server:mockserver-client-java", version.ref = "mockserver" }
6262
mockserver-netty = { module = "org.mock-server:mockserver-netty", version.ref = "mockserver" }
6363
nimbus-oauth2-oidc-sdk = { module = "com.nimbusds:oauth2-oidc-sdk", version.ref = "nimbus-oauth2" }
6464
nimbus-jose-jwt = { module = "com.nimbusds:nimbus-jose-jwt", version.ref = "nimbus-jose-jwt" }
65-
s3mock-testcontainers = { module = "com.adobe.testing:s3mock-testcontainers", version = "4.8.0" }
65+
s3mock-testcontainers = { module = "com.adobe.testing:s3mock-testcontainers", version = "4.9.1" }
6666
slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
67-
smallrye-config = { module = "io.smallrye.config:smallrye-config", version = "3.13.4" }
68-
testcontainers-bom = { module = "org.testcontainers:testcontainers-bom", version = "1.21.3" }
69-
testcontainers-keycloak = { module = "com.github.dasniko:testcontainers-keycloak", version = "3.8.0" }
67+
smallrye-config = { module = "io.smallrye.config:smallrye-config", version = "3.14.1" }
68+
testcontainers-bom = { module = "org.testcontainers:testcontainers-bom", version = "2.0.1" }
69+
testcontainers-keycloak = { module = "com.github.dasniko:testcontainers-keycloak", version = "3.9.0" }
7070

7171
[plugins]
7272
rat = { id = "org.nosphere.apache.rat", version = "0.8.1" }

oauth2/core/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ dependencies {
8181

8282
testFixturesApi(platform(libs.testcontainers.bom))
8383
testFixturesApi("org.testcontainers:testcontainers")
84-
testFixturesApi("org.testcontainers:junit-jupiter")
84+
testFixturesApi("org.testcontainers:testcontainers-junit-jupiter")
8585
testFixturesApi(libs.keycloak.admin.client)
8686
testFixturesApi(libs.testcontainers.keycloak)
8787

oauth2/flink-tests/src/intTest/java/com/dremio/iceberg/authmgr/oauth2/test/flink/FlinkITBase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ void setup() {
6969

7070
@SuppressWarnings("resource")
7171
protected S3MockContainer createS3Container(Network network) {
72-
return new S3MockContainer("4.8.0")
72+
return new S3MockContainer("4.9.1")
7373
.withNetwork(network)
7474
.withNetworkAliases("s3")
7575
.withInitialBuckets("test-bucket");

oauth2/kafka-tests/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ dependencies {
6161

6262
intTestBase(platform(libs.testcontainers.bom))
6363
intTestBase("org.testcontainers:testcontainers")
64-
intTestBase("org.testcontainers:kafka")
64+
intTestBase("org.testcontainers:testcontainers-kafka")
6565
intTestBase(libs.s3mock.testcontainers)
6666

6767
intTestBase(platform(libs.junit.bom))

oauth2/kafka-tests/src/intTest/java/com/dremio/iceberg/authmgr/oauth2/test/kafka/KafkaKeycloakIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ public boolean matches(String str) {
192192

193193
@SuppressWarnings("resource")
194194
private S3MockContainer createS3Container() {
195-
return new S3MockContainer("4.8.0")
195+
return new S3MockContainer("4.9.1")
196196
.withNetwork(network)
197197
.withNetworkAliases("s3")
198198
.withInitialBuckets("test-bucket");

oauth2/spark-tests/src/intTest/java/com/dremio/iceberg/authmgr/oauth2/test/spark/SparkITBase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ void setup(@TempDir Path tempDir) {
8181

8282
@SuppressWarnings("resource")
8383
protected S3MockContainer createS3Container(Network network) {
84-
return new S3MockContainer("4.8.0")
84+
return new S3MockContainer("4.9.1")
8585
.withNetwork(network)
8686
.withNetworkAliases("s3")
8787
.withInitialBuckets("test-bucket");

oauth2/tests/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ description = "Test Utilities for Dremio AuthManager for Apache Iceberg"
2121
dependencies {
2222
api(platform(libs.testcontainers.bom))
2323
api("org.testcontainers:testcontainers")
24-
api("org.testcontainers:junit-jupiter")
24+
api("org.testcontainers:testcontainers-junit-jupiter")
2525
api(libs.testcontainers.keycloak)
2626

2727
implementation(libs.keycloak.admin.client)

oauth2/tests/src/main/java/com/dremio/iceberg/authmgr/oauth2/test/container/AutheliaContainer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class AutheliaContainer extends GenericContainer<AutheliaContainer> {
2929
@SuppressWarnings("resource")
3030
public AutheliaContainer(
3131
String privateKeyClasspathResource, String certificateClasspathResource) {
32-
super("authelia/authelia:4.39.10");
32+
super("authelia/authelia:4.39.13");
3333
withExposedPorts(9091);
3434
withEnv("X_AUTHELIA_CONFIG_FILTERS", "template");
3535
withEnv("AUTHMGR_LOG_LEVEL", getLogLevel());

0 commit comments

Comments
 (0)