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 01/10] 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 02/10] 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 03/10] 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 04/10] 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 05/10] 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 06/10] 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 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 07/10] 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 08/10] 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 09/10] 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 e9a02a57a994e5b5bc1be7f1c911f50126476a56 Mon Sep 17 00:00:00 2001 From: Shannon Pamperl Date: Mon, 25 Sep 2023 04:43:29 -0500 Subject: [PATCH 10/10] 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()); } } }