From 6ca200fa12bcbbcd899de16ab6f72a30470d8fe6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 27 Sep 2023 09:46:02 +0200 Subject: [PATCH 01/17] Bump org.codehaus.plexus:plexus-archiver from 4.2.5 to 4.2.7 (#2000) Bumps [org.codehaus.plexus:plexus-archiver](https://github.com/codehaus-plexus/plexus-archiver) from 4.2.5 to 4.2.7. - [Release notes](https://github.com/codehaus-plexus/plexus-archiver/releases) - [Changelog](https://github.com/codehaus-plexus/plexus-archiver/blob/master/ReleaseNotes.md) - [Commits](https://github.com/codehaus-plexus/plexus-archiver/compare/plexus-archiver-4.2.5...plexus-archiver-4.2.7) --- updated-dependencies: - dependency-name: org.codehaus.plexus:plexus-archiver dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .../spring-cloud-contract-maven-plugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml index 890e459acd..2e058f23c7 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml @@ -35,7 +35,7 @@ 3.1.2 3.6.4 3.5.2 - 4.2.5 + 4.2.7 4.3.0 3.9.1 3.3.0 From 57a8c99fb01197bedc19b88fc410f46620823e30 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 27 Sep 2023 09:46:25 +0200 Subject: [PATCH 02/17] Bump contract.kotlin.version from 1.5.20 to 1.5.32 (#2001) Bumps `contract.kotlin.version` from 1.5.20 to 1.5.32. Updates `org.jetbrains.kotlin:kotlin-bom` from 1.5.20 to 1.5.32 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.5.32/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.5.20...v1.5.32) Updates `org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable` from 1.5.20 to 1.5.32 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.5.32/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.5.20...v1.5.32) Updates `org.jetbrains.kotlin:kotlin-daemon-embeddable` from 1.5.20 to 1.5.32 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.5.32/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.5.20...v1.5.32) Updates `org.jetbrains.kotlin:kotlin-compiler-embeddable` from 1.5.20 to 1.5.32 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.5.32/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.5.20...v1.5.32) Updates `org.jetbrains.kotlin:kotlin-maven-plugin` from 1.5.20 to 1.5.32 --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-bom dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-daemon-embeddable dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-compiler-embeddable dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cb6bd7d10c..160cf67eea 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ 1.3.0 1.0.30.RELEASE - 1.5.20 + 1.5.32 1.9.4 2.6.0 From 13ac66d19e70921b6c1b0213c8cdada752902aa2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 27 Sep 2023 09:46:43 +0200 Subject: [PATCH 03/17] Bump com.fasterxml.jackson.module:jackson-module-jsonSchema (#2002) Bumps [com.fasterxml.jackson.module:jackson-module-jsonSchema](https://github.com/FasterXML/jackson-module-jsonSchema) from 2.14.2 to 2.14.3. - [Commits](https://github.com/FasterXML/jackson-module-jsonSchema/compare/jackson-module-jsonSchema-2.14.2...jackson-module-jsonSchema-2.14.3) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.module:jackson-module-jsonSchema dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docs/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/pom.xml b/docs/pom.xml index 0771ae61f6..0e14566a76 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -14,7 +14,7 @@ Spring Cloud Contract Docs Spring Cloud Docs - 2.14.2 + 2.14.3 spring-cloud-contract ${basedir}/.. 3.4 From dd568228ada646f43882d868658b291fa18ce0a9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 27 Sep 2023 09:47:02 +0200 Subject: [PATCH 04/17] Bump org.apache.maven:maven-archiver from 3.5.1 to 3.5.2 (#2003) Bumps [org.apache.maven:maven-archiver](https://github.com/apache/maven-archiver) from 3.5.1 to 3.5.2. - [Release notes](https://github.com/apache/maven-archiver/releases) - [Commits](https://github.com/apache/maven-archiver/compare/maven-archiver-3.5.1...maven-archiver-3.5.2) --- updated-dependencies: - dependency-name: org.apache.maven:maven-archiver dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .../spring-cloud-contract-maven-plugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml index 8c44c37f18..149d8da7e2 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml @@ -34,7 +34,7 @@ 3.0.0 3.1.1 3.6.4 - 3.5.1 + 3.5.2 4.2.5 4.3.0 3.9.1 From 174368b8019c3c907fdac9af7eaeb099a278a9c9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 27 Sep 2023 09:47:18 +0200 Subject: [PATCH 05/17] Bump com.sun.jersey.contribs:jersey-apache-client4 from 1.19.1 to 1.19.4 (#2004) Bumps com.sun.jersey.contribs:jersey-apache-client4 from 1.19.1 to 1.19.4. --- updated-dependencies: - dependency-name: com.sun.jersey.contribs:jersey-apache-client4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- tests/spring-cloud-contract-stub-runner-boot-eureka/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/spring-cloud-contract-stub-runner-boot-eureka/pom.xml b/tests/spring-cloud-contract-stub-runner-boot-eureka/pom.xml index 71bf446473..ff18ea471a 100644 --- a/tests/spring-cloud-contract-stub-runner-boot-eureka/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-boot-eureka/pom.xml @@ -14,7 +14,7 @@ Spring Cloud Contract Stub Runner Boot Eureka Spring Cloud Contract Stub Runner Boot Eureka - 1.19.1 + 1.19.4 From bbe31c9e75f6324ec0fa10506d724c5eb265f028 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 27 Sep 2023 09:47:33 +0200 Subject: [PATCH 06/17] Bump org.apache.maven.plugins:maven-project-info-reports-plugin (#2005) Bumps [org.apache.maven.plugins:maven-project-info-reports-plugin](https://github.com/apache/maven-project-info-reports-plugin) from 3.1.1 to 3.1.2. - [Commits](https://github.com/apache/maven-project-info-reports-plugin/compare/maven-project-info-reports-plugin-3.1.1...maven-project-info-reports-plugin-3.1.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-project-info-reports-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .../spring-cloud-contract-maven-plugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml index 149d8da7e2..d6c20b01c9 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml @@ -32,7 +32,7 @@ 1.6.0 3.1.1 3.0.0 - 3.1.1 + 3.1.2 3.6.4 3.5.2 4.2.5 From e735a66ba43d9d873861231439c92cb652bd0a45 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 28 Sep 2023 14:36:28 +0200 Subject: [PATCH 07/17] Bump org.codehaus.plexus:plexus-archiver from 4.2.5 to 4.2.7 (#2006) Bumps [org.codehaus.plexus:plexus-archiver](https://github.com/codehaus-plexus/plexus-archiver) from 4.2.5 to 4.2.7. - [Release notes](https://github.com/codehaus-plexus/plexus-archiver/releases) - [Changelog](https://github.com/codehaus-plexus/plexus-archiver/blob/master/ReleaseNotes.md) - [Commits](https://github.com/codehaus-plexus/plexus-archiver/compare/plexus-archiver-4.2.5...plexus-archiver-4.2.7) --- updated-dependencies: - dependency-name: org.codehaus.plexus:plexus-archiver dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .../spring-cloud-contract-maven-plugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml index d6c20b01c9..5af2bcfe1a 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml @@ -35,7 +35,7 @@ 3.1.2 3.6.4 3.5.2 - 4.2.5 + 4.2.7 4.3.0 3.9.1 2.0.0 From 2771da010a023d1266d878fac3885ffbc10b015e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 28 Sep 2023 14:36:48 +0200 Subject: [PATCH 08/17] Bump org.apache.maven.plugins:maven-invoker-plugin from 3.2.1 to 3.2.2 (#2007) Bumps [org.apache.maven.plugins:maven-invoker-plugin](https://github.com/apache/maven-invoker-plugin) from 3.2.1 to 3.2.2. - [Release notes](https://github.com/apache/maven-invoker-plugin/releases) - [Commits](https://github.com/apache/maven-invoker-plugin/compare/maven-invoker-plugin-3.2.1...maven-invoker-plugin-3.2.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-invoker-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- samples/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/pom.xml b/samples/pom.xml index a8a7928962..b836242990 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -61,7 +61,7 @@ is available --> org.apache.maven.plugins maven-invoker-plugin - 3.2.1 + 3.2.2 src/it/settings.xml standalone @@ -99,7 +99,7 @@ is available --> org.apache.maven.plugins maven-invoker-plugin - 3.2.1 + 3.2.2 src/it/settings.xml standalone From 6e3d6578564956791b2e2fa39b4433f7763eb677 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 28 Sep 2023 14:37:01 +0200 Subject: [PATCH 09/17] Bump com.example.github:github-analytics (#2008) Bumps com.example.github:github-analytics from 1.0.0.M1-190120_105104-VERSION to 1.0.0.M1-20180613_114136-VERSION. --- updated-dependencies: - dependency-name: com.example.github:github-analytics dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- spring-cloud-contract-wiremock/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-contract-wiremock/pom.xml b/spring-cloud-contract-wiremock/pom.xml index 19d76250cf..af84f0eea7 100644 --- a/spring-cloud-contract-wiremock/pom.xml +++ b/spring-cloud-contract-wiremock/pom.xml @@ -123,7 +123,7 @@ com.example.github github-analytics stubs - 1.0.0.M1-190120_105104-VERSION + 1.0.0.M1-20180613_114136-VERSION test From d61b61c19594abc14a32165e7cd87da8e2039d4d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 28 Sep 2023 14:37:30 +0200 Subject: [PATCH 10/17] Bump org.jacoco:jacoco-maven-plugin from 0.8.5 to 0.8.10 (#2009) Bumps [org.jacoco:jacoco-maven-plugin](https://github.com/jacoco/jacoco) from 0.8.5 to 0.8.10. - [Release notes](https://github.com/jacoco/jacoco/releases) - [Commits](https://github.com/jacoco/jacoco/compare/v0.8.5...v0.8.10) --- updated-dependencies: - dependency-name: org.jacoco:jacoco-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 160cf67eea..18bede1c4b 100644 --- a/pom.xml +++ b/pom.xml @@ -57,7 +57,7 @@ 1.4.1 2.1.100 2.12.2 - 0.8.5 + 0.8.10 1.6.0 1.3.0 1.0.30.RELEASE From e7a1f597f6d82cbfd296461d88b85f2a2d6f2bc2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 28 Sep 2023 14:37:45 +0200 Subject: [PATCH 11/17] Bump org.apache.maven.resolver:maven-resolver from 1.4.1 to 1.4.2 (#2010) Bumps [org.apache.maven.resolver:maven-resolver](https://github.com/apache/maven-resolver) from 1.4.1 to 1.4.2. - [Release notes](https://github.com/apache/maven-resolver/releases) - [Commits](https://github.com/apache/maven-resolver/compare/maven-resolver-1.4.1...maven-resolver-1.4.2) --- updated-dependencies: - dependency-name: org.apache.maven.resolver:maven-resolver dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 18bede1c4b..e4fee49efa 100644 --- a/pom.xml +++ b/pom.xml @@ -54,7 +54,7 @@ 3.6.3 1.6 - 1.4.1 + 1.4.2 2.1.100 2.12.2 0.8.10 From deb15d732abe39bbb70d40a7c744ca219c7011cd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 29 Sep 2023 10:17:22 +0200 Subject: [PATCH 12/17] Bump com.github.tomakehurst:wiremock-jre8-standalone (#2014) Bumps [com.github.tomakehurst:wiremock-jre8-standalone](https://github.com/wiremock/wiremock) from 2.33.0 to 2.33.2. - [Release notes](https://github.com/wiremock/wiremock/releases) - [Commits](https://github.com/wiremock/wiremock/compare/2.33.0...2.33.2) --- updated-dependencies: - dependency-name: com.github.tomakehurst:wiremock-jre8-standalone dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- spring-cloud-contract-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-contract-dependencies/pom.xml b/spring-cloud-contract-dependencies/pom.xml index cc48f1253a..1c57b6178d 100644 --- a/spring-cloud-contract-dependencies/pom.xml +++ b/spring-cloud-contract-dependencies/pom.xml @@ -15,7 +15,7 @@ spring-cloud-contract-dependencies Spring Cloud Contract Dependencies - 2.33.0 + 2.33.2 0.6.2 From 81a8fb638731a803293524bba7ee315b03f762de Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Dec 2023 15:23:39 +0100 Subject: [PATCH 13/17] Bump actions/setup-java from 3 to 4 (#2046) Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3 to 4. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql.yaml | 2 +- .github/workflows/maven.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml index 0b58baec64..453e050631 100644 --- a/.github/workflows/codeql.yaml +++ b/.github/workflows/codeql.yaml @@ -18,7 +18,7 @@ jobs: uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: 17 diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 6abbd16d0b..c060627dff 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -17,7 +17,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: 17 From a70a410cab04adf200b3dabcf48b9dc68612ebf5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Dec 2023 15:43:38 +0100 Subject: [PATCH 14/17] Bump org.apache.httpcomponents:httpclient from 4.5.13 to 4.5.14 (#1950) Bumps org.apache.httpcomponents:httpclient from 4.5.13 to 4.5.14. --- updated-dependencies: - dependency-name: org.apache.httpcomponents:httpclient dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- spring-cloud-contract-shade/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-contract-shade/pom.xml b/spring-cloud-contract-shade/pom.xml index 601854f083..e4a2ecf2ca 100644 --- a/spring-cloud-contract-shade/pom.xml +++ b/spring-cloud-contract-shade/pom.xml @@ -14,7 +14,7 @@ 3.1.2 3.0.0 3.5.1 - 4.5.13 + 4.5.14 org.springframework.cloud From 95998b4d57af968d0731206a8f96c862d3cd2ad3 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 4 Dec 2023 16:09:18 +0100 Subject: [PATCH 15/17] Upgrades Groovy to 4.0.16 fixes https://github.com/spring-cloud/spring-cloud-contract/issues/2034 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9221b2457e..fb2045e1c2 100644 --- a/pom.xml +++ b/pom.xml @@ -54,7 +54,7 @@ 1.17.6 - 4.0.0 + 4.0.16 3.6.3 1.6 From d5147e7528baba7fe08a862fe955c18e1577c682 Mon Sep 17 00:00:00 2001 From: Shannon Pamperl Date: Thu, 7 Dec 2023 03:07:21 -0600 Subject: [PATCH 16/17] Correct ordering of resources on the classpath. Fixes gh-1981 (#2060) --- .../SpringCloudContractVerifierGradlePlugin.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/java/org/springframework/cloud/contract/verifier/plugin/SpringCloudContractVerifierGradlePlugin.java b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/java/org/springframework/cloud/contract/verifier/plugin/SpringCloudContractVerifierGradlePlugin.java index 28f849552d..643282b969 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/java/org/springframework/cloud/contract/verifier/plugin/SpringCloudContractVerifierGradlePlugin.java +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/java/org/springframework/cloud/contract/verifier/plugin/SpringCloudContractVerifierGradlePlugin.java @@ -26,8 +26,8 @@ import org.gradle.api.attributes.LibraryElements; import org.gradle.api.attributes.Usage; import org.gradle.api.file.Directory; import org.gradle.api.file.DirectoryProperty; -import org.gradle.api.file.FileCollection; import org.gradle.api.internal.HasConvention; +import org.gradle.api.model.ObjectFactory; import org.gradle.api.plugins.GroovyPlugin; import org.gradle.api.plugins.JavaBasePlugin; import org.gradle.api.plugins.JavaPlugin; @@ -128,6 +128,8 @@ public class SpringCloudContractVerifierGradlePlugin implements Plugin private SourceSet configureSourceSets(ContractVerifierExtension extension, JavaPluginConvention javaConvention) { SourceSetContainer sourceSets = javaConvention.getSourceSets(); + ConfigurationContainer configurations = project.getConfigurations(); + ObjectFactory objects = project.getObjects(); SourceSet contractTest = sourceSets.create(CONTRACT_TEST_SOURCE_SET_NAME); contractTest.getJava().srcDirs(extension.getGeneratedTestJavaSourcesDir()); project.getPlugins().withType(GroovyPlugin.class, groovyPlugin -> { @@ -139,11 +141,11 @@ public class SpringCloudContractVerifierGradlePlugin implements Plugin SourceSetOutput mainOutput = sourceSets.getByName(SourceSet.MAIN_SOURCE_SET_NAME).getOutput(); SourceSetOutput testOutput = sourceSets.getByName(SourceSet.TEST_SOURCE_SET_NAME).getOutput(); - FileCollection compileClasspath = contractTest.getCompileClasspath(); - contractTest.setCompileClasspath(compileClasspath.plus(mainOutput).plus(testOutput)); + Configuration contractTestCompileClasspathConfiguration = configurations.getByName(contractTest.getCompileClasspathConfigurationName()); + Configuration contractTestRuntimeClasspathConfiguration = configurations.getByName(contractTest.getRuntimeClasspathConfigurationName()); - FileCollection runtimeClasspath = contractTest.getRuntimeClasspath(); - contractTest.setRuntimeClasspath(runtimeClasspath.plus(mainOutput).plus(testOutput)); + contractTest.setCompileClasspath(objects.fileCollection().from(testOutput, mainOutput, contractTestCompileClasspathConfiguration)); + contractTest.setRuntimeClasspath(objects.fileCollection().from(contractTest.getOutput(), testOutput, mainOutput, contractTestRuntimeClasspathConfiguration)); return contractTest; } From 6f598372024adf4b6154148b130e72c364fbf98f Mon Sep 17 00:00:00 2001 From: Shannon Pamperl Date: Thu, 7 Dec 2023 07:54:45 -0600 Subject: [PATCH 17/17] Correct ordering of resources on the classpath. Fixes gh-1981 (#2060) (#2061) --- .../SpringCloudContractVerifierGradlePlugin.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/java/org/springframework/cloud/contract/verifier/plugin/SpringCloudContractVerifierGradlePlugin.java b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/java/org/springframework/cloud/contract/verifier/plugin/SpringCloudContractVerifierGradlePlugin.java index cd846b6601..2863fc4ba2 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/java/org/springframework/cloud/contract/verifier/plugin/SpringCloudContractVerifierGradlePlugin.java +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/java/org/springframework/cloud/contract/verifier/plugin/SpringCloudContractVerifierGradlePlugin.java @@ -182,6 +182,8 @@ public class SpringCloudContractVerifierGradlePlugin implements Plugin private SourceSet configureSourceSets(ContractVerifierExtension extension, JavaPluginExtension javaExtension, SourceSet contractTest) { SourceSetContainer sourceSets = javaExtension.getSourceSets(); + ConfigurationContainer configurations = project.getConfigurations(); + ObjectFactory objects = project.getObjects(); contractTest.getJava().srcDirs(extension.getGeneratedTestJavaSourcesDir()); project.getPlugins().withType(GroovyPlugin.class, groovyPlugin -> { GroovySourceDirectorySet groovy = contractTest.getExtensions().getByType(GroovySourceDirectorySet.class); @@ -192,11 +194,11 @@ public class SpringCloudContractVerifierGradlePlugin implements Plugin SourceSetOutput mainOutput = sourceSets.getByName(SourceSet.MAIN_SOURCE_SET_NAME).getOutput(); SourceSetOutput testOutput = sourceSets.getByName(SourceSet.TEST_SOURCE_SET_NAME).getOutput(); - FileCollection compileClasspath = contractTest.getCompileClasspath(); - contractTest.setCompileClasspath(compileClasspath.plus(mainOutput).plus(testOutput)); + Configuration contractTestCompileClasspathConfiguration = configurations.getByName(contractTest.getCompileClasspathConfigurationName()); + Configuration contractTestRuntimeClasspathConfiguration = configurations.getByName(contractTest.getRuntimeClasspathConfigurationName()); - FileCollection runtimeClasspath = contractTest.getRuntimeClasspath(); - contractTest.setRuntimeClasspath(runtimeClasspath.plus(mainOutput).plus(testOutput)); + contractTest.setCompileClasspath(objects.fileCollection().from(testOutput, mainOutput, contractTestCompileClasspathConfiguration)); + contractTest.setRuntimeClasspath(objects.fileCollection().from(contractTest.getOutput(), testOutput, mainOutput, contractTestRuntimeClasspathConfiguration)); return contractTest; }