Stephane Nicoll
8f2ab952f5
Polish javadoc formatting
2018-08-16 17:19:25 +02:00
Stephane Nicoll
c00fc6449b
Merge branch '2.0.x'
2018-08-15 14:37:40 +03:00
dreis2211
59d911d6e0
Remove @UsesUnsafeJava annotations
...
Closes gh-14072
2018-08-15 14:36:51 +03:00
Andy Wilkinson
e3e3a44045
Merge branch '2.0.x'
2018-08-14 12:33:11 +01:00
Andy Wilkinson
1973e342c9
Do not use lambda for task action as it breaks up-to-date checks
...
Due to gradle/gradle#5510 , using a lambda for a task action breaks
up-to-date checks in certain circumstances.
This commit updates JavaPluginAction to use an inner-class in place
of a lambda for the action that it adds to JavaCompile tasks. A test
has not been added as it does not appear to be possible to reproduce
it with a TestKit-based test.
Closes gh-14054
2018-08-14 12:32:36 +01:00
Stephane Nicoll
94013aaba6
Add support for DataSize
...
This commit adds support for Spring Framework's `DataSize` allowing to
express a size in bytes and other convenient units.
Similar to the `Duration` support introduced previously, this commit
adds transparent binding support as well as detection of default values
in `@ConfigurationProperties`-annotated object.
Closes gh-13974
2018-08-13 16:43:23 +03:00
Andy Wilkinson
e41519b6b1
Merge branch '2.0.x'
2018-08-13 11:38:56 +01:00
Andy Wilkinson
29e38f4af8
Merge branch '1.5.x' into 2.0.x
2018-08-13 11:35:46 +01:00
Johnny Lim
05a7d21305
Polish ItemMetadata.buildName()
...
Closes gh-14024
2018-08-09 09:47:02 +02:00
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