332 Commits

Author SHA1 Message Date
Olga Maciaszek-Sharma
b61a1938b7 Upgrade to 5.0.0-SNAPSHOT. Adjust to changes in Framework.
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>
2025-06-10 19:36:25 +02:00
spencergibb
c09dc87020 Updates version to 5.0.0-SNAPSHOT
Updates for framework 7
2025-06-06 20:36:21 -04:00
spencergibb
011719228a Updates for checkstyle 2024-10-23 17:53:41 -04:00
Olga Maciaszek-Sharma
08c3a742de Move off incompatible Base64Utils. 2024-08-08 12:50:09 +02:00
buildmaster
8e36e70981 Bumping versions 2024-07-24 11:09:28 +00: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
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
Marcin Grzejszczak
ebac7f176c 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:52:30 +01:00
Marcin Grzejszczak
981be7859a Fixed checkstye 2023-12-04 16:08:05 +01:00
Marcin Grzejszczak
08e0e305ce Fixed checkstye 2023-12-04 15:22:52 +01:00
Igor Dianov
d5bd388b10 Fix GH-2035 AutoConfigureWiremock with a pre-defined custom port always defaults to port 8080 (#2036) 2023-12-04 13:03:06 +01:00
Marcin Grzejszczak
88c4c4cf92 Merge branch '3.1.x' into 4.0.x 2023-09-26 15:22:04 +02:00
Paulius Paplauskas
0ca1a20940 Use prepareTestInstance phase instead of beforeTestClass phase (#1996)
* use prepareTestInstance phase instead of beforeTestClass phase to check wiremock config

* code style changes
2023-09-26 15:21:16 +02:00
Marcin Grzejszczak
44c634d0e9 Fixed logging issues in WireMock
- created our own version of Slf4jNotifier that uses our Slf4j setup
- fixes for sc-wiremock and sc-stub-runner modules

fixes gh-1916
2023-09-05 18:55:49 +02:00
Marcin Grzejszczak
b1eba33ca9 Merge branch '3.1.x' into 4.0.x 2023-09-04 18:35:22 +02:00
Marcin Grzejszczak
a15db490f1 Defaults the WireMock server port to 8080; fixes gh-1920 2023-09-04 18:32:32 +02:00
Marcin Grzejszczak
fc8389dfed Merge branch '3.1.x' into 4.0.x 2023-06-15 16:13:39 +02:00
Marcin Grzejszczak
ab9d7f5616 Using different fixed ports 2023-06-15 16:12:59 +02:00
geirhede
ccabfb3dec Improving observability when debugging broken wiremock configurations (#1891) 2023-04-20 13:02:56 +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
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
Marcin Grzejszczak
1083d70e83 Updated libs in shade; fixed disabled tests 2022-11-14 13:40:12 +01:00
Marcin Grzejszczak
96f8d2db5c Fixed RestDocs setup 2022-10-18 10:30:29 +02:00
Marcin Grzejszczak
dc43d2766c Upgraded WireMock to 2.34.0 2022-10-18 10:29:46 +02:00
Marcin Grzejszczak
17bc150dba Fixed missing imports 2022-09-23 10:42:58 +02:00
Marcin Grzejszczak
9bf05e401b Merge branch '3.1.x' 2022-09-01 12:49:33 +02:00
Marcin Grzejszczak
847562926a Updated code to remove checkstyle issues 2022-09-01 12:49:06 +02:00
Marcin Grzejszczak
bc6742b67e Merge branch 'jhh992000-3.0.x' into 3.1.x 2022-09-01 12:04:58 +02:00
Huneea
0047ae451d test: add test case - find stub file in jar 2022-09-01 04:11:45 +09:00
Huneea
51045cc97e fix: Fixed an issue that could not find a resources in the jar file
- Issues that occur when executing jar
2022-08-31 01:39:50 +09:00
Leandro Quiroga
11c357718f Javadoc fixed (#1810)
WireMockSpring.config() replaced by WireMockSpring.options()
2022-08-17 15:43:46 +02:00
Marcin Grzejszczak
5a075d1f55 Trying to fix the build 2022-07-22 09:35:05 +02:00
Marcin Grzejszczak
27ec2f9874 Trying to fix the buikd 2022-07-21 16:37:39 +02:00
Marcin Grzejszczak
c4596d726f Merge branch '3.1.x' 2022-06-27 17:58:44 +02:00
Marcin Grzejszczak
4d86751b26 Merge branch '3.0.x' into 3.1.x 2022-06-27 17:58:29 +02:00
Marcin Grzejszczak
7d8ea60344 Fixed the changed relative path calculation 2022-06-27 17:58:20 +02:00
Marcin Grzejszczak
2a2dd92412 Merge branch '3.1.x' 2022-06-20 17:00:51 +02:00
Marcin Grzejszczak
60be47be07 Merge branch '3.0.x' into 3.1.x 2022-06-20 17:00:02 +02:00
huneea
5f5a2c93bc fix: support multiple stubs files directories (bug fix) (#1801)
* fix: support multiple stubs files directories (bug fix)

- fix methods
  - ResourcesFileSource - child()
  - ResourcesFileSource - getBinaryFileNamed()
- add test case.
- add test stubs files.

* style: change import order

* style: apply checkstyle and add license header.
2022-06-20 16:53:43 +02:00
Marcin Grzejszczak
2cba1832ad Merge branch '3.1.x' 2022-05-23 11:58:01 +02:00
Marcin Grzejszczak
2a66444afb Uses RA 5.0.2-SNAPSHOT 2022-05-23 11:53:33 +02:00
devdufutur
e59725326a Fixed relative URL computation in wIthoutBaseUrl (#1785)
* Fixed relative URL computation in wIthoutBaseUrl

Current behaviour :
* base URL = http://foo.bar
* url = http://foo.bar/my/api
gives => my/api

Fixed behaviour : 
* base URL = http://foo.bar
* url = http://foo.bar/my/api
gives => /my/api

* Fixed & Added urlPathMatching related tests

Fixed false positive test getWithUrlPathMatching() (now fails without commit f9c9527f89e36ba5b4f5b00fc5895c8df78062e2 and pass after), and added 2 tests to ensure leading slash in urlPathPattern or trailing slash in base URL works fine.

Co-authored-by: Rudy Nappee <rudy.nappee@externe.maif.fr>
2022-05-18 09:37:58 +02:00
Marcin Grzejszczak
adc513b45b Bumped RestAssured to 6.0.0 2022-05-04 14:35:24 +02:00
spencergibb
21a60b8f0d Updates to use new TestSocketUtils from spring-cloud-test-support 2022-03-11 13:27:45 -05:00
Marcin Grzejszczak
a865057d6d Should work without tests 2022-01-27 12:45:44 +01:00
spencergibb
173f4c4caa formatting 2022-01-26 16:44:43 -05:00
Marcin Grzejszczak
1bedfd188e Makes the code compile 2022-01-18 10:38:46 +01:00
Marcin Grzejszczak
6fd4280d12 Removed deprecations 2021-11-16 22:59:15 +01:00