Commit Graph

3290 Commits

Author SHA1 Message Date
Marcin Grzejszczak
7f5ad5afee Forcing kotlin to be in 1.3.31 2019-08-30 14:47:54 +02:00
Alican Akkus
06315cf9af fixes: #1160 2019-08-30 12:53:37 +03:00
Marcin Grzejszczak
609b9e3b7d Requires kotlin to be explicitly provided; fixes gh-1189 2019-08-30 10:53:53 +02:00
Marcin Grzejszczak
1e69c7b569 Merge branch '2.1.x' 2019-08-30 10:26:12 +02:00
Marcin Grzejszczak
b253a45bbe Bumps jgit; fixes gh-1190 2019-08-30 10:26:02 +02:00
Marcin Grzejszczak
551ede93fd Merge branch '2.1.x' 2019-08-30 10:08:28 +02:00
Marcin Grzejszczak
111847d91a Migrated old jersey lib 2019-08-30 10:07:50 +02:00
Marcin Grzejszczak
c2f9e3fe85 Added the explicit version for jersey 2019-08-30 09:53:00 +02:00
Marcin Grzejszczak
77866858ec Bumped commons-beanutils; fixes gh-1178 2019-08-30 09:48:55 +02:00
Marcin Grzejszczak
395656bbc2 Bumped commons-beanutils; fixes gh-1178 2019-08-30 09:47:43 +02:00
Marcin Grzejszczak
00c2ab9c75 Bumped Kotlin 2019-08-29 17:20:55 +02:00
Marcin Grzejszczak
edf463d715 Fixed the samples 2019-08-28 16:05:52 +02:00
Marcin Grzejszczak
2098e81ece Removed a handful of samples 2019-08-28 15:13:06 +02:00
anatoliy-balakirev
d4740706f0 Replace custom caching with Gradle's incremental build (#1187)
Replaced custom caching of the downloaded contracts with Gradle's
incremental build. After that `InitContractsTask` is not needed any
more, as its main purpose was to be a bridge between custom caching
and Gradle's one. Simplified code to download contracts is now part of
the `ContractsCopyTask`.
Also fixed `PublishStubsToScmTask` and removed incremental stuff from
there for now.

Fixes gh-1133
2019-08-28 13:13:56 +02:00
Marcin Grzejszczak
cdb93f178b Trying to fix circle 2019-08-28 10:50:26 +02:00
Marcin Grzejszczak
bc28ec453e Added the missing methods (for backward compatibility) 2019-08-28 10:33:11 +02:00
Marcin Grzejszczak
f14690a330 Trying to fix circle 2019-08-28 10:28:47 +02:00
Marcin Grzejszczak
a68a519798 Trying to fix circle 2019-08-28 10:19:22 +02:00
Marcin Grzejszczak
0d0856dd5e Improved circle build 2019-08-28 10:13:21 +02:00
anatoliy-balakirev
e54fe375b0 Disable broken incremental build for InitContractsTask (#1186)
With current implementation of the `GradleContractsDownloader`, where
we have custom caching, `InitContractsTask` doesn't really need to be
incremental. Moreover, there is an issue in current implementation of
the `InitContractsTask`: it doesn't mark itself as out of date when
dynamic dependency is used (`+` or `SNAPSHOT` version). So for now just
disabling incremental build for that task.

Also restored old behaviour, where we used to always use `".*"` pattern
to define included contracts for `GenerateServerTests` task.

Also fixed minor logging issue.

Fixes gh-1133
2019-08-27 13:33:15 +02:00
Olga Maciaszek-Sharma
2439aab723 Modify gradle_opts.
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek@gmail.com>
2019-08-27 13:12:07 +02:00
Olga Maciaszek-Sharma
121dd3a149 Set java tool options.
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek@gmail.com>
2019-08-24 00:09:26 +02:00
Olga Maciaszek-Sharma
c8cb9d299f Set java tool options.
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek@gmail.com>
2019-08-23 23:30:53 +02:00
Olga Maciaszek-Sharma
5a81ce4b75 Change xmx for maven.
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek@gmail.com>
2019-08-23 23:15:13 +02:00
Olga Maciaszek-Sharma
4cd1207671 Change xmx for maven.
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek@gmail.com>
2019-08-23 23:05:48 +02:00
Olga Maciaszek-Sharma
f0bcde7959 Change xmx for maven.
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek@gmail.com>
2019-08-23 21:49:08 +02:00
Olga Maciaszek-Sharma
3a12fd67bc Fix xmx for maven.
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek@gmail.com>
2019-08-23 21:42:18 +02:00
Olga Maciaszek-Sharma
9c68688566 Change xmx for maven.
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek@gmail.com>
2019-08-23 21:39:37 +02:00
Olga Maciaszek-Sharma
158134c29a Change xmx for maven.
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek@gmail.com>
2019-08-23 20:12:45 +02:00
Olga Maciaszek-Sharma
3b852a4daf Change xmx for maven.
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek@gmail.com>
2019-08-23 20:06:34 +02:00
Olga Maciaszek-Sharma
f42686ccdb Change xmx for maven.
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek@gmail.com>
2019-08-23 20:05:58 +02:00
Olga Maciaszek-Sharma
a24c7a098c Change xms for maven.
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek@gmail.com>
2019-08-23 19:54:18 +02:00
Olga Maciaszek-Sharma
6a803fce81 Change xmx.
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek@gmail.com>
2019-08-23 18:07:07 +02:00
Olga Maciaszek-Sharma
1880bd95ea Change xmx.
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek@gmail.com>
2019-08-23 17:32:12 +02:00
Olga Maciaszek-Sharma
afd4fb44da Merge remote-tracking branch 'origin/master' 2019-08-23 16:57:54 +02:00
Olga Maciaszek-Sharma
7799e7c789 Different heap for maven and gradle.
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek@gmail.com>
2019-08-23 16:57:42 +02:00
Marcin Grzejszczak
ea2d6b6580 Merge branch '2.1.x' 2019-08-23 16:41:33 +02:00
Rad
347f0a7a92 GH-1180 inject project file name (#1183) 2019-08-23 16:08:48 +02:00
Olga Maciaszek-Sharma
a487b3b449 Raise xmx for circle.
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek@gmail.com>
2019-08-23 15:53:25 +02:00
Olga Maciaszek-Sharma
dcd239f209 Raise xmx for circle.
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek@gmail.com>
2019-08-23 15:11:39 +02:00
Marcin Grzejszczak
0ec0234470 Throwing an exception only when contract folder is empty AND there is no contract repository URL set 2019-08-23 14:02:13 +02:00
Olga Maciaszek-Sharma
8826cc1252 Deprecate TestFrameworkDefinition.
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek@gmail.com>
2019-08-23 12:28:47 +02:00
Olga Maciaszek-Sharma
bb57287eb9 Merge branch '2.1.x'
# Conflicts:
#	spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/config/framework/TestNGDefinition.groovy
#	spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/SingleTestGeneratorSpec.groovy
2019-08-23 12:20:00 +02:00
Olga Maciaszek-Sharma
60809445ff Add test scenarios to JUnit5. Fixes gh-887. (#1177) 2019-08-20 16:09:16 +02:00
Olga Maciaszek-Sharma
a336f6b38f Merge branch '2.1.x'
# Conflicts:
#	docs/src/main/asciidoc/verifier_contract.adoc
2019-08-19 16:35:46 +02:00
Olga Maciaszek-Sharma
da107bc27c Fixes gh-1174. 2019-08-19 16:32:50 +02:00
Olga Maciaszek-Sharma
8e44c3a9e2 Fix test. 2019-08-19 14:49:21 +02:00
Olga Maciaszek-Sharma
abe12c7727 Merge branch '2.1.x' 2019-08-19 13:09:34 +02:00
Olga Maciaszek-Sharma
be00f6cee2 Recognise arrays by regex and not only [*] literal. (#1172)
* Recognise arrays by regex and not only `[*]` literal.
Fixes gh-1091.

* Add test.

* Fix getting index of last matched groups.
2019-08-19 13:07:58 +02:00
Marcin Grzejszczak
d98627a5a4 Fixed invalid API call in Gradle for Kotlin 2019-08-19 11:15:44 +02:00