Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Auto-update dependencies and plugins #319

Merged
merged 2 commits into from
Jan 8, 2025
Merged

Auto-update dependencies and plugins #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a939d5
Auto-update dependencies and plugins
mellbot[bot] Nov 9, 2024
e713028
Update AuthTokens.java
markelliot Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion barista/src/main/java/com/markelliot/barista/authz/AuthTokens.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import java.util.regex.Pattern;

public final class AuthTokens {
private static final Pattern BEARER = Pattern.compile("Bearer\s+");
private static final Pattern BEARER = Pattern.compile("Bearer\\s+");

private AuthTokens() {}

Expand Down
12 changes: 5 additions & 7 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ import net.ltgt.gradle.errorprone.errorprone

plugins {
idea
id("com.diffplug.spotless") version "7.0.0.BETA1"
id("com.google.cloud.tools.jib") version "3.4.3" apply false
id("com.palantir.consistent-versions") version "2.23.0"
id("com.diffplug.spotless") version "7.0.0.BETA4"
id("com.google.cloud.tools.jib") version "3.4.4" apply false
id("com.palantir.consistent-versions") version "2.29.0"
id("com.markelliot.versions") version "0.43.0"
id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
id("net.ltgt.errorprone") version "4.0.1" apply false
id("net.ltgt.errorprone") version "4.1.0" apply false
id("org.inferred.processors") version "3.7.0" apply false
}

Expand Down Expand Up @@ -95,9 +95,7 @@ allprojects {
tasks.register("format").get().dependsOn("spotlessApply")
}

fun booleanEnv(envVar: String): Boolean? {
return System.getenv(envVar)?.toBoolean()
}
fun booleanEnv(envVar: String): Boolean? = System.getenv(envVar)?.toBoolean()

fun String.runCommand(): String {
val proc =
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
69 changes: 35 additions & 34 deletions versions.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,34 @@
# Run ./gradlew writeVersionsLocks to regenerate this file
com.auth0:java-jwt:4.4.0 (1 constraints: 0a050b36)
com.fasterxml.jackson:jackson-bom:2.17.2 (10 constraints: 9ed8daab)
com.fasterxml.jackson.core:jackson-annotations:2.17.2 (7 constraints: a57be96e)
com.fasterxml.jackson.core:jackson-core:2.17.2 (12 constraints: 6e067367)
com.fasterxml.jackson.core:jackson-databind:2.17.2 (16 constraints: 0c3c8909)
com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.17.2 (2 constraints: 3c2b9888)
com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.17.2 (2 constraints: 3c2b9888)
com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.17.2 (2 constraints: f9134583)
com.fasterxml.jackson.datatype:jackson-datatype-guava:2.17.2 (3 constraints: 7930e03d)
com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.17.2 (3 constraints: 7930e03d)
com.fasterxml.jackson.datatype:jackson-datatype-joda:2.17.2 (2 constraints: 3c2b9888)
com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.2 (3 constraints: 7930e03d)
com.fasterxml.jackson:jackson-bom:2.18.1 (10 constraints: 9ed8eeab)
com.fasterxml.jackson.core:jackson-annotations:2.18.1 (7 constraints: a57bf76e)
com.fasterxml.jackson.core:jackson-core:2.18.1 (12 constraints: 6e069167)
com.fasterxml.jackson.core:jackson-databind:2.18.1 (16 constraints: 0d3c710a)
com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.18.1 (2 constraints: 3c2b9a88)
com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.18.1 (2 constraints: 3c2b9a88)
com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.18.1 (2 constraints: f9134983)
com.fasterxml.jackson.datatype:jackson-datatype-guava:2.18.1 (3 constraints: 7930e43d)
com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.18.1 (3 constraints: 7930e43d)
com.fasterxml.jackson.datatype:jackson-datatype-joda:2.18.1 (2 constraints: 3c2b9a88)
com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.1 (3 constraints: 7930e43d)
com.github.ben-manes.caffeine:caffeine:3.1.8 (1 constraints: 0e050536)
com.google.auto:auto-common:1.2.1 (1 constraints: 9d0f6d86)
com.google.auto.service:auto-service:1.1.1 (1 constraints: 0505f435)
com.google.auto.service:auto-service-annotations:1.1.1 (1 constraints: 9c0f6a86)
com.google.code.findbugs:jsr305:3.0.2 (7 constraints: e07d3d0c)
com.google.errorprone:error_prone_annotations:2.26.1 (13 constraints: f9dd4f81)
com.google.googlejavaformat:google-java-format:1.22.0 (1 constraints: 3705333b)
com.google.errorprone:error_prone_annotations:2.28.0 (13 constraints: fadd8183)
com.google.googlejavaformat:google-java-format:1.24.0 (1 constraints: 3905393b)
com.google.guava:failureaccess:1.0.2 (1 constraints: 150ae2b4)
com.google.guava:guava:33.2.1-jre (12 constraints: eedfaf44)
com.google.guava:guava:33.3.1-jre (12 constraints: f6df874c)
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (1 constraints: bd17c918)
com.google.j2objc:j2objc-annotations:3.0.0 (1 constraints: 150aeab4)
com.jakewharton.nopen:nopen-annotations:1.0.1 (3 constraints: 7d256836)
com.markelliot.barista.tracing:barista-tracing:0.74.0 (1 constraints: 3d05473b)
com.markelliot.result:result:0.75.0 (1 constraints: 3e054a3b)
com.palantir.conjure.java:conjure-java-undertow-runtime:8.23.0 (1 constraints: 3f05603b)
com.palantir.conjure.java:conjure-lib:8.23.0 (2 constraints: 2f2b0fb8)
com.palantir.conjure.java:conjure-undertow-lib:8.23.0 (1 constraints: 66177e37)
com.palantir.conjure.java.api:errors:2.53.0 (2 constraints: 8427522c)
com.palantir.conjure.java:conjure-java-undertow-runtime:8.30.0 (1 constraints: 3d055b3b)
com.palantir.conjure.java:conjure-lib:8.30.0 (2 constraints: 2b2b95b7)
com.palantir.conjure.java:conjure-undertow-lib:8.30.0 (1 constraints: 64177937)
com.palantir.conjure.java.api:errors:2.54.0 (2 constraints: 8627872c)
com.palantir.conjure.java.runtime:conjure-java-jackson-optimizations:8.9.0 (1 constraints: 571c4b88)
com.palantir.conjure.java.runtime:conjure-java-jackson-serialization:8.9.0 (1 constraints: 3a172520)
com.palantir.ri:resource-identifier:2.7.0 (3 constraints: b73a759b)
Expand All @@ -40,36 +41,36 @@ com.palantir.tokens:auth-tokens:3.18.0 (3 constraints: 503be434)
com.palantir.tracing:tracing:6.18.0 (2 constraints: e3276432)
com.palantir.tracing:tracing-api:6.18.0 (3 constraints: b934811d)
com.palantir.tracing:tracing-undertow:6.18.0 (1 constraints: 68177d37)
com.palantir.tritium:tritium-ids:0.88.0 (1 constraints: d30fb896)
com.palantir.tritium:tritium-ids:0.95.0 (1 constraints: d10fb396)
com.palantir.tritium:tritium-registry:0.88.0 (1 constraints: 861cb8a4)
com.squareup:javapoet:1.13.0 (1 constraints: 3705323b)
io.dropwizard.metrics:metrics-core:4.2.25 (2 constraints: 492d3297)
io.undertow:undertow-core:2.3.15.Final (4 constraints: 3e49db6f)
joda-time:joda-time:2.10.14 (1 constraints: 5b160f08)
org.apache.logging.log4j:log4j-api:2.23.1 (3 constraints: 1c2e0d3c)
org.apache.logging.log4j:log4j-core:2.23.1 (2 constraints: 3f16373a)
org.apache.logging.log4j:log4j-jul:2.23.1 (1 constraints: 3a053d3b)
org.apache.logging.log4j:log4j-slf4j2-impl:2.23.1 (1 constraints: 3a053d3b)
org.checkerframework:checker-qual:3.42.0 (3 constraints: de31a866)
io.undertow:undertow-core:2.3.18.Final (4 constraints: 4949f874)
joda-time:joda-time:2.12.7 (1 constraints: 2f16b1f1)
org.apache.logging.log4j:log4j-api:2.24.1 (3 constraints: 1f2eaa3c)
org.apache.logging.log4j:log4j-core:2.24.1 (2 constraints: 4116713a)
org.apache.logging.log4j:log4j-jul:2.24.1 (1 constraints: 3b05403b)
org.apache.logging.log4j:log4j-slf4j2-impl:2.24.1 (1 constraints: 3b05403b)
org.checkerframework:checker-qual:3.43.0 (3 constraints: e031ef66)
org.eclipse.collections:eclipse-collections:11.1.0 (1 constraints: 1b108aa9)
org.eclipse.collections:eclipse-collections-api:11.1.0 (2 constraints: f8229c26)
org.immutables:value:2.10.1 (1 constraints: c70f9196)
org.jboss.logging:jboss-logging:3.4.3.Final (3 constraints: f2300ed8)
org.jboss.threads:jboss-threads:3.5.0.Final (2 constraints: 5a1a5743)
org.jboss.xnio:xnio-api:3.8.16.Final (3 constraints: 29344b10)
org.jboss.xnio:xnio-api:3.8.16.Final (3 constraints: 5934d037)
org.jboss.xnio:xnio-nio:3.8.16.Final (1 constraints: f80dc53d)
org.jetbrains:annotations:24.1.0 (2 constraints: fc20c06d)
org.slf4j:slf4j-api:2.0.13 (8 constraints: c0785e58)
org.slf4j:slf4j-api:2.0.16 (8 constraints: f17834d5)
org.wildfly.client:wildfly-client-config:1.0.1.Final (1 constraints: 940c6308)
org.wildfly.common:wildfly-common:1.7.0.Final (3 constraints: 203237d9)
org.yaml:snakeyaml:2.2 (1 constraints: 3c178b10)
org.yaml:snakeyaml:2.3 (1 constraints: 3d178c10)

[Test dependencies]
net.bytebuddy:byte-buddy:1.14.18 (1 constraints: 850bccea)
org.assertj:assertj-core:3.26.3 (1 constraints: 40054e3b)
org.junit:junit-bom:5.11.0-M2 (5 constraints: bf4c025c)
org.junit.jupiter:junit-jupiter-api:5.11.0-M2 (2 constraints: 6c1b34ae)
org.junit.jupiter:junit-jupiter-engine:5.11.0-M2 (2 constraints: ce0f96c4)
org.junit.platform:junit-platform-commons:1.11.0-M2 (3 constraints: 6a2c24df)
org.junit.platform:junit-platform-engine:1.11.0-M2 (2 constraints: 641b20ad)
org.junit:junit-bom:5.11.3 (5 constraints: 72494db8)
org.junit.jupiter:junit-jupiter-api:5.11.3 (2 constraints: 1a1aea1f)
org.junit.jupiter:junit-jupiter-engine:5.11.3 (2 constraints: 7c0ec071)
org.junit.platform:junit-platform-commons:1.11.3 (3 constraints: 6f2a1090)
org.junit.platform:junit-platform-engine:1.11.3 (2 constraints: 121afa1e)
org.opentest4j:opentest4j:1.3.0 (2 constraints: cf209249)
20 changes: 10 additions & 10 deletions versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
com.auth0:java-jwt = 4.4.0
com.fasterxml.jackson.*:* = 2.17.2
com.fasterxml.jackson.*:* = 2.18.1
com.github.ben-manes.caffeine:caffeine = 3.1.8
com.google.auto.service:auto-service = 1.1.1
com.google.errorprone:error_prone_core = 2.29.1
com.google.googlejavaformat:google-java-format = 1.22.0
com.google.guava:guava = 33.2.1-jre
com.google.errorprone:error_prone_core = 2.35.1
com.google.googlejavaformat:google-java-format = 1.24.0
com.google.guava:guava = 33.3.1-jre
com.jakewharton.nopen:* = 1.0.1
com.markelliot.barista.tracing:barista-tracing = 0.74.0
com.markelliot.result:result = 0.75.0
com.palantir.conjure.java:* = 8.23.0
com.palantir.conjure.java:* = 8.30.0
com.squareup:javapoet = 1.13.0
io.undertow:undertow-core = 2.3.15.Final
org.apache.logging.log4j:* = 2.23.1
io.undertow:undertow-core = 2.3.18.Final
org.apache.logging.log4j:* = 2.24.1
org.assertj:assertj-core = 3.26.3
org.junit:junit-bom = 5.11.0-M2
org.junit.jupiter:junit-jupiter-engine = 5.11.0-M2
org.slf4j:* = 2.0.13
org.junit:junit-bom = 5.11.3
org.junit.jupiter:junit-jupiter-engine = 5.11.3
org.slf4j:* = 2.0.16

Loading