Andy Wilkinson
747e419db1
Merge branch '2.1.x'
2019-02-13 17:45:45 +00:00
Andy Wilkinson
9fb0b97f96
Decorate test containers so tests are skipped without Docker
...
Closes gh-15901
Closes gh-15638
2019-02-13 17:44:45 +00:00
Andy Wilkinson
0adea5a905
Merge branch '2.1.x'
2019-02-12 16:42:15 +00:00
Andy Wilkinson
948bafa4d8
Repackage kotlin-module metadata beneath BOOT-INF/classes
...
Closes gh-15890
2019-02-12 16:41:15 +00:00
Andy Wilkinson
db31e42751
Merge branch '2.1.x'
2019-02-12 09:58:21 +00:00
Andy Wilkinson
a975c0ad16
Use Testcontainers’ CassandraContainer rather than our own
...
Closes gh-15901
2019-02-12 09:58:05 +00:00
Andy Wilkinson
7e51e1a076
Merge branch '2.1.x'
2019-02-12 09:26:59 +00:00
Michael Simons
316126e8f0
Replace custom Neo4j container with Testcontainers version
...
See gh-15638
2019-02-12 09:24:44 +00:00
Andy Wilkinson
2cda30988e
Merge branch '2.1.x'
2019-02-11 16:00:55 +00:00
Andy Wilkinson
6fe9e3a0e1
Test the Gradle plugin against Gradle 5.2.1
...
Closes gh-15892
2019-02-11 15:51:14 +00:00
Andy Wilkinson
4faa0f51b7
Polish "Test the Gradle plugin against Gradle 4.10.3 and 5.1.1"
...
Closes gh-15791
2019-02-11 15:49:59 +00:00
dreis2211
1de372d896
Test the Gradle plugin against Gradle 4.10.3 and 5.1.1
...
See gh-15791
2019-02-11 15:35:06 +00:00
Andy Wilkinson
b3abd25e22
Merge branch '2.1.x'
2019-02-05 11:11:07 +00:00
Andy Wilkinson
8a7958ef55
Do not use reflection to fall back to JDKs jar URLStreamHandler
...
Closes gh-15844
2019-02-05 10:59:32 +00:00
Andy Wilkinson
342bced125
Merge branch '2.1.x'
2019-02-01 13:48:02 +00:00
Andy Wilkinson
2650a07dc9
Leave module-info.class in root of archive when repackaging
...
Closes gh-15810
2019-02-01 13:47:42 +00:00
dreis2211
d4ab101223
Use Assertions.contentOf() where possible
...
Closes gh-15793
2019-01-28 10:08:57 +01:00
Stephane Nicoll
6baa6b291e
Polish contribution
...
Closes gh-15695
2019-01-14 08:11:20 -05:00
Johnny Lim
af3ed9ff9f
Polish
...
See gh-15695
2019-01-14 08:09:32 -05:00
Stephane Nicoll
8d1d3fb087
Polish "Avoid string concatenation inside StringBuilder append()"
...
Closes gh-15589
2019-01-11 08:30:12 +01:00
igor-suhorukov
59ac85d371
Avoid string concatenation inside StringBuilder append()
...
See gh-15589
2019-01-11 08:28:19 +01:00
dreis2211
46e59503ec
Use JSONObject.putOpt in JsonConverter
...
Closes gh-15595
2019-01-02 09:48:35 +01:00
Stephane Nicoll
51936e1a5c
Rename "agent" to "agents" to properly indicate its type
...
Closes gh-15455
2018-12-31 09:50:35 +01:00
igor-suhorukov
3eb2f5e476
Replace Collections sort with list sort() method
...
Closes gh-15585
2018-12-30 09:52:05 +01:00
Stephane Nicoll
1223355fe6
Polish "Simplify code by using for-each loop"
...
Closes gh-15563
2018-12-25 09:59:41 +01:00
igor-suhorukov
dfb3cd51bc
Simplify code by using for-each loop
...
See gh-15563
2018-12-25 09:58:42 +01:00
Stephane Nicoll
fbef9700bf
Merge branch '2.1.x'
2018-12-24 16:39:47 +01:00
Erik Mulder
00763af335
Fix system properties override example
...
Closes gh-15562
2018-12-24 16:39:20 +01:00
igor-suhorukov
b370b1f03a
Replace indexOf() with a call to the contains()
...
See gh-15559
2018-12-24 09:52:15 +01:00
Andy Wilkinson
372b6605b3
Merge branch '2.1.x'
2018-12-21 15:32:31 +00:00
Andy Wilkinson
83ce5dcee8
Add missing task output annotations to BootJar and BootWar
...
Closes gh-15488
2018-12-21 15:32:04 +00:00
igor-suhorukov
cbf6b330ba
Simplify code by using Map computeIfAbsent
...
Closes gh-15543
2018-12-21 11:12:56 +01:00
Stephane Nicoll
c948bdd14d
Merge branch '2.1.x'
2018-12-20 17:59:46 +01:00
Stephane Nicoll
51d3626c3b
Merge branch '2.0.x' into 2.1.x
2018-12-20 17:59:33 +01:00
dreis2211
27e89bbb8a
Optimize StringSequence
...
Closes gh-15473
2018-12-20 17:55:30 +01:00
Andy Wilkinson
0ad72d5b5e
Remove reliance on mavenLocal from Gradle plugin’s tests
...
See gh-15471
2018-12-18 11:41:51 +00:00
Andy Wilkinson
4edc32844a
Remove use of execute method inherited from internal class
...
Closes gh-15484
2018-12-17 17:33:20 +00:00
Stephane Nicoll
317c4c2c38
Merge branch '2.1.x'
2018-12-17 18:26:56 +01:00
Stephane Nicoll
7dbe70dc61
Merge branch '2.0.x' into 2.1.x
2018-12-17 18:26:36 +01:00
Stephane Nicoll
c0b07a9429
Polish "Fix StringSequence.equals() for different lengths"
...
Closes gh-15465
2018-12-17 18:24:08 +01:00
dreis2211
2a0680c2ba
Fix StringSequence.equals() for different lengths
...
See gh-15465
2018-12-17 18:20:09 +01:00
Andy Wilkinson
ddabfe3fcc
Deploy spring-boot-test-support so it's available downstream
...
Concourse builds spring-boot-tests separately from spring-boot-project
and relies on modules from the latter being available in the
distribution repository when building the former. This commit enables the
deployment of spring-boot-test-support from spring-boot-project so that it
is added to the distribution repository and is therefore available when
building spring-boot-tests. It is then excluded when putting to the
Artifactory resource as we do not want it to be published.
See gh-15471
2018-12-14 19:50:23 +00:00
Andy Wilkinson
61d04db0d7
Minimize and centralize assumptions about build output
...
Closes gh-15471
2018-12-14 17:50:20 +00:00
Andy Wilkinson
62fbf48446
Start Elasticsearch with single-node discovery type
...
See gh-15441
2018-12-12 21:02:28 +00:00
Andy Wilkinson
47fc35105d
Allow more time for the Elasticsearch container to start
...
See gh-15441
2018-12-12 19:41:30 +00:00
Andy Wilkinson
2b453bbb16
Minimise dependencies on Log4j2
...
Closes gh-15441
2018-12-12 08:19:34 +00:00
Andy Wilkinson
bbf0932f0f
Exclude jcl-over-slf4j in favour of spring-jcl
...
Closes gh-15392
2018-12-07 15:37:24 +00:00
Stephane Nicoll
ef40241bf6
Merge branch '2.0.x' into 2.1.x
2018-12-05 15:56:04 +01:00
dreis2211
d864b427eb
Remove unused ByteArrayStartsWith matcher
...
Closes gh-15386
2018-12-05 15:52:42 +01:00
Andy Wilkinson
72ad0cc6be
Merge branch '2.0.x' into 2.1.x
2018-12-03 12:15:36 +00:00