From 16da4fae500e3c53d31ab6179776c248f3d7a8ab Mon Sep 17 00:00:00 2001 From: Mike Weber Date: Mon, 21 Mar 2022 15:03:19 -0400 Subject: [PATCH] Bumped dependency versions (#581) --- changelog/@unreleased/pr-468.v2.yml | 12 ++++++++++++ versions.lock | 28 ++++++++++++---------------- versions.props | 6 +++--- 3 files changed, 27 insertions(+), 19 deletions(-) create mode 100644 changelog/@unreleased/pr-468.v2.yml diff --git a/changelog/@unreleased/pr-468.v2.yml b/changelog/@unreleased/pr-468.v2.yml new file mode 100644 index 00000000..976e46d2 --- /dev/null +++ b/changelog/@unreleased/pr-468.v2.yml @@ -0,0 +1,12 @@ +type: fix +fix: + description: |- + Bumped dependency versions + ## Before this PR + Issue is described at length: https://github.com/palantir/gradle-git-version/issues/468 + ## After this PR + Usages of `git-version` on submodules no longer errors out. + ## Possible downsides? + New versions have breaking changes to the used APIs. + links: + - https://github.com/palantir/gradle-git-version/pull/581 \ No newline at end of file diff --git a/versions.lock b/versions.lock index c50bdb58..8b1597bd 100644 --- a/versions.lock +++ b/versions.lock @@ -5,30 +5,26 @@ com.google.guava:failureaccess:1.0.1 (1 constraints: 140ae1b4) com.google.guava:guava:31.1-jre (1 constraints: 47069c47) com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (1 constraints: bd17c918) com.google.j2objc:j2objc-annotations:1.3 (1 constraints: b809eda0) -com.googlecode.javaewah:JavaEWAH:1.1.6 (1 constraints: 480e7e50) -com.jcraft:jsch:0.1.54 (1 constraints: 7a0ef25e) -com.jcraft:jzlib:1.1.1 (1 constraints: 430e7950) -org.bouncycastle:bcpg-jdk15on:1.60 (1 constraints: 190e4242) -org.bouncycastle:bcpkix-jdk15on:1.60 (1 constraints: 190e4242) -org.bouncycastle:bcprov-jdk15on:1.60 (3 constraints: e027607a) +com.googlecode.javaewah:JavaEWAH:1.1.13 (1 constraints: 760eef5e) org.checkerframework:checker-qual:3.12.0 (1 constraints: 480a3bbf) -org.eclipse.jgit:org.eclipse.jgit:5.3.2.201906051522-r (1 constraints: 3a087299) +org.eclipse.jgit:org.eclipse.jgit:6.1.0.202203080745-r (1 constraints: 37081099) org.immutables:value:2.8.8 (1 constraints: 14051536) -org.slf4j:slf4j-api:1.7.2 (1 constraints: 4a0e8c50) +org.slf4j:slf4j-api:1.7.30 (1 constraints: 7b0e085f) [Test dependencies] cglib:cglib-nodep:3.3.0 (1 constraints: 320d141f) -com.fasterxml.jackson.core:jackson-annotations:2.11.3 (1 constraints: 87123221) -com.fasterxml.jackson.core:jackson-core:2.11.3 (1 constraints: 87123221) -com.fasterxml.jackson.core:jackson-databind:2.11.3 (1 constraints: 3905353b) +com.fasterxml.jackson:jackson-bom:2.13.2 (3 constraints: 7f37bad3) +com.fasterxml.jackson.core:jackson-annotations:2.13.2 (2 constraints: 3f21ec93) +com.fasterxml.jackson.core:jackson-core:2.13.2 (2 constraints: 3f21ec93) +com.fasterxml.jackson.core:jackson-databind:2.13.2 (2 constraints: f1138182) junit:junit:4.13.2 (2 constraints: eb154ef7) -net.bytebuddy:byte-buddy:1.11.0 (1 constraints: 5f0d672c) +net.bytebuddy:byte-buddy:1.12.1 (1 constraints: 610d6b2c) org.assertj:assertj-core:3.22.0 (2 constraints: 65174647) -org.codehaus.groovy:groovy:3.0.8 (1 constraints: 370d131f) +org.codehaus.groovy:groovy:3.0.9 (1 constraints: 380d141f) org.hamcrest:hamcrest:2.2 (1 constraints: d20cdc04) org.hamcrest:hamcrest-core:1.3 (1 constraints: cc05fe3f) org.jetbrains:annotations:20.1.0 (1 constraints: 5f0d6b2c) -org.junit:junit-bom:5.8.2 (10 constraints: 61a4fb4a) +org.junit:junit-bom:5.8.2 (10 constraints: 61a4fd4a) org.junit.jupiter:junit-jupiter:5.8.2 (2 constraints: 260e7a59) org.junit.jupiter:junit-jupiter-api:5.8.2 (4 constraints: 8b385c34) org.junit.jupiter:junit-jupiter-engine:5.8.2 (2 constraints: 2117d23c) @@ -40,5 +36,5 @@ org.junit.platform:junit-platform-testkit:1.8.2 (1 constraints: 12097995) org.junit.vintage:junit-vintage-engine:5.8.2 (2 constraints: 260e7a59) org.objenesis:objenesis:3.2 (1 constraints: d30cdf04) org.opentest4j:opentest4j:1.2.0 (3 constraints: c53224a1) -org.ow2.asm:asm:9.1 (1 constraints: d80cf004) -org.spockframework:spock-core:2.0-groovy-3.0 (1 constraints: 3708b176) +org.ow2.asm:asm:9.2 (1 constraints: d90cf104) +org.spockframework:spock-core:2.1-groovy-3.0 (1 constraints: 3808bd76) diff --git a/versions.props b/versions.props index faaec86b..ac78b57f 100644 --- a/versions.props +++ b/versions.props @@ -1,11 +1,11 @@ -org.eclipse.jgit:org.eclipse.jgit = 5.3.2.201906051522-r +org.eclipse.jgit:org.eclipse.jgit = 6.1.0.202203080745-r com.google.guava:guava = 31.1-jre org.immutables:* = 2.8.8 # test dependencies junit:junit = 4.13.2 org.assertj:assertj-core = 3.22.0 -org.spockframework:spock-core = 2.0-groovy-3.0 +org.spockframework:spock-core = 2.1-groovy-3.0 org.junit.jupiter:* = 5.8.2 org.junit.vintage:* = 5.8.2 -com.fasterxml.jackson.core:jackson-databind = 2.11.3 +com.fasterxml.jackson.core:jackson-databind = 2.13.2