174cc2bc4e
Merge branch '1.5.x' into 2.0.x
2018-07-13 09:25:42 +02:00
8fc1e0ed4e
Merge branch '2.0.x'
2018-07-13 07:55:59 +02:00
ac8eebfbad
Fix typos
...
Closes gh-13762
2018-07-13 07:54:03 +02:00
918191664a
Merge branch '2.0.x'
2018-07-09 13:39:30 +01:00
9eb5c9bd18
Merge branch '1.5.x' into 2.0.x
2018-07-09 13:39:11 +01:00
45fdf2ffa4
Support Tomcat 9 and Undertow 2
...
Closes gh-11749
Closes gh-12243
2018-06-28 11:33:30 +01:00
a097f923c1
Provide sensible defaults for launch script properties when using Gradle
...
Closes gh-4458
2018-06-22 13:08:44 +01:00
d4d169277d
Merge branch '2.0.x'
2018-06-21 09:23:43 +02:00
9e9e746554
Merge branch '1.5.x' into 2.0.x
2018-06-21 09:17:05 +02:00
c12f8298e6
Merge branch '2.0.x'
2018-06-19 20:06:58 +01:00
814e90805e
Merge branch '1.5.x' into 2.0.x
2018-06-19 20:06:44 +01:00
60b109cf0c
Merge branch '2.0.x'
2018-06-15 13:38:29 +02:00
f34fb5f1ee
Reduce object creation in findMatchingItemMetadata()
...
Closes gh-13473
2018-06-15 13:36:55 +02:00
5bd9a445ae
Merge branch '2.0.x'
2018-06-08 18:09:00 +01:00
6f2171c282
Improve error message when BootJar or BootWar has no known main class
...
Closes gh-12712
2018-06-08 18:07:24 +01:00
e0ae805924
Update copyright header
2018-06-05 17:45:09 -07:00
0f321abe66
Merge branch '2.0.x'
2018-06-04 17:53:50 +01:00
70c0d6a005
Test the Gradle plugin against Gradle 4.8
...
Closes gh-13359
2018-06-04 17:53:34 +01:00
00449bef6a
Use app…DefaultJvmArgs as convention for start script's defaultJvmOpts
...
Closes gh-12631
2018-06-04 17:53:34 +01:00
b38f60a631
Merge branch '2.0.x'
2018-06-04 16:40:06 +01:00
d54072e0a8
More accurately document buildInfo's effect on up-to-date checking
...
Closes gh-13152
2018-06-04 16:39:59 +01:00
bc47bf44a9
Merge branch '2.0.x'
2018-06-01 09:26:29 +02:00
6b0ce46491
Polish
...
Closes gh-13320
2018-06-01 09:22:20 +02:00
92b9b234f1
Merge branch '2.0.x'
2018-05-30 22:53:33 -07:00
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
cf27917e86
Merge branch '2.0.x'
2018-05-30 20:30:38 -07:00
bdd541b2cc
Merge branch '1.5.x' into 2.0.x
2018-05-30 20:29:03 -07:00
5ae061f491
Merge branch '1.5.x' into 2.0.x
2018-05-30 20:27:19 -07:00
40800355c7
Merge branch '2.0.x'
2018-05-30 12:41:48 -07:00
09fa1e7e11
Polish
2018-05-30 12:12:01 -07:00
de01e7aad4
Polish
...
See gh-13243
2018-05-28 09:46:40 +02:00
f91b53747a
Merge branch '2.0.x'
2018-05-28 09:41:41 +02:00
f385a1cb11
Polish
...
Closes gh-13243
2018-05-28 09:36:15 +02:00
7462401291
Merge branch '2.0.x'
2018-05-28 09:28:30 +02:00
065eebfb4b
Fix javadoc
...
Closes gh-13274
2018-05-28 09:26:16 +02:00
68ffbafbae
Fix checkstyle violations
2018-05-26 00:01:45 -07:00
3702da4573
Formatting
2018-05-25 23:52:38 -07:00
d8157c94f3
Merge branch '2.0.x'
2018-05-25 19:48:37 -07:00
21d80d87a3
Merge branch '1.5.x' into 2.0.x
2018-05-25 18:45:37 -07:00
40e68a6427
Merge branch '2.0.x'
2018-05-21 17:20:04 -07:00
6d8b4710d7
Merge branch '1.5.x' into 2.0.x
2018-05-21 17:18:49 -07:00
afe6abb20d
Merge branch '2.0.x'
2018-05-17 15:31:02 +02:00
75639aa682
Polish
...
Closes gh-13192
2018-05-17 15:29:50 +02:00
ffdcdc0dc6
Merge branch '2.0.x'
2018-05-16 13:17:15 +02:00
7b7e802129
Merge branch '1.5.x' into 2.0.x
2018-05-16 13:16:54 +02:00
ed02d02d19
Polish "Allow repackage maven goal to take a source classifier"
...
Closes gh-11061
2018-05-15 15:02:22 +02:00
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
fb2ab67f4f
Polish
...
Closes gh-13148
2018-05-14 08:24:01 +02:00
b17c58b114
Merge branch '2.0.x'
2018-05-14 08:23:36 +02:00
3dd2f5bb05
Polish
...
See gh-13148
2018-05-14 08:19:10 +02:00
ae74ce9b39
Merge branch '2.0.x'
2018-05-11 14:28:38 +02:00
a08fa27c39
Add .gitignore for Gradle Plugin module
...
Closes gh-13137
2018-05-11 14:28:02 +02:00
b0433d66c1
Merge branch '2.0.x'
2018-05-11 14:24:13 +02:00
e6a23fa3ff
Remove unnecessary semicolons
...
Closes gh-13144
2018-05-11 14:23:47 +02:00
079b67c53b
Merge branch '2.0.x'
2018-05-11 11:16:11 +01:00
7913d9b599
Add methods to BootJar for adding content to BOOT-INF
...
Closes gh-13000
2018-05-11 11:14:14 +01:00
07251a09d1
Merge branch '2.0.x'
2018-05-11 10:32:05 +01:00
d9d7499ae6
Merge branch '1.5.x' into 2.0.x
2018-05-11 10:31:52 +01:00
00a43d8f4d
Merge branch '2.0.x'
2018-05-11 10:01:30 +02:00
75e591e76e
Polish
...
Closes gh-13130
2018-05-11 10:00:15 +02:00
3ad8f3fcbf
Merge branch '2.0.x'
2018-05-07 14:53:58 +02:00
9dccf5b895
Polish
...
See gh-13078
2018-05-07 14:48:56 +02:00
7f50d49251
Merge branch '2.0.x'
2018-05-07 14:42:39 +02:00
15d67d6b12
Remove MockServletWebServer.emptyEnumeration()
...
Closes gh-13084
2018-05-07 14:41:06 +02:00
7b120c1c97
Formatting
2018-05-04 16:36:35 -07:00
42c053cf1b
Merge branch '2.0.x'
2018-05-04 16:31:46 -07:00
5b3cb8a698
Update copyright header year for changed files
2018-05-04 15:59:26 -07:00
6e09e497f2
Formatting
2018-05-04 12:06:19 -07:00
65e6011b7f
Merge branch '2.0.x'
2018-05-04 11:45:35 +01:00
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
b6a2a46f78
Merge branch '2.0.x'
2018-05-03 23:54:42 -07:00
2d70a7ae5e
Polish caught exception names
...
Prefer `ex` over `e`.
2018-05-03 22:43:32 -07:00
41efea51a7
Polish ternary expressions
...
Consistently format ternary expressions and always favor `!=` as the
the check.
2018-05-03 22:43:12 -07:00
8c0c0ee55a
Merge branch '2.0.x'
2018-05-03 12:44:58 -07:00
e125085993
Merge branch '1.5.x' into 2.0.x
2018-05-03 12:43:50 -07:00
4ea7d3a767
Merge branch '2.0.x'
2018-05-03 11:35:58 +01:00
f5fabbc1b9
Remove the use of internal API from Gradle Plugin's BootJar
...
Closes gh-13037
2018-05-03 11:34:42 +01:00
4eeddbd889
Merge branch '2.0.x'
2018-05-02 16:08:03 +02:00
79c222da78
Allow to provide manual metadata for keys that are not unique
...
Closes gh-12193
2018-05-02 16:04:02 +02:00
44fd7d953e
Merge branch '2.0.x'
2018-05-02 16:00:25 +02:00
782d8c63da
Merge branch '1.5.x' into 2.0.x
2018-05-02 15:59:56 +02:00
0526594a3c
Merge branch '2.0.x'
2018-05-02 12:26:23 +01:00
f019d5c85b
Merge branch '1.5.x' into 2.0.x
2018-05-02 12:22:04 +01:00
a193c89c6d
Merge branch '2.0.x'
2018-05-01 16:42:24 -07:00
aad279208e
Throw exception if RandomAccessData tries to read beyond EOF
...
Fixes gh-12986
2018-05-01 16:35:43 -07:00
335ca62239
Merge branch '2.0.x'
2018-04-30 16:45:30 +02:00
a723ac95a9
Polish
...
Closes gh-12999
2018-04-30 16:44:46 +02:00
080e189d06
Fix broken syntax
2018-04-25 10:40:23 +02:00
fd47b728c1
Properly handle values with spaces
...
Closes gh-10741
2018-04-24 16:26:51 +02:00
d4729f5389
Polish
2018-04-24 15:52:47 +02:00
40b7e02793
Polish "Add support for environment variables"
...
Closes gh-12800
2018-04-24 15:48:54 +02:00
95f7e3ca37
Add support for environment variables
...
See gh-12800
2018-04-24 14:48:54 +02:00
5dd4a7e91e
Merge branch '2.0.x'
2018-04-24 13:31:36 +02:00
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
099f61ae6d
Merge branch '2.0.x'
2018-04-24 11:04:23 +01:00
c9f04c3977
Avoid race between container starting and getting mapped port
2018-04-24 11:03:54 +01:00
03539d8e16
Polish "Add system properties support using explicit configuration tag"
...
Closes gh-10741
2018-04-24 11:46:20 +02:00
ba34bf6470
Add system properties support using explicit configuration tag
...
See gh-10741
2018-04-24 11:46:20 +02:00
fe497d70b8
Merge branch '2.0.x'
2018-04-24 10:39:11 +01:00
f6cc1cbd76
Make Testcontainer wait strategies final
2018-04-24 10:38:57 +01:00
Stephane Nicoll
dreis2211
Andy Wilkinson
Johnny Lim
Phillip Webb
Eddú Meléndez
Björn
Vedran Pavic
Madhura Bhave
Dmytro Nosan
Vadeg