Commit Graph

4528 Commits

Author SHA1 Message Date
Olga MaciaszekSharma
d723cffed2 Fix Boot version in gradle samples. 2024-03-21 18:33:17 +01:00
Olga MaciaszekSharma
277f426c18 Fix spring-cloud-stream-version. 2024-03-21 18:18:24 +01:00
Olga MaciaszekSharma
dd8d04874a Fix versioning for 4.1.2-SNAPSHOT. 2024-03-21 18:01:46 +01:00
Olga MaciaszekSharma
1eb4149f4a Merge remote-tracking branch 'origin/main'
# Conflicts:
#	docker/spring-cloud-contract-docker/project/gradle.properties
#	spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle.properties
#	spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties
2024-03-21 17:38:05 +01:00
Olga MaciaszekSharma
d8e960ec37 Fix versioning in gradle tests and samples. 2024-03-21 17:36:57 +01:00
Shannon Pamperl
5f75badaf8 Workaround Gradle jvm-test-suite binary breaking change (#2103) 2024-03-21 12:35:39 +01:00
Olga MaciaszekSharma
111dbaf908 Fix parent version in samples. 2024-03-20 12:26:23 +01:00
buildmaster
e505602698 Bumping versions 2024-03-08 10:42:09 +00:00
Olga MaciaszekSharma
b3bc327e93 Upgrade antora-ui-spring to .0.4.11. 2024-03-07 17:39:51 +01:00
Olga MaciaszekSharma
1168233716 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	spring-cloud-contract-tools/spring-cloud-contract-converters/src/test/groovy/org/springframework/cloud/contract/verifier/wiremock/WireMockToDslConverterSpec.groovy
2024-03-07 13:49:55 +01:00
Olga MaciaszekSharma
3e915361dc Adjust test to changes in ObjectMapper printing on a newer Jackson version. 2024-03-07 13:49:34 +01:00
Olga MaciaszekSharma
4c9fa392fa Adjust test to changes in ObjectMapper printing on a newer Jackson version. 2024-03-06 20:05:35 +01:00
Olga MaciaszekSharma
1dbdfe85fb Fix versioning. 2024-03-06 19:08:25 +01:00
Olga MaciaszekSharma
d717a0934f Adjust to changes from Boot 3.3. 2024-03-06 18:20:39 +01:00
buildmaster
e7855dad96 Bumping versions 2024-01-31 10:42:01 +00:00
dependabot[bot]
f68952bbe8 Bump testcontainers.version from 1.19.3 to 1.19.4 (#2091)
Bumps `testcontainers.version` from 1.19.3 to 1.19.4.

Updates `org.testcontainers:rabbitmq` from 1.19.3 to 1.19.4
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.19.3...1.19.4)

Updates `org.testcontainers:junit-jupiter` from 1.19.3 to 1.19.4
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.19.3...1.19.4)

---
updated-dependencies:
- dependency-name: org.testcontainers:rabbitmq
  dependency-type: direct:development
  update-type: version-update:semver-patch
- dependency-name: org.testcontainers:junit-jupiter
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-01-26 10:24:26 +01:00
buildmaster
e47f7f89e6 Bumping versions 2024-01-25 10:39:49 +00:00
buildmaster
494f709202 Bumping versions to 4.1.2-SNAPSHOT after release 2024-01-24 12:53:22 +00:00
buildmaster
e029b11175 Going back to snapshots 2024-01-24 12:53:21 +00:00
buildmaster
052d2f7551 Update SNAPSHOT to 4.1.1 2024-01-24 12:45:50 +00:00
Marcin Grzejszczak
c48786ee2c Merge branch '4.0.x' 2024-01-23 14:06:42 +01:00
Marcin Grzejszczak
64d9d90216 Merge branch '3.1.x' into 4.0.x 2024-01-23 13:59:39 +01:00
Marcin Grzejszczak
b53e0bdcee Upgrade plexus to 4.9.1; fixes gh-2089 2024-01-23 13:48:19 +01:00
Marcin Grzejszczak
a29c0222b8 Merge branch '4.0.x' 2024-01-23 13:16:15 +01:00
Marcin Grzejszczak
82a7d6aaf4 Merge branch '3.1.x' into 4.0.x 2024-01-23 13:09:36 +01:00
Marcin Grzejszczak
713fcb4ea7 Upgraded jsonassert to 0.8.0; fixes gh-2088 2024-01-23 12:59:38 +01:00
dependabot[bot]
f141fba8f7 Bump actions/cache from 3 to 4 (#2086)
Bumps [actions/cache](https://github.com/actions/cache) from 3 to 4.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-01-22 10:12:09 +01:00
dependabot[bot]
95afeb5d30 Bump actions/cache from 3 to 4 (#2085)
Bumps [actions/cache](https://github.com/actions/cache) from 3 to 4.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-01-22 10:11:50 +01:00
dependabot[bot]
fee0d275e1 Bump org.apache.maven.plugins:maven-plugin-plugin from 3.10.2 to 3.11.0 (#2083)
Bumps [org.apache.maven.plugins:maven-plugin-plugin](https://github.com/apache/maven-plugin-tools) from 3.10.2 to 3.11.0.
- [Release notes](https://github.com/apache/maven-plugin-tools/releases)
- [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.10.2...maven-plugin-tools-3.11.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-plugin-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-01-12 09:54:45 +01:00
Marcin Grzejszczak
b7ede2135d Merge branch '4.0.x' 2024-01-11 13:33:29 +01:00
Marcin Grzejszczak
8fff4cad6d Merge branch '3.1.x' into 4.0.x 2024-01-11 13:24:41 +01:00
Marcin Grzejszczak
ff3c77b744 Updates Guava to 33.0.0-jre;fixes gh-2082 2024-01-11 13:15:49 +01:00
dependabot[bot]
8506877019 Bump org.apache.maven.plugin-tools:maven-plugin-annotations (#2081)
Bumps [org.apache.maven.plugin-tools:maven-plugin-annotations](https://github.com/apache/maven-plugin-tools) from 3.10.2 to 3.11.0.
- [Release notes](https://github.com/apache/maven-plugin-tools/releases)
- [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.10.2...maven-plugin-tools-3.11.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugin-tools:maven-plugin-annotations
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-01-11 10:50:58 +01:00
dependabot[bot]
ad99102e90 Bump org.apache.maven.plugins:maven-surefire-plugin from 3.2.3 to 3.2.5 (#2080)
Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.2.3 to 3.2.5.
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.2.3...surefire-3.2.5)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-surefire-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-01-10 12:44:40 +01:00
Marcin Grzejszczak
82449c23e8 Merge branch '4.0.x' 2023-12-29 16:04:42 +01:00
Marcin Grzejszczak
48d0531a29 Merge branch '3.1.x' into 4.0.x 2023-12-29 16:00:42 +01:00
Marcin Grzejszczak
d385d67331 Fixed invalid setting of custom port for AutoConfigureWireMock; fixes gh-2074 2023-12-29 16:00:17 +01:00
Marcin Grzejszczak
9967d8c2db Revert "Update pom.xml (#2077)" (#2078)
This reverts commit 631a29faf3.
2023-12-29 10:15:28 +01:00
Jake
631a29faf3 Update pom.xml (#2077)
Update Guava version to 33.0.0-jre
2023-12-29 10:14:48 +01:00
dependabot[bot]
62bee9e256 Bump org.codehaus.plexus:plexus-archiver from 4.9.0 to 4.9.1 (#2075)
Bumps [org.codehaus.plexus:plexus-archiver](https://github.com/codehaus-plexus/plexus-archiver) from 4.9.0 to 4.9.1.
- [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.9.0...plexus-archiver-4.9.1)

---
updated-dependencies:
- dependency-name: org.codehaus.plexus:plexus-archiver
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-12-26 10:48:18 +01:00
buildmaster
98b494aceb Bumping versions 2023-12-22 00:15:53 +00:00
buildmaster
0ccd23f34b Bumping versions to 3.1.10-SNAPSHOT after release 2023-12-19 00:42:24 +00:00
buildmaster
8afe20d7ed Going back to snapshots 2023-12-19 00:42:23 +00:00
buildmaster
165cca53f8 Update SNAPSHOT to 3.1.9 2023-12-19 00:29:09 +00:00
dependabot[bot]
c4bf9df961 Bump github/codeql-action from 2 to 3 (#2072)
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2 to 3.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/v2...v3)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-12-18 10:01:48 +01:00
dependabot[bot]
41f438272b Bump github/codeql-action from 2 to 3 (#2071)
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2 to 3.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/v2...v3)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-12-18 10:01:24 +01:00
dependabot[bot]
87e507a191 Bump camel.version from 3.21.2 to 3.21.3 (#2070)
Bumps `camel.version` from 3.21.2 to 3.21.3.

Updates `org.apache.camel.springboot:camel-spring-boot-starter` from 3.21.2 to 3.21.3

Updates `org.apache.camel:camel-spring` from 3.21.2 to 3.21.3

Updates `org.apache.camel.springboot:camel-spring-boot` from 3.21.2 to 3.21.3

Updates `org.apache.camel.springboot:camel-rabbitmq-starter` from 3.21.2 to 3.21.3

Updates `org.apache.camel.springboot:camel-direct-starter` from 3.21.2 to 3.21.3

Updates `org.apache.camel.springboot:camel-bean-starter` from 3.21.2 to 3.21.3

Updates `org.apache.camel.springboot:camel-jackson-starter` from 3.21.2 to 3.21.3

Updates `org.apache.camel:camel-core` from 3.21.2 to 3.21.3

Updates `org.apache.camel:camel-kafka` from 3.21.2 to 3.21.3

Updates `org.apache.camel:camel-jackson` from 3.21.2 to 3.21.3

Updates `org.apache.camel:camel-jms` from 3.21.2 to 3.21.3

Updates `org.apache.camel:camel-activemq` from 3.21.2 to 3.21.3

---
updated-dependencies:
- dependency-name: org.apache.camel.springboot:camel-spring-boot-starter
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.camel:camel-spring
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.camel.springboot:camel-spring-boot
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.camel.springboot:camel-rabbitmq-starter
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.camel.springboot:camel-direct-starter
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.camel.springboot:camel-bean-starter
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.camel.springboot:camel-jackson-starter
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.camel:camel-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.camel:camel-kafka
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.camel:camel-jackson
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.camel:camel-jms
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.camel:camel-activemq
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-12-18 10:00:50 +01:00
Marcin Grzejszczak
983424b912 Merge branch '4.0.x' 2023-12-14 11:19:40 +01:00
Marcin Grzejszczak
3891ee8111 Removed any references to cloud BOMs; fixes gh-2062 2023-12-14 11:15:16 +01:00
Marcin Grzejszczak
609b48159b Makes jakarta servlet dependency optional
without this change if you use Spring Cloud Contract WireMock with e.g. WebFlux your Spring Boot context can fail to start beacuse of it can't decide whether the application should be reactive or not.

with this change we're making the dependency optional because it should come from the user, we shouldn't be providing it. Also RestDocs are assuming that that dependency is a runtime one

fixes gh-1854
2023-12-14 10:54:42 +01:00