From b350390bc007678fadd731438399ed486d4fe592 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Sep 2023 14:55:34 +0200 Subject: [PATCH 01/22] Bump actions/checkout from 3 to 4 (#1944) Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout 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 c5998292f0..0b58baec64 100644 --- a/.github/workflows/codeql.yaml +++ b/.github/workflows/codeql.yaml @@ -15,7 +15,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up JDK uses: actions/setup-java@v3 diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index dfbc783555..6abbd16d0b 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up JDK uses: actions/setup-java@v3 with: From 428d2d97e9d959f23002b461be97c33a1548e1f7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Sep 2023 14:55:53 +0200 Subject: [PATCH 02/22] Bump org.apache.maven.plugins:maven-plugin-plugin from 3.6.1 to 3.6.4 (#1946) Bumps [org.apache.maven.plugins:maven-plugin-plugin](https://github.com/apache/maven-plugin-tools) from 3.6.1 to 3.6.4. - [Release notes](https://github.com/apache/maven-plugin-tools/releases) - [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.6.1...maven-plugin-tools-3.6.4) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-plugin-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 a6b43c7b59..a036ea8c2e 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 @@ -26,7 +26,7 @@ UTF-8 UTF-8 false - 3.6.1 + 3.6.4 3.0.0-M3 1.6.0 From 88f89933b9e6bb55668fbf9b612d4bd8f840c1e1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Sep 2023 14:56:10 +0200 Subject: [PATCH 03/22] Bump org.codehaus.plexus:plexus-utils from 3.5.0 to 3.5.1 (#1948) Bumps [org.codehaus.plexus:plexus-utils](https://github.com/codehaus-plexus/plexus-utils) from 3.5.0 to 3.5.1. - [Release notes](https://github.com/codehaus-plexus/plexus-utils/releases) - [Commits](https://github.com/codehaus-plexus/plexus-utils/compare/plexus-utils-3.5.0...plexus-utils-3.5.1) --- updated-dependencies: - dependency-name: org.codehaus.plexus:plexus-utils 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 1fe4910670..dbd34630b5 100644 --- a/spring-cloud-contract-shade/pom.xml +++ b/spring-cloud-contract-shade/pom.xml @@ -13,7 +13,7 @@ 3.25.0 3.1.2 3.0.0 - 3.5.0 + 3.5.1 4.5.13 From ddeed33a2ad8bce331057b60ba77f6400d83f653 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Sep 2023 14:57:55 +0200 Subject: [PATCH 04/22] Bump com.github.tomakehurst:wiremock-jre8-standalone (#1956) Bumps [com.github.tomakehurst:wiremock-jre8-standalone](https://github.com/wiremock/wiremock) from 2.35.0 to 2.35.1. - [Release notes](https://github.com/wiremock/wiremock/releases) - [Commits](https://github.com/wiremock/wiremock/compare/2.35.0...2.35.1) --- 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 e846b00d30..1b370f0479 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.35.0 + 2.35.1 0.6.2 From 955f2ba8eadeeacd993cd4ab9f635e93f78eefc0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Sep 2023 14:58:08 +0200 Subject: [PATCH 05/22] Bump org.apache.maven.resolver:maven-resolver from 1.4.1 to 1.4.2 (#1957) 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 deacc537c9..8b1acdae3e 100644 --- a/pom.xml +++ b/pom.xml @@ -59,7 +59,7 @@ 3.6.3 1.6 - 1.4.1 + 1.4.2 2.1.100 2.12.2 0.8.8 From 9ae23c38c9056142bb46ada4e69fa44c265cf1fb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Sep 2023 15:03:59 +0200 Subject: [PATCH 06/22] Bump actions/checkout from 2 to 4 (#1949) Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2...v4) --- updated-dependencies: - dependency-name: actions/checkout 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 2ed88960bf..44c8d1c7c0 100644 --- a/.github/workflows/codeql.yaml +++ b/.github/workflows/codeql.yaml @@ -15,7 +15,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 3d1b99b9ec..4c62809233 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK 1.8 uses: actions/setup-java@v3 with: From 81a52dc9dd8541cf74a521c26e9fa42178a7ffac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Sep 2023 15:09:03 +0200 Subject: [PATCH 07/22] Bump org.eclipse.sisu:org.eclipse.sisu.inject from 0.3.4 to 0.3.5 (#1952) Bumps org.eclipse.sisu:org.eclipse.sisu.inject from 0.3.4 to 0.3.5. --- updated-dependencies: - dependency-name: org.eclipse.sisu:org.eclipse.sisu.inject 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 8ba10eaa78..9c09c106c9 100644 --- a/spring-cloud-contract-shade/pom.xml +++ b/spring-cloud-contract-shade/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.3.4 + 0.3.5 0.3.4 4.2.0 5.0.0 From 762050160fe3ca67225ad0b10203c407e3167ff6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Sep 2023 15:09:59 +0200 Subject: [PATCH 08/22] Bump org.apache.maven.plugin-tools:maven-plugin-annotations (#1945) Bumps [org.apache.maven.plugin-tools:maven-plugin-annotations](https://github.com/apache/maven-plugin-tools) from 3.6.1 to 3.6.4. - [Release notes](https://github.com/apache/maven-plugin-tools/releases) - [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.6.1...maven-plugin-tools-3.6.4) --- updated-dependencies: - dependency-name: org.apache.maven.plugin-tools:maven-plugin-annotations 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 577d8480c3..dec0bcf518 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 @@ -33,7 +33,7 @@ 3.1.1 3.0.0 3.1.1 - 3.6.1 + 3.6.4 3.5.1 4.2.5 4.3.0 From 40c3651a2ce54b395a58f745dbbcbb9d3356ae74 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Sep 2023 15:11:43 +0200 Subject: [PATCH 09/22] Bump org.junit.jupiter:junit-jupiter-engine from 5.9.1 to 5.9.3 (#1955) Bumps [org.junit.jupiter:junit-jupiter-engine](https://github.com/junit-team/junit5) from 5.9.1 to 5.9.3. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.9.1...r5.9.3) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter-engine 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 7cecdc8ca2..54646be9ae 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ 2.27.0 5.9.1 - 5.9.1 + 5.9.3 1.12.1 From 097d0dfdba0367b312a30abb809d8b08ea04791f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Sep 2023 15:12:01 +0200 Subject: [PATCH 10/22] Bump jgit.version from 5.13.1.202206130422-r to 5.13.2.202306221912-r (#1954) Bumps `jgit.version` from 5.13.1.202206130422-r to 5.13.2.202306221912-r. Updates `org.eclipse.jgit:org.eclipse.jgit` from 5.13.1.202206130422-r to 5.13.2.202306221912-r Updates `org.eclipse.jgit:org.eclipse.jgit.ssh.jsch` from 5.13.1.202206130422-r to 5.13.2.202306221912-r --- updated-dependencies: - dependency-name: org.eclipse.jgit:org.eclipse.jgit dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jgit:org.eclipse.jgit.ssh.jsch 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 54646be9ae..c42a70b3f8 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ 0.2.2 1.10.0 4.3.1 - 5.13.1.202206130422-r + 5.13.2.202306221912-r 1 2.27.0 From de66026395b1d00dfd9d22b4e162bf75aa1b6347 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Sep 2023 15:22:08 +0200 Subject: [PATCH 11/22] Bump groovy.version from 3.0.9 to 3.0.19 (#1951) Bumps `groovy.version` from 3.0.9 to 3.0.19. Updates `org.codehaus.groovy:groovy` from 3.0.9 to 3.0.19 - [Commits](https://github.com/apache/groovy/commits) Updates `org.codehaus.groovy:groovy-ant` from 3.0.9 to 3.0.19 - [Commits](https://github.com/apache/groovy/commits) Updates `org.codehaus.groovy:groovy-bsf` from 3.0.9 to 3.0.19 - [Commits](https://github.com/apache/groovy/commits) Updates `org.codehaus.groovy:groovy-console` from 3.0.9 to 3.0.19 - [Commits](https://github.com/apache/groovy/commits) Updates `org.codehaus.groovy:groovy-docgenerator` from 3.0.9 to 3.0.19 - [Commits](https://github.com/apache/groovy/commits) Updates `org.codehaus.groovy:groovy-groovydoc` from 3.0.9 to 3.0.19 - [Commits](https://github.com/apache/groovy/commits) Updates `org.codehaus.groovy:groovy-groovysh` from 3.0.9 to 3.0.19 - [Commits](https://github.com/apache/groovy/commits) Updates `org.codehaus.groovy:groovy-jmx` from 3.0.9 to 3.0.19 - [Commits](https://github.com/apache/groovy/commits) Updates `org.codehaus.groovy:groovy-json` from 3.0.9 to 3.0.19 - [Commits](https://github.com/apache/groovy/commits) Updates `org.codehaus.groovy:groovy-jsr223` from 3.0.9 to 3.0.19 - [Commits](https://github.com/apache/groovy/commits) Updates `org.codehaus.groovy:groovy-nio` from 3.0.9 to 3.0.19 - [Commits](https://github.com/apache/groovy/commits) Updates `org.codehaus.groovy:groovy-servlet` from 3.0.9 to 3.0.19 - [Commits](https://github.com/apache/groovy/commits) Updates `org.codehaus.groovy:groovy-sql` from 3.0.9 to 3.0.19 - [Commits](https://github.com/apache/groovy/commits) Updates `org.codehaus.groovy:groovy-swing` from 3.0.9 to 3.0.19 - [Commits](https://github.com/apache/groovy/commits) Updates `org.codehaus.groovy:groovy-templates` from 3.0.9 to 3.0.19 - [Commits](https://github.com/apache/groovy/commits) Updates `org.codehaus.groovy:groovy-test` from 3.0.9 to 3.0.19 - [Commits](https://github.com/apache/groovy/commits) Updates `org.codehaus.groovy:groovy-testng` from 3.0.9 to 3.0.19 - [Commits](https://github.com/apache/groovy/commits) Updates `org.codehaus.groovy:groovy-xml` from 3.0.9 to 3.0.19 - [Commits](https://github.com/apache/groovy/commits) --- updated-dependencies: - dependency-name: org.codehaus.groovy:groovy dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.codehaus.groovy:groovy-ant dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.codehaus.groovy:groovy-bsf dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.codehaus.groovy:groovy-console dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.codehaus.groovy:groovy-docgenerator dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.codehaus.groovy:groovy-groovydoc dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.codehaus.groovy:groovy-groovysh dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.codehaus.groovy:groovy-jmx dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.codehaus.groovy:groovy-json dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: org.codehaus.groovy:groovy-jsr223 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.codehaus.groovy:groovy-nio dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: org.codehaus.groovy:groovy-servlet dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.codehaus.groovy:groovy-sql dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.codehaus.groovy:groovy-swing dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.codehaus.groovy:groovy-templates dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.codehaus.groovy:groovy-test dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.codehaus.groovy:groovy-testng dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: org.codehaus.groovy:groovy-xml 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> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c42a70b3f8..ba5faf3bc5 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,7 @@ 1.12.1 - 3.0.9 + 3.0.19 3.6.3 1.6 From b5261928f67ee4cd64c32f468ee57ba7360a18a8 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Wed, 20 Sep 2023 16:38:38 -0400 Subject: [PATCH 12/22] Uses 4.0.x for docs --- docs/src/main/asciidoc/README.adoc | 2 +- docs/src/main/asciidoc/_attributes.adoc | 2 +- .../src/site/asciidoc/junit.adoc | 2 +- .../src/site/asciidoc/spock.adoc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/src/main/asciidoc/README.adoc b/docs/src/main/asciidoc/README.adoc index 75103b9504..551cf7a5df 100644 --- a/docs/src/main/asciidoc/README.adoc +++ b/docs/src/main/asciidoc/README.adoc @@ -12,6 +12,6 @@ You can read more about Spring Cloud Contract by going to https://spring.io/proj == Contributing -include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/docs/src/main/asciidoc/contributing.adoc[] +include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/4.0.x/docs/src/main/asciidoc/contributing.adoc[] include::_building.adoc[] diff --git a/docs/src/main/asciidoc/_attributes.adoc b/docs/src/main/asciidoc/_attributes.adoc index 8b47f24221..688e0461d6 100644 --- a/docs/src/main/asciidoc/_attributes.adoc +++ b/docs/src/main/asciidoc/_attributes.adoc @@ -29,7 +29,7 @@ :standalone_messaging_samples_path: {samples_path}/standalone/dsl :standalone_restdocs_path: {samples_path}/standalone/restdocs :tests_path: {core_path}/tests -:samples_branch: main +:samples_branch: 4.0.x :samples_url: https://raw.githubusercontent.com/spring-cloud-samples/spring-cloud-contract-samples/{samples_branch} :samples_code: https://github.com/spring-cloud-samples/spring-cloud-contract-samples/tree/{samples_branch} :doc_samples: {samples_code}/wiremock-for-contract-docs diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/site/asciidoc/junit.adoc b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/site/asciidoc/junit.adoc index e14de9bdce..afbd240552 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/site/asciidoc/junit.adoc +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/site/asciidoc/junit.adoc @@ -1,4 +1,4 @@ -:branch: main +:branch: 4.0.x == Java Project with JUnit Tests diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/site/asciidoc/spock.adoc b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/site/asciidoc/spock.adoc index 421d468789..a9b2936daf 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/site/asciidoc/spock.adoc +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/site/asciidoc/spock.adoc @@ -1,4 +1,4 @@ -:branch: main +:branch: 4.0.x == Groovy Project with Spock Specifications From 6b06e1d5d9beeb56fb46bcfc10664e078c970ee1 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 21 Sep 2023 12:21:03 +0000 Subject: [PATCH 13/22] Bumping versions --- README.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.adoc b/README.adoc index 40a6c4eb2a..577274cba2 100644 --- a/README.adoc +++ b/README.adoc @@ -36,7 +36,7 @@ author credit if we do. Active contributors might be asked to join the core tea given the ability to merge pull requests. === Code of Conduct -This project adheres to the Contributor Covenant https://github.com/spring-cloud/spring-cloud-build/blob/master/docs/src/main/asciidoc/code-of-conduct.adoc[code of +This project adheres to the Contributor Covenant https://github.com/spring-cloud/spring-cloud-build/blob/{spring-cloud-build-branch}/docs/src/main/asciidoc/code-of-conduct.adoc[code of conduct]. By participating, you are expected to uphold this code. Please report unacceptable behavior to spring-code-of-conduct@pivotal.io. @@ -47,7 +47,7 @@ added after the original pull request but before a merge. * Use the Spring Framework code format conventions. If you use Eclipse you can import formatter settings using the `eclipse-code-formatter.xml` file from the - https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-dependencies-parent/eclipse-code-formatter.xml[Spring + https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring-cloud-build-branch}/spring-cloud-dependencies-parent/eclipse-code-formatter.xml[Spring Cloud Build] project. If using IntelliJ, you can use the https://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter Plugin] to import the same file. From 1c98f70d7e1d086c794444fa2acdddad114e6343 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Sep 2023 11:35:41 +0200 Subject: [PATCH 14/22] Bump xerces:xercesImpl from 2.12.0 to 2.12.2 (#1975) Bumps xerces:xercesImpl from 2.12.0 to 2.12.2. --- updated-dependencies: - dependency-name: xerces:xercesImpl 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> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ba5faf3bc5..9215e3766d 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ 1.4.1 2.1.100 - 2.12.0 + 2.12.2 0.8.5 1.6.0 1.3.0 From 0f4bc62e2dbbc4cf3e2fb08f9207a34407d3f24a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Sep 2023 11:37:10 +0200 Subject: [PATCH 15/22] Bump org.apache.maven.plugins:maven-plugin-plugin from 3.6.1 to 3.6.4 (#1973) Bumps [org.apache.maven.plugins:maven-plugin-plugin](https://github.com/apache/maven-plugin-tools) from 3.6.1 to 3.6.4. - [Release notes](https://github.com/apache/maven-plugin-tools/releases) - [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.6.1...maven-plugin-tools-3.6.4) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-plugin-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 dec0bcf518..8c44c37f18 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 @@ -26,7 +26,7 @@ UTF-8 UTF-8 false - 3.6.1 + 3.6.4 3.0.0-M3 1.6.0 From 435d321509b6d0d29d811e1ddb0d7c6bbe4a7403 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Sep 2023 11:37:29 +0200 Subject: [PATCH 16/22] Bump org.codehaus.plexus:plexus-utils from 3.3.0 to 3.3.1 (#1971) Bumps [org.codehaus.plexus:plexus-utils](https://github.com/codehaus-plexus/plexus-utils) from 3.3.0 to 3.3.1. - [Release notes](https://github.com/codehaus-plexus/plexus-utils/releases) - [Commits](https://github.com/codehaus-plexus/plexus-utils/compare/plexus-utils-3.3.0...plexus-utils-3.3.1) --- updated-dependencies: - dependency-name: org.codehaus.plexus:plexus-utils 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 9c09c106c9..7311f2a39e 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.3.0 + 3.3.1 org.springframework.cloud From d86020f8dc828783162984fc02b0c5e4e3ee43e0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Sep 2023 11:39:00 +0200 Subject: [PATCH 17/22] Bump com.example.github:github-analytics (#1970) 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 8fd8f7e02a..1da0a9608d 100644 --- a/spring-cloud-contract-wiremock/pom.xml +++ b/spring-cloud-contract-wiremock/pom.xml @@ -126,7 +126,7 @@ com.example.github github-analytics stubs - 1.0.0.M1-190120_105104-VERSION + 1.0.0.M1-20180613_114136-VERSION test From acdb1723894f3c316199033294a1f1b826053062 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Sep 2023 11:39:24 +0200 Subject: [PATCH 18/22] Bump org.apache.maven.plugin-tools:maven-plugin-annotations (#1969) Bumps [org.apache.maven.plugin-tools:maven-plugin-annotations](https://github.com/apache/maven-plugin-tools) from 3.6.1 to 3.6.4. - [Release notes](https://github.com/apache/maven-plugin-tools/releases) - [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.6.1...maven-plugin-tools-3.6.4) --- updated-dependencies: - dependency-name: org.apache.maven.plugin-tools:maven-plugin-annotations 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 a036ea8c2e..96604721a5 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 @@ -33,7 +33,7 @@ 3.1.1 3.0.0 3.1.1 - 3.6.1 + 3.6.4 3.5.1 4.2.5 4.3.0 From fd8970709c2e55f8acc6e9b9943b5e089b1328ef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Sep 2023 11:39:48 +0200 Subject: [PATCH 19/22] Bump com.example.github:github-webhook (#1968) Bumps com.example.github:github-webhook from 1.0.0.M1-190120_193303-VERSION to 1.0.0.M1-20180806_102441-VERSION. --- updated-dependencies: - dependency-name: com.example.github:github-webhook 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 1da0a9608d..4761f2a14f 100644 --- a/spring-cloud-contract-wiremock/pom.xml +++ b/spring-cloud-contract-wiremock/pom.xml @@ -113,7 +113,7 @@ com.example.github github-webhook stubs - 1.0.0.M1-190120_193303-VERSION + 1.0.0.M1-20180806_102441-VERSION test From 47e500d387f1bf878d7c18928bcba433bda546af Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Sep 2023 11:40:07 +0200 Subject: [PATCH 20/22] Bump org.apache.maven.plugins:maven-invoker-plugin from 3.2.1 to 3.2.2 (#1967) 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 e264f77f90..b028c1be37 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 @@ -102,7 +102,7 @@ is available --> org.apache.maven.plugins maven-invoker-plugin - 3.2.1 + 3.2.2 src/it/settings.xml standalone From 4c77de261b933b8258d0c7677411da887af9d1d8 Mon Sep 17 00:00:00 2001 From: Shannon Pamperl Date: Mon, 25 Sep 2023 04:42:46 -0500 Subject: [PATCH 21/22] Remove various deprecated usages that have available alternatives. Fixes gh-1934 (#1980) --- ...SpringCloudContractVerifierGradlePlugin.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 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 332f41d92a..cd846b6601 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 @@ -33,20 +33,19 @@ import org.gradle.api.attributes.Usage; import org.gradle.api.file.Directory; import org.gradle.api.file.FileCollection; import org.gradle.api.file.ProjectLayout; -import org.gradle.api.internal.HasConvention; import org.gradle.api.logging.Logger; import org.gradle.api.logging.Logging; import org.gradle.api.model.ObjectFactory; import org.gradle.api.plugins.GroovyPlugin; import org.gradle.api.plugins.JavaBasePlugin; import org.gradle.api.plugins.JavaPlugin; -import org.gradle.api.plugins.JavaPluginConvention; +import org.gradle.api.plugins.JavaPluginExtension; import org.gradle.api.plugins.JvmTestSuitePlugin; import org.gradle.api.plugins.jvm.JvmTestSuite; import org.gradle.api.provider.Property; import org.gradle.api.provider.Provider; import org.gradle.api.provider.ProviderFactory; -import org.gradle.api.tasks.GroovySourceSet; +import org.gradle.api.tasks.GroovySourceDirectorySet; import org.gradle.api.tasks.SourceSet; import org.gradle.api.tasks.SourceSetContainer; import org.gradle.api.tasks.SourceSetOutput; @@ -131,7 +130,7 @@ public class SpringCloudContractVerifierGradlePlugin implements Plugin registerPublishStubsToScmTask(extension, generateClientStubs); - JavaPluginConvention javaConvention = project.getConvention().getPlugin(JavaPluginConvention.class); + JavaPluginExtension javaExtension = project.getExtensions().getByType(JavaPluginExtension.class); TestingExtension testing = project.getExtensions().getByType(TestingExtension.class); testing.getSuites().register("contractTest", JvmTestSuite.class, contractTestSuite -> { contractTestSuite.useJUnitJupiter(); @@ -150,7 +149,7 @@ public class SpringCloudContractVerifierGradlePlugin implements Plugin }); contractTestSuite.sources(sourceSet -> { - configureSourceSets(extension, javaConvention, sourceSet); + configureSourceSets(extension, javaExtension, sourceSet); project.getTasks().named(sourceSet.getProcessResourcesTaskName(), processContractTestResourcesTask -> { processContractTestResourcesTask.dependsOn(generateServerTestsTaskProvider); @@ -181,12 +180,12 @@ public class SpringCloudContractVerifierGradlePlugin implements Plugin project.getDependencies().add(CONTRACT_TEST_GENERATOR_RUNTIME_CLASSPATH_CONFIGURATION_NAME, "org.springframework.cloud:spring-cloud-contract-converters:" + SPRING_CLOUD_VERSION); } - private SourceSet configureSourceSets(ContractVerifierExtension extension, JavaPluginConvention javaConvention, SourceSet contractTest) { - SourceSetContainer sourceSets = javaConvention.getSourceSets(); + private SourceSet configureSourceSets(ContractVerifierExtension extension, JavaPluginExtension javaExtension, SourceSet contractTest) { + SourceSetContainer sourceSets = javaExtension.getSourceSets(); contractTest.getJava().srcDirs(extension.getGeneratedTestJavaSourcesDir()); project.getPlugins().withType(GroovyPlugin.class, groovyPlugin -> { - GroovySourceSet groovy = ((HasConvention) contractTest).getConvention().getPlugin(GroovySourceSet.class); - groovy.getGroovy().srcDirs(extension.getGeneratedTestGroovySourcesDir()); + GroovySourceDirectorySet groovy = contractTest.getExtensions().getByType(GroovySourceDirectorySet.class); + groovy.srcDirs(extension.getGeneratedTestGroovySourcesDir()); }); contractTest.getResources().srcDirs(extension.getGeneratedTestResourcesDir()); From e9a02a57a994e5b5bc1be7f1c911f50126476a56 Mon Sep 17 00:00:00 2001 From: Shannon Pamperl Date: Mon, 25 Sep 2023 04:43:29 -0500 Subject: [PATCH 22/22] Print stderr when process fails. Fixes gh-1908 (#1979) --- .../verifier/plugin/GenerateServerTestsTask.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/java/org/springframework/cloud/contract/verifier/plugin/GenerateServerTestsTask.java b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/java/org/springframework/cloud/contract/verifier/plugin/GenerateServerTestsTask.java index cce26ffef9..bcc2cc7381 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/java/org/springframework/cloud/contract/verifier/plugin/GenerateServerTestsTask.java +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/java/org/springframework/cloud/contract/verifier/plugin/GenerateServerTestsTask.java @@ -131,11 +131,14 @@ class GenerateServerTestsTask extends DefaultTask { getLogger().info("Contracts are unpacked to [{}]", contractsDslDir); getLogger().info("Included contracts are [{}]", includedContracts); ContractVerifierConfigProperties properties = toConfigProperties(contractsDslDir, includedContracts, generatedTestSources, generatedTestResources); - OutputStream os; + OutputStream stdout; + OutputStream stderr; if (getLogger().isDebugEnabled()) { - os = new ByteArrayOutputStream(); + stdout = new ByteArrayOutputStream(); + stderr = stdout; } else { - os = NullOutputStream.INSTANCE; + stdout = NullOutputStream.INSTANCE; + stderr = new ByteArrayOutputStream(); } try { String propertiesJson = new ObjectMapper().writeValueAsString(properties); @@ -143,15 +146,16 @@ class GenerateServerTestsTask extends DefaultTask { exec.setMain("org.springframework.cloud.contract.verifier.TestGeneratorApplication"); exec.classpath(classpath); exec.args(quoteAndEscape(propertiesJson)); - exec.setStandardOutput(os); - exec.setErrorOutput(os); + exec.setStandardOutput(stdout); + exec.setErrorOutput(stderr); }); } catch (Exception e) { + getLogger().error(stderr.toString()); throw new GradleException("Spring Cloud Contract Verifier Plugin exception: " + e.getMessage(), e); } finally { if (getLogger().isDebugEnabled()) { - getLogger().debug(os.toString()); + getLogger().debug(stdout.toString()); } } }