Stephane Nicoll
7b191bb9ed
Merge branch '2.0.x'
2018-08-08 14:47:16 +02:00
Stephane Nicoll
21691f0b20
Merge branch '1.5.x' into 2.0.x
2018-08-08 14:46:55 +02:00
Stephane Nicoll
143e4f026f
Merge branch '2.0.x'
2018-08-01 08:48:09 +02:00
dreis2211
66b1742f96
Optimize some StringBuilder.append() calls
...
Closes gh-13961
2018-08-01 08:41:03 +02:00
Phillip Webb
1b91c0ceb7
Merge branch '2.0.x'
2018-07-29 09:29:57 +01:00
Phillip Webb
0ec22c8bf9
Polish copyright date on changed files
2018-07-29 09:29:29 +01:00
Phillip Webb
80da9cf5eb
Merge branch '2.0.x'
2018-07-29 09:28:56 +01:00
Phillip Webb
aeb885192e
Polish ternary expressions
2018-07-29 09:24:46 +01:00
Phillip Webb
ce9c053cbf
Fix checkstyle issues on master
...
Fix checkstyle issues following 2.0.x merge and
spring-javaformat upgrade.
See gh-13932
2018-07-28 01:36:04 +01:00
Phillip Webb
a6c9c92f2e
Merge branch '2.0.x'
2018-07-28 01:35:43 +01:00
Phillip Webb
63b609827e
Fix checkstyle method order issues
...
Fix checkstyle issues with method ordering following the
spring-javaformat upgrade.
See gh-13932
2018-07-28 01:11:53 +01:00
Phillip Webb
e6a68b39a3
Fix checkstyle javadoc issues
...
Fix checkstyle issues in javadoc following the spring-javaformat
upgrade.
See gh-13932
2018-07-28 01:11:52 +01:00
Phillip Webb
7fc455654a
Fix checkstyle ternary issues
...
Fix checkstyle issues with ternary expressions following the
spring-javaformat upgrade.
See gh-13932
2018-07-28 01:11:52 +01:00
Phillip Webb
ec1100a896
Upgrade to spring-javaformat 0.0.6
...
Closes gh-13932
2018-07-28 01:11:48 +01:00
Phillip Webb
cddd794a07
Polish
2018-07-28 00:05:25 +01:00
Andy Wilkinson
1852ecc444
Merge branch '2.0.x'
2018-07-19 19:59:08 +01:00
Andy Wilkinson
de7899fba4
Improve reliability by give Cassandra more time and attempts to start
2018-07-19 19:57:54 +01:00
Andy Wilkinson
147a08eb4c
Merge branch '2.0.x'
2018-07-18 13:47:31 +01:00
Andy Wilkinson
b9ad0d9992
Test the Gradle plugin against Gradle 4.8.1 instead of 4.8
...
Closes gh-13809
2018-07-18 13:34:27 +01:00
Andy Wilkinson
8deea933b9
Test the Gradle plugin against Gradle 4.9
...
Closes gh-13808
2018-07-18 13:33:39 +01:00
Stephane Nicoll
b7274966c4
Merge branch '2.0.x'
2018-07-16 14:12:36 +02:00
Stephane Nicoll
ffe994335e
Merge branch '1.5.x' into 2.0.x
2018-07-16 14:12:16 +02:00
Stephane Nicoll
d17d6374f0
Merge branch '2.0.x'
2018-07-13 09:27:44 +02:00
Stephane Nicoll
174cc2bc4e
Merge branch '1.5.x' into 2.0.x
2018-07-13 09:25:42 +02:00
Stephane Nicoll
8fc1e0ed4e
Merge branch '2.0.x'
2018-07-13 07:55:59 +02:00
dreis2211
ac8eebfbad
Fix typos
...
Closes gh-13762
2018-07-13 07:54:03 +02:00
Andy Wilkinson
918191664a
Merge branch '2.0.x'
2018-07-09 13:39:30 +01:00
Andy Wilkinson
9eb5c9bd18
Merge branch '1.5.x' into 2.0.x
2018-07-09 13:39:11 +01:00
Andy Wilkinson
45fdf2ffa4
Support Tomcat 9 and Undertow 2
...
Closes gh-11749
Closes gh-12243
2018-06-28 11:33:30 +01:00
Andy Wilkinson
a097f923c1
Provide sensible defaults for launch script properties when using Gradle
...
Closes gh-4458
2018-06-22 13:08:44 +01:00
Stephane Nicoll
d4d169277d
Merge branch '2.0.x'
2018-06-21 09:23:43 +02:00
Stephane Nicoll
9e9e746554
Merge branch '1.5.x' into 2.0.x
2018-06-21 09:17:05 +02:00
Andy Wilkinson
c12f8298e6
Merge branch '2.0.x'
2018-06-19 20:06:58 +01:00
Andy Wilkinson
814e90805e
Merge branch '1.5.x' into 2.0.x
2018-06-19 20:06:44 +01:00
Stephane Nicoll
60b109cf0c
Merge branch '2.0.x'
2018-06-15 13:38:29 +02:00
Johnny Lim
f34fb5f1ee
Reduce object creation in findMatchingItemMetadata()
...
Closes gh-13473
2018-06-15 13:36:55 +02:00
Andy Wilkinson
5bd9a445ae
Merge branch '2.0.x'
2018-06-08 18:09:00 +01:00
Andy Wilkinson
6f2171c282
Improve error message when BootJar or BootWar has no known main class
...
Closes gh-12712
2018-06-08 18:07:24 +01:00
Phillip Webb
e0ae805924
Update copyright header
2018-06-05 17:45:09 -07:00
Andy Wilkinson
0f321abe66
Merge branch '2.0.x'
2018-06-04 17:53:50 +01:00
Andy Wilkinson
70c0d6a005
Test the Gradle plugin against Gradle 4.8
...
Closes gh-13359
2018-06-04 17:53:34 +01:00
Andy Wilkinson
00449bef6a
Use app…DefaultJvmArgs as convention for start script's defaultJvmOpts
...
Closes gh-12631
2018-06-04 17:53:34 +01:00
Andy Wilkinson
b38f60a631
Merge branch '2.0.x'
2018-06-04 16:40:06 +01:00
Andy Wilkinson
d54072e0a8
More accurately document buildInfo's effect on up-to-date checking
...
Closes gh-13152
2018-06-04 16:39:59 +01:00
Stephane Nicoll
bc47bf44a9
Merge branch '2.0.x'
2018-06-01 09:26:29 +02:00
Johnny Lim
6b0ce46491
Polish
...
Closes gh-13320
2018-06-01 09:22:20 +02:00
Phillip Webb
92b9b234f1
Merge branch '2.0.x'
2018-05-30 22:53:33 -07:00
Phillip Webb
3751968ecd
Add missing ExpectedException rule
...
Add ExpectedException rule which was missed from the 1.5.x merge.
2018-05-30 22:52:25 -07:00
Phillip Webb
cf27917e86
Merge branch '2.0.x'
2018-05-30 20:30:38 -07:00
Phillip Webb
bdd541b2cc
Merge branch '1.5.x' into 2.0.x
2018-05-30 20:29:03 -07:00
Phillip Webb
5ae061f491
Merge branch '1.5.x' into 2.0.x
2018-05-30 20:27:19 -07:00
Phillip Webb
40800355c7
Merge branch '2.0.x'
2018-05-30 12:41:48 -07:00
Phillip Webb
09fa1e7e11
Polish
2018-05-30 12:12:01 -07:00
Johnny Lim
de01e7aad4
Polish
...
See gh-13243
2018-05-28 09:46:40 +02:00
Stephane Nicoll
f91b53747a
Merge branch '2.0.x'
2018-05-28 09:41:41 +02:00
Johnny Lim
f385a1cb11
Polish
...
Closes gh-13243
2018-05-28 09:36:15 +02:00
Stephane Nicoll
7462401291
Merge branch '2.0.x'
2018-05-28 09:28:30 +02:00
Eddú Meléndez
065eebfb4b
Fix javadoc
...
Closes gh-13274
2018-05-28 09:26:16 +02:00
Phillip Webb
68ffbafbae
Fix checkstyle violations
2018-05-26 00:01:45 -07:00
Phillip Webb
3702da4573
Formatting
2018-05-25 23:52:38 -07:00
Phillip Webb
d8157c94f3
Merge branch '2.0.x'
2018-05-25 19:48:37 -07:00
Phillip Webb
21d80d87a3
Merge branch '1.5.x' into 2.0.x
2018-05-25 18:45:37 -07:00
Phillip Webb
40e68a6427
Merge branch '2.0.x'
2018-05-21 17:20:04 -07:00
Phillip Webb
6d8b4710d7
Merge branch '1.5.x' into 2.0.x
2018-05-21 17:18:49 -07:00
Stephane Nicoll
afe6abb20d
Merge branch '2.0.x'
2018-05-17 15:31:02 +02:00
Johnny Lim
75639aa682
Polish
...
Closes gh-13192
2018-05-17 15:29:50 +02:00
Stephane Nicoll
ffdcdc0dc6
Merge branch '2.0.x'
2018-05-16 13:17:15 +02:00
Stephane Nicoll
7b7e802129
Merge branch '1.5.x' into 2.0.x
2018-05-16 13:16:54 +02:00
Stephane Nicoll
ed02d02d19
Polish "Allow repackage maven goal to take a source classifier"
...
Closes gh-11061
2018-05-15 15:02:22 +02:00
Björn
3c8e012411
Allow repackage maven goal to take a source classifier
...
Previously, the "classifier" attribute was only used to determine the
target classifier of the repackaged archive, always using the main
artifact as the source.
This commit changes the semantic of the attribute so that an existing
archive matching the "classifier" attribute can be used as source,
replacing the archive the same way the goal replaces the main archive
if no classifier is found.
If no artifact with the specified classifier exists, the repackaged
archive is still processed based on the main archive and attached to
the lifecycle using the value of the classifier attribute.
See gh-11061
2018-05-15 15:02:22 +02:00
Johnny Lim
fb2ab67f4f
Polish
...
Closes gh-13148
2018-05-14 08:24:01 +02:00
Stephane Nicoll
b17c58b114
Merge branch '2.0.x'
2018-05-14 08:23:36 +02:00
Johnny Lim
3dd2f5bb05
Polish
...
See gh-13148
2018-05-14 08:19:10 +02:00
Stephane Nicoll
ae74ce9b39
Merge branch '2.0.x'
2018-05-11 14:28:38 +02:00
Vedran Pavic
a08fa27c39
Add .gitignore for Gradle Plugin module
...
Closes gh-13137
2018-05-11 14:28:02 +02:00
Stephane Nicoll
b0433d66c1
Merge branch '2.0.x'
2018-05-11 14:24:13 +02:00
dreis2211
e6a23fa3ff
Remove unnecessary semicolons
...
Closes gh-13144
2018-05-11 14:23:47 +02:00
Andy Wilkinson
079b67c53b
Merge branch '2.0.x'
2018-05-11 11:16:11 +01:00
Andy Wilkinson
7913d9b599
Add methods to BootJar for adding content to BOOT-INF
...
Closes gh-13000
2018-05-11 11:14:14 +01:00
Andy Wilkinson
07251a09d1
Merge branch '2.0.x'
2018-05-11 10:32:05 +01:00
Andy Wilkinson
d9d7499ae6
Merge branch '1.5.x' into 2.0.x
2018-05-11 10:31:52 +01:00
Stephane Nicoll
00a43d8f4d
Merge branch '2.0.x'
2018-05-11 10:01:30 +02:00
Johnny Lim
75e591e76e
Polish
...
Closes gh-13130
2018-05-11 10:00:15 +02:00
Stephane Nicoll
3ad8f3fcbf
Merge branch '2.0.x'
2018-05-07 14:53:58 +02:00
Stephane Nicoll
9dccf5b895
Polish
...
See gh-13078
2018-05-07 14:48:56 +02:00
Stephane Nicoll
7f50d49251
Merge branch '2.0.x'
2018-05-07 14:42:39 +02:00
dreis2211
15d67d6b12
Remove MockServletWebServer.emptyEnumeration()
...
Closes gh-13084
2018-05-07 14:41:06 +02:00
Phillip Webb
7b120c1c97
Formatting
2018-05-04 16:36:35 -07:00
Phillip Webb
42c053cf1b
Merge branch '2.0.x'
2018-05-04 16:31:46 -07:00
Phillip Webb
5b3cb8a698
Update copyright header year for changed files
2018-05-04 15:59:26 -07:00
Phillip Webb
6e09e497f2
Formatting
2018-05-04 12:06:19 -07:00
Andy Wilkinson
65e6011b7f
Merge branch '2.0.x'
2018-05-04 11:45:35 +01:00
Andy Wilkinson
2bcf29913d
Skip building the Gradle plugin on Java 9 as well as 10
...
Upgrading the JDK 9-based build to use JDK 9.0.4 has revealed that
Gradle 4.0.x doesn't work with it as it fails to parse the 9.0.4
version number.
This commit disables building the Gradle plugin on Java 9 (as we
had already done for Java 10) until we decide what to do
(see gh-12333).
2018-05-04 11:40:35 +01:00
Phillip Webb
b6a2a46f78
Merge branch '2.0.x'
2018-05-03 23:54:42 -07:00
Phillip Webb
2d70a7ae5e
Polish caught exception names
...
Prefer `ex` over `e`.
2018-05-03 22:43:32 -07:00
Phillip Webb
41efea51a7
Polish ternary expressions
...
Consistently format ternary expressions and always favor `!=` as the
the check.
2018-05-03 22:43:12 -07:00
Phillip Webb
8c0c0ee55a
Merge branch '2.0.x'
2018-05-03 12:44:58 -07:00
Phillip Webb
e125085993
Merge branch '1.5.x' into 2.0.x
2018-05-03 12:43:50 -07:00
Andy Wilkinson
4ea7d3a767
Merge branch '2.0.x'
2018-05-03 11:35:58 +01:00
Andy Wilkinson
f5fabbc1b9
Remove the use of internal API from Gradle Plugin's BootJar
...
Closes gh-13037
2018-05-03 11:34:42 +01:00
Stephane Nicoll
4eeddbd889
Merge branch '2.0.x'
2018-05-02 16:08:03 +02:00
Stephane Nicoll
79c222da78
Allow to provide manual metadata for keys that are not unique
...
Closes gh-12193
2018-05-02 16:04:02 +02:00
Stephane Nicoll
44fd7d953e
Merge branch '2.0.x'
2018-05-02 16:00:25 +02:00
Stephane Nicoll
782d8c63da
Merge branch '1.5.x' into 2.0.x
2018-05-02 15:59:56 +02:00
Andy Wilkinson
0526594a3c
Merge branch '2.0.x'
2018-05-02 12:26:23 +01:00
Andy Wilkinson
f019d5c85b
Merge branch '1.5.x' into 2.0.x
2018-05-02 12:22:04 +01:00
Madhura Bhave
a193c89c6d
Merge branch '2.0.x'
2018-05-01 16:42:24 -07:00
Madhura Bhave
aad279208e
Throw exception if RandomAccessData tries to read beyond EOF
...
Fixes gh-12986
2018-05-01 16:35:43 -07:00
Stephane Nicoll
335ca62239
Merge branch '2.0.x'
2018-04-30 16:45:30 +02:00
Johnny Lim
a723ac95a9
Polish
...
Closes gh-12999
2018-04-30 16:44:46 +02:00
Stephane Nicoll
080e189d06
Fix broken syntax
2018-04-25 10:40:23 +02:00
Stephane Nicoll
fd47b728c1
Properly handle values with spaces
...
Closes gh-10741
2018-04-24 16:26:51 +02:00
Stephane Nicoll
d4729f5389
Polish
2018-04-24 15:52:47 +02:00
Stephane Nicoll
40b7e02793
Polish "Add support for environment variables"
...
Closes gh-12800
2018-04-24 15:48:54 +02:00
Dmytro Nosan
95f7e3ca37
Add support for environment variables
...
See gh-12800
2018-04-24 14:48:54 +02:00
Stephane Nicoll
5dd4a7e91e
Merge branch '2.0.x'
2018-04-24 13:31:36 +02:00
Stephane Nicoll
55ef9e6dc9
Deprecate excludeArtifactIds
...
While being able to exclude all artifacts of a given group is a handy
feature, excluding all artifacts with a given artifactId does not make
much sense as it should refer to a single artifact anyway. Also the
general "exclude" mechanism is meant to do the exact same thing.
Closes gh-12885
2018-04-24 13:25:58 +02:00
Andy Wilkinson
099f61ae6d
Merge branch '2.0.x'
2018-04-24 11:04:23 +01:00
Andy Wilkinson
c9f04c3977
Avoid race between container starting and getting mapped port
2018-04-24 11:03:54 +01:00
Stephane Nicoll
03539d8e16
Polish "Add system properties support using explicit configuration tag"
...
Closes gh-10741
2018-04-24 11:46:20 +02:00
Vadeg
ba34bf6470
Add system properties support using explicit configuration tag
...
See gh-10741
2018-04-24 11:46:20 +02:00
Andy Wilkinson
fe497d70b8
Merge branch '2.0.x'
2018-04-24 10:39:11 +01:00
Andy Wilkinson
f6cc1cbd76
Make Testcontainer wait strategies final
2018-04-24 10:38:57 +01:00
Andy Wilkinson
c9b2afbd1e
Merge branch '2.0.x'
2018-04-24 10:27:32 +01:00
Andy Wilkinson
f39cea0428
Try to stabilize build by giving Cassandra longer to start
2018-04-24 10:27:11 +01:00
Andy Wilkinson
6c504a5098
Fix deprecation warnings in Testcontainers wait strategies
...
See gh-12821
2018-04-24 10:27:11 +01:00
Andy Wilkinson
60bf4ef430
Merge branch '2.0.x'
2018-04-23 17:25:29 +01:00
Andy Wilkinson
a5f3f36b58
Test the Gradle plugin against Gradle 4.7
...
Closes gh-12952
2018-04-23 17:24:50 +01:00
Andy Wilkinson
15a70153c1
Merge branch '2.0.x'
2018-04-23 17:08:21 +01:00
Andy Wilkinson
72ec2c8644
Polish “Only analyze configurations that we've registered to check”
...
Closes gh-12784
2018-04-23 16:45:21 +01:00
danhyun
1e447ebfbf
Only analyze configurations that we've registered to check
...
See gh-12784
2018-04-23 16:25:17 +01:00
Andy Wilkinson
806978b8f1
Test unresolved dependency analysis in the Gradle plugin
...
See gh-12784
2018-04-23 15:52:56 +01:00
Stephane Nicoll
719fcb4038
Merge branch '2.0.x'
2018-04-20 07:20:24 +02:00
dreis2211
a930835b92
Replace <code> tags where possible
...
Closes gh-12922
2018-04-20 07:19:31 +02:00
Stephane Nicoll
c43eb89823
Make sure that finalName is read only
...
Closes gh-12608
2018-04-17 17:53:18 +02:00
Madhura Bhave
9c7612e681
Fix NPE in WaitStrategy used for test containers
2018-04-12 10:30:36 -07:00
Andy Wilkinson
f335ec00bf
Polish
2018-04-05 09:31:17 +01:00
Phillip Webb
685babc829
Polish "Use lambdas for map entry iteration where possible"
...
Closes gh-12626
2018-04-04 19:36:18 -07:00
igor-suhorukov
69bc19e0ca
Use lambdas for map entry iteration where possible
...
See gh-12626
2018-04-04 19:36:10 -07:00
Phillip Webb
696aedaef8
Merge branch '1.5.x'
2018-04-04 14:51:16 -07:00
Phillip Webb
9a64d3bf3f
Fix AsciiBytes unicode decoding
...
Fix the decoding logic in the AsciiBytes `hashCode` and `matches` to
correctly deal with multi-byte encodings.
Fixes gh-12504
2018-03-29 14:00:13 -07:00
Phillip Webb
98a2a91d16
Polish
2018-03-29 14:00:13 -07:00
Madhura Bhave
8b29823885
Prevent StackOverFlowException in metadata processor
...
Fixes gh-11037
2018-03-28 07:58:13 -07:00
Andy Wilkinson
1f35abacd6
Polish “Configure Kotlin compiler to use -java-parameters by default”
...
Closes gh-12641
2018-03-28 12:24:21 +01:00
Rui Figueira
5e2726f896
Configure Kotlin compiler to use -java-parameters by default
...
See gh-12641
2018-03-28 12:24:17 +01:00
Stephane Nicoll
006decea2a
Merge branch '1.5.x'
2018-03-27 15:47:56 +02:00
Phillip Webb
79ad03b584
Merge branch '1.5.x'
2018-03-16 15:06:08 -07:00
Andy Wilkinson
36ea387a67
Close RandomAccessDataFile when direct JarFile is closed
...
Previously, the underlying RandomAccessDataFile was not closed when
the JarFile that was using it was closed. This causes a problem on
Windows as the open file handle prevents the file from being deleted.
This commit updates JarFile to close the underlying
RandomAccessDataFile when it is closed and has a JarFileType of
DIRECT.
Previously, when accessing the manifest of a jar file that maps to a
nested directory (BOOT-INF/classes) a new JarFile was created from the
root jar file, the manifest was retrieved, and the new JarFile was
closed. This could lead to the underlying RandomAccessDataFile being
closed while it was still in use.
This commit improves JarFile to retrieve the manifest from the
existing outer JarFile, thereby avoiding the need to create and close
a new JarFile.
Unfortunately, PropertiesLauncher creates a number of scenarios where
a JarFile with a type of direct is closed while it’s still being used.
To accommodate this behaviour, RandomAccessDataFile has been updated
so that it can re-open the underlying RandomAccessFile if it is used
after it has been closed.
Closes gh-12296
2018-03-16 15:58:50 +00:00
Phillip Webb
a4b0be089d
Polish
2018-03-14 14:05:26 -07:00
dreis2211
0d3f3e46dd
Fix typos
...
Closes gh-12468
2018-03-13 17:42:19 -07:00