Skip to content

Commit 1e2d98f

Browse files
snazyrenovate-botCodingBangboo
authored
Dremio merge 2025 10 16 18 10 (apache#146)
* Update actions/stale digest to 65d1d48 (apache#2813) * Update dependency org.testcontainers:testcontainers-bom to v2 (apache#2814) * Site: Update community page / team (apache#2817) Update entries for Alex + Mike (committer --> PPMC member). * Site: fix typo of catalog federation configuration in command-line-interface.md (apache#2825) * Update docker.io/prom/prometheus Docker tag to v3.7.0 (apache#2820) * Update quay.io/keycloak/keycloak Docker tag to v26.4.1 (apache#2827) * Reproducible builds: ensure unix permissions are reproducible (apache#2819) Zip and tar files contain the unix file/directory permissions for the included zip/tar entries. The "default" values for those can differ depending on the platform those are built on. This change ensures `755` for directories and owner/group/other=read+write for files. The "executable" bit isn't forcefully set in case the archived file _is_ an executable. * Reproducible builds: use a fixed mtime for all entries in the source tarball (apache#2823) This change makes generated source-tarballs binary-comparable, so that locally built one (via `./gradlew sourceTarball`) should be exactly the same as a staged one. * NoSQL: adoptions * Last merged commit 0fdaa5a --------- Co-authored-by: Mend Renovate <bot@renovateapp.com> Co-authored-by: Nuoya Jiang <98131931+NuoyaJiang@users.noreply.github.com>
1 parent 290a5b2 commit 1e2d98f

File tree

12 files changed

+27
-14
lines changed

12 files changed

+27
-14
lines changed

.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
stale:
2323
runs-on: ubuntu-24.04
2424
steps:
25-
- uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008
25+
- uses: actions/stale@65d1d4804d3060875fff9f9fa8a49e27f71ce7f0
2626
with:
2727
days-before-close: 5
2828
days-before-stale: 30

build-logic/src/main/kotlin/polaris-reproducible.gradle.kts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,15 @@
2222
tasks.withType<AbstractArchiveTask>().configureEach {
2323
isPreserveFileTimestamps = false
2424
isReproducibleFileOrder = true
25+
26+
dirPermissions { unix("755") }
27+
filePermissions {
28+
// do not force the "execute" bit in case the file _is_ executable
29+
user.read = true
30+
user.write = true
31+
group.read = true
32+
group.write = false
33+
other.read = true
34+
other.write = false
35+
}
2536
}

build-logic/src/main/kotlin/publishing/rootProject.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ internal fun configureOnRootProject(project: Project) =
5555
"archive",
5656
"--prefix=${e.baseName.get()}/",
5757
"--format=tar.gz",
58+
// use a fixed mtime for reproducible tarballs, using the same timestamp as jars do
59+
"--mtime=1980-02-01 00:00:00",
5860
"--output=${e.sourceTarball.get().asFile.relativeTo(projectDir)}",
5961
"HEAD",
6062
)

getting-started/keycloak/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ services:
7979
/polaris/create-catalog.sh realm-mixed $$token
8080
8181
keycloak:
82-
image: quay.io/keycloak/keycloak:26.4.0
82+
image: quay.io/keycloak/keycloak:26.4.1
8383
ports:
8484
- "8080:8080"
8585
environment:

getting-started/telemetry/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ services:
6767
entrypoint: '/bin/sh -c "chmod +x /polaris/create-catalog.sh && /polaris/create-catalog.sh"'
6868

6969
prometheus:
70-
image: docker.io/prom/prometheus:v3.6.0
70+
image: docker.io/prom/prometheus:v3.7.0
7171
ports:
7272
- "9093:9090"
7373
depends_on:

gradle/libs.versions.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ jmh-generator-annprocess = { module = "org.openjdk.jmh:jmh-generator-annprocess"
8383
junit-bom = { module = "org.junit:junit-bom", version = "5.14.0" }
8484
junit-pioneer = { module = "org.junit-pioneer:junit-pioneer", version = "2.3.0" }
8585
keycloak-admin-client = { module = "org.keycloak:keycloak-admin-client", version = "26.0.7" }
86-
localstack = { module = "org.testcontainers:localstack", version = "1.21.3" }
8786
logback-classic = { module = "ch.qos.logback:logback-classic", version = "1.5.19" }
8887
micrometer-bom = { module = "io.micrometer:micrometer-bom", version = "1.15.5" }
8988
microprofile-fault-tolerance-api = { module = "org.eclipse.microprofile.fault-tolerance:microprofile-fault-tolerance-api", version = "4.1.2" }
@@ -109,7 +108,7 @@ smallrye-jandex = { module = "io.smallrye:jandex", version = "3.5.0" }
109108
spark35-sql-scala212 = { module = "org.apache.spark:spark-sql_2.12", version.ref = "spark35" }
110109
swagger-annotations = { module = "io.swagger:swagger-annotations", version.ref = "swagger" }
111110
swagger-jaxrs = { module = "io.swagger:swagger-jaxrs", version.ref = "swagger" }
112-
testcontainers-bom = { module = "org.testcontainers:testcontainers-bom", version = "1.21.3" }
111+
testcontainers-bom = { module = "org.testcontainers:testcontainers-bom", version = "2.0.0" }
113112
testcontainers-keycloak = { module = "com.github.dasniko:testcontainers-keycloak", version = "3.9.0" }
114113
threeten-extra = { module = "org.threeten:threeten-extra", version = "1.8.0" }
115114
weld-se-core = { module = "org.jboss.weld.se:weld-se-core", version = "6.0.3.Final" }

persistence/nosql/persistence/db/mongodb/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ dependencies {
5959

6060
testFixturesImplementation(project(":polaris-container-spec-helper"))
6161
testFixturesImplementation(platform(libs.testcontainers.bom))
62-
testFixturesImplementation("org.testcontainers:mongodb")
62+
testFixturesImplementation("org.testcontainers:testcontainers-mongodb")
6363
}
6464

6565
testing {
@@ -68,7 +68,7 @@ testing {
6868
registering(JvmTestSuite::class) {
6969
dependencies {
7070
runtimeOnly(platform(libs.testcontainers.bom))
71-
runtimeOnly("org.testcontainers:mongodb")
71+
runtimeOnly("org.testcontainers:testcontainers-mongodb")
7272
}
7373
}
7474
}

runtime/admin/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ dependencies {
6363
testFixturesApi(project(":polaris-container-spec-helper"))
6464
testFixturesApi(platform(libs.testcontainers.bom))
6565
testFixturesApi("org.testcontainers:testcontainers")
66-
testFixturesApi("org.testcontainers:postgresql")
66+
testFixturesApi("org.testcontainers:testcontainers-postgresql")
6767
testFixturesImplementation(testFixtures(project(":polaris-persistence-nosql-mongodb")))
6868

6969
testRuntimeOnly(project(":polaris-eclipselink"))

runtime/service/build.gradle.kts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,8 @@ dependencies {
138138

139139
testImplementation("io.rest-assured:rest-assured")
140140

141-
testImplementation(libs.localstack)
141+
testImplementation(platform(libs.testcontainers.bom))
142+
testImplementation("org.testcontainers:testcontainers-localstack")
142143

143144
testImplementation(project(":polaris-runtime-test-common"))
144145
testImplementation(project(":polaris-container-spec-helper"))
@@ -150,7 +151,7 @@ dependencies {
150151

151152
testImplementation(platform(libs.testcontainers.bom))
152153
testImplementation("org.testcontainers:testcontainers")
153-
testImplementation("org.testcontainers:postgresql")
154+
testImplementation("org.testcontainers:testcontainers-postgresql")
154155

155156
testImplementation(project(":polaris-persistence-nosql-api"))
156157
testImplementation(testFixtures(project(":polaris-persistence-nosql-api")))

runtime/test-common/build.gradle.kts

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

4141
implementation(platform(libs.testcontainers.bom))
4242
implementation("org.testcontainers:testcontainers")
43-
implementation("org.testcontainers:postgresql")
43+
implementation("org.testcontainers:testcontainers-postgresql")
4444

4545
implementation(libs.testcontainers.keycloak) {
4646
exclude(group = "org.keycloak", module = "keycloak-admin-client")

0 commit comments

Comments
 (0)