Commit Graph

4220 Commits

Author SHA1 Message Date
Marcin Grzejszczak
c04b110fe2 Merge branch '3.1.x' 2023-04-26 15:05:50 +02:00
Marcin Grzejszczak
b1f2d1f4a5 Does not include namespaces in body parsing
this PR iterates over child element nodes and checks for namespace attributes

Co-authored-by: @bensonbenny021 (https://github.com/spring-cloud/spring-cloud-contract/pull/1870)

fixes gh-1709
2023-04-26 15:05:40 +02:00
Marcin Grzejszczak
317aa651eb Merge branch '3.1.x' 2023-04-26 14:03:29 +02:00
Marcin Grzejszczak
a2444550d5 Does not do JSON assertions for byte payloads
without this change we're doing json assertions for payload that should read payloads as bytes

this is a workaround around the issues like https://github.com/spring-cloud/spring-cloud-contract/issues/1701 and https://github.com/spring-cloud/spring-cloud-contract/issues/1627 .

The problem is that due to the fact that we accept GString payloads where you can have complex json structures with consumer / producer parts, we are doing recursive analysis of that json structure. We're parsing the keys and values and then we're creating the final Json payload map. The issue is that sometimes the value is actually textual json which we shouldn't parse. We don't know that when the processing happens.

The workaround is about telling the framework to read the payload from a file as bytes and then simple equality check will happen without additional JSON assertions.

We will need to look into some better fixes for that in the future (e.g. 5.0.0).

fixes gh-1627
fixes gh-1701
2023-04-26 14:03:18 +02:00
Marcin Grzejszczak
548555484c Merge branch '3.1.x' 2023-04-26 12:58:31 +02:00
Benedict Roeser
ee52a9f6ae Do not escape quotes in IllegalStateException (#1895)
Now relativePath is logged correctly when resource is null.

fixes #1894
2023-04-26 12:58:07 +02:00
Marcin Grzejszczak
74f0841b14 Merge branch '3.1.x' 2023-04-20 16:11:14 +02:00
Marcin Grzejszczak
fe092b8981 Trying to fix gradle javadocs issues 2023-04-20 16:11:05 +02:00
geirhede
ccabfb3dec Improving observability when debugging broken wiremock configurations (#1891) 2023-04-20 13:02:56 +02:00
Shannon Pamperl
81e3d65346 Use Gradle JVM Test Suite Plugin (#1887)
* Upgrade to Gradle 7.6.1
* Use JVM Test Suite plugin

fixes gh-1863
2023-04-18 10:14:20 +02:00
Wallace Wadge
75b1fb663d Adds some supporting documentation regarding overriding the priority field and a custom DSL template. (#1883)
Fixes gh-1818

Co-authored-by: Wallace Wadge <wallace.wadge@gamesysgroup.com>
2023-04-06 11:43:38 +02:00
Wallace Wadge
e4d19d8e9b Adds support to specify priority and allow for template override (#1882)
* Adds support to specify priority and make it possible to override the snippet template

Fixes gh-1818

* Adds support to specify priority and make it possible to override the snippet template

Fixes gh-1818

---------

Co-authored-by: Wallace Wadge <wallace.wadge@gamesysgroup.com>
2023-04-06 10:05:50 +02:00
buildmaster
0d9669f5a0 Bumping versions 2023-03-30 14:32:55 +00:00
Olga Maciaszek-Sharma
0fa9028b14 Revert "Disable deploy profile"
This reverts commit b000f6fdc3.
2023-03-29 19:33:44 +02:00
buildmaster
15d412f5cf Bumping versions to 4.0.3-SNAPSHOT after release 2023-03-28 18:48:26 +00:00
buildmaster
28533c4d2d Going back to snapshots 2023-03-28 18:48:25 +00:00
buildmaster
0d7932b3ed Update SNAPSHOT to 4.0.2 2023-03-28 18:38:09 +00:00
Ryan Baxter
b000f6fdc3 Disable deploy profile 2023-03-28 14:18:37 -04:00
Ryan Baxter
90af76ddf4 Disable Docker build 2023-03-28 13:20:17 -04:00
Nikola Kološnjaji
5343cb9b35 Relaxed SSL validation with RestTemplate interceptors (#1869)
* Relaxed SSL validation with RestTemplate interceptors

* Formatting

* Checkstyle

fixes #1868
2023-03-21 15:18:19 +01:00
buildmaster
bb2e0d14c8 Bumping versions 2023-03-15 00:17:29 +00:00
Marcin Grzejszczak
05b3ee7113 Merge branch '3.1.x' 2023-03-14 13:39:41 +01:00
Daniel Frey
7bf491c41e allow sendMessage to handle body from file (#1867)
* allow sendMessage to handle body from file

- add test for populating `bodyFromFileAsBytes`
- update `StubRunnerExecutor` to handle more than just json payloads

cherry picked changes from bugfix/1864
take 2

fixes #1864

* wrap bodyextractor value in jsonoutput, add tests for of file content types

cherry picked from bugfix/1864

#1864
2023-03-14 13:01:28 +01:00
Marcin Grzejszczak
5f14f230d1 Merge branch '3.1.x' 2023-03-09 16:32:44 +01:00
Arseny Feytullaev
77b05b6a16 Fixes gh-1876 (#1877) 2023-03-09 16:06:47 +01:00
Marcin Grzejszczak
07bb994bed Merge branch '3.1.x' 2023-03-02 11:20:04 +01:00
Arseny Feytullaev
622aef7bd2 Fixes gh-1873 (#1874)
Co-authored-by: Фейтуллаев Арсений Валерьевич <avafeytullaev@sberbank.ru>
2023-03-02 11:19:17 +01:00
buildmaster
8cc13c6912 Bumping versions 2023-02-26 00:18:16 +00:00
buildmaster
bb2d98b6cd Bumping versions to 3.1.7-SNAPSHOT after release 2023-02-24 01:52:55 +00:00
buildmaster
8b6d1c61db Going back to snapshots 2023-02-24 01:52:54 +00:00
buildmaster
6f14ccc597 Update SNAPSHOT to 3.1.6 2023-02-24 01:28:32 +00:00
Olga Maciaszek-Sharma
e90d9a73a2 Fix copying deps during docker image creation. 2023-02-23 14:34:47 +01:00
Marcin Grzejszczak
33a301ac0f Merge branch '3.1.x' 2023-02-20 13:58:34 +01:00
_NewAge
775f61d0ee Attach up-to-date stubs to maven (#1871)
* Move PluginUnitTest into integration-test phase

* Fix test resources

Contracts that used messageFrom, messageBody, messageHeaders were modified to use triggeredBy input as seen in 1999066c5a

* Attach stubs to maven project even when they are up-to-date; fixes gh-1860
2023-02-20 13:57:51 +01:00
_NewAge
d4967d8607 Attach up-to-date stubs to maven (#1871)
* Move PluginUnitTest into integration-test phase

* Fix test resources

Contracts that used messageFrom, messageBody, messageHeaders were modified to use triggeredBy input as seen in 1999066c5a

* Attach stubs to maven project even when they are up-to-date; fixes gh-1860
2023-02-20 13:57:24 +01:00
Olga Maciaszek-Sharma
65b463e487 Remove unnecessary build property. 2023-02-13 13:34:07 +01:00
Olga Maciaszek-Sharma
d7611ffee4 Fix docker image creation. 2023-02-13 13:27:56 +01:00
buildmaster
3c9e17d26b Bumping versions 2023-02-09 14:21:19 +00:00
Ryan Baxter
e8952d43f1 Revert "Revert "Revert "Skipping docker for GA releases"""
This reverts commit 44fc4eb065.
2023-01-26 11:42:27 -05:00
buildmaster
2897b6a047 Bumping versions to 4.0.2-SNAPSHOT after release 2023-01-25 19:41:26 +00:00
buildmaster
7d10feed4c Going back to snapshots 2023-01-25 19:41:25 +00:00
buildmaster
37f5bf3f70 Update SNAPSHOT to 4.0.1 2023-01-25 19:30:21 +00:00
Ryan Baxter
44fc4eb065 Revert "Revert "Skipping docker for GA releases""
This reverts commit f4d06e5753.
2023-01-25 13:43:03 -05:00
buildmaster
251c1e91ee Bumping versions 2023-01-20 14:21:42 +00:00
Marcin Grzejszczak
8b5b3ab6cb Updated versions 2023-01-19 16:35:24 +01:00
buildmaster
ae689f3e51 Bumping versions 2022-12-21 00:19:11 +00:00
buildmaster
527255b91c Bumping versions 2022-12-20 14:21:32 +00:00
Olga Maciaszek-Sharma
6ad6b63263 Restore docker setup. Fix test. (#1857) 2022-12-20 13:22:34 +01:00
spencergibb
925c663cf4 Updates spring-boot to 3.0.1-SNAPSHOT 2022-12-19 16:58:13 -05:00
Marcin Grzejszczak
4e484cdd8a Revert "Temporarilly removes gradle plugin publishing"
This reverts commit aedf56c6
2022-12-16 17:01:48 +01:00