66 Commits

Author SHA1 Message Date
Andreas Gebhardt
3f894cbeeb Log a warning when using fallback for pid and log locations
See gh-14519
2018-10-04 15:19:48 +01:00
Phillip Webb
d76bba5e6f Migrate from ExpectedException rule to AssertJ
Replace ExpectedException JUnit rules with AssertJ exception
assertions.

Closes gh-14336
2018-10-02 10:55:28 -07:00
Andy Wilkinson
1332fcb0ad Polish "Issue a warning from launch script when app will run as root"
Closes gh-10275
2018-09-11 12:12:43 +01:00
Oliver B. Fischer
94ebd33747 Issue a warning from launch script when app will run as root
See gh-10275
2018-09-11 12:12:05 +01:00
Phillip Webb
9d1b3a2b49 Merge branch '2.0.x' 2018-09-04 16:25:17 -07:00
Phillip Webb
cafff43022 Update copyright header of changed files 2018-09-04 16:19:05 -07: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
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
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
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
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
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
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
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
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
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
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
Andy Wilkinson
6d16c5ff6e Omit libraries with null destination when repackaging
Closes gh-12437
2018-03-12 13:33:42 +00:00
dreis2211
3adced9962 Remove workaround for JDK-8023130 in RunProcess
With JDK 8 being the baseline and JDK 7 not being supported anymore we
can get rid of the workaround for a JDK 7 bug in
ProcessBuilder.inheritIO on Windows machines.

Closes gh-12337
2018-03-05 10:39:28 +00:00
Andy Wilkinson
fdb9a1ea8f Consider time in BuildInfo up-to-date checks and allow it to be set
Closes gh-12111
Closes gh-12266
2018-02-27 20:09:07 +00:00
Phillip Webb
29c3be3590 Polish 2018-02-26 10:26:02 -08:00
Stephane Nicoll
306c79f0de Merge branch '1.5.x' 2018-02-26 18:03:32 +01:00
Johnny Lim
d441a8a89a Polish
Closes gh-12205
2018-02-24 11:53:25 +01:00
Phillip Webb
4b9c3c137e Polish Collection.toArray
Consistently use `StringUtils.toStringArray`, `ClassUtils.toClassArray`
or zero length when converting collections to arrays.

Fixes gh-12160
2018-02-22 21:11:30 -08:00
Johnny Lim
88b184ca23 Polish 2018-02-19 20:00:20 -08:00
Andy Wilkinson
e1ab62668f Merge branch '1.5.x' 2018-02-13 15:05:28 +00:00
Andy Wilkinson
1d2b85b2b8 Ensure that TestJarFile uses insertion order for jar's entries
Previously, the order of the entries in a TestJarFile was determined
by the underlying file system rather than by the order in which
they were added. This could lead to unpredicatable ordering and
failures in tests that verify archive entry ordering.

This commit updates TestJarFile to add entries to the archive in
insertion order.

See gh-11695
See gh-11696
2018-02-01 13:07:50 +00:00
Andy Wilkinson
b2dad7f1c4 Rework entry ordering of repackaged archives
Previously, the Repackager would write entries in the following
order:

- Libraries that require unpacking
- Existing entries
    - Application classes
    - WEB-INF/lib jars in a war
- Libraries that do not require unpacking
- Loader classes

Libraries that require unpacking were written before existing entries
so that, when repackaging a war, an entry in WEB-INF/lib would not
get in first and prevent a library with same location from being
unpacked. However, this had the unwanted side-effect of changing
the classpath order when an entry requires unpacking.

This commit reworks the handling of existing entries and libraries
that require unpacking so that existing entries can be written first
while also marking any that match a library that requires unpacking
as requiring unpacking.

Additionally, loader classes are now written first. They are the
first classes in the jar that will be used so it seems to make sense
for them to appear first. This aligns Maven-based repackaging
with the Gradle plugin's behaviour and with the structure documented
in the reference documentation's "The Executable Jar Format" appendix.

The net result of the changes described above is that entries are
now written in the following order:

- Loader classes
- Existing entries
    - Application classes
    - WEB-INF/lib jars in a war marked for unpacking if needed
- Libraries

Closes gh-11695
Closes gh-11696
2018-02-01 11:38:33 +00:00
Phillip Webb
886b39293c Merge branch '1.5.x' 2018-01-30 12:51:45 -08:00
andrey.onufreyko
b19dcb13e2 Replace string arguments with char
Optimize method calls by replacing single character String arguments
with char.

Closes gh-11680
2018-01-22 16:35:06 -08:00
Andy Wilkinson
54c0cf513b Polish 2018-01-17 19:03:23 +00:00
Stephane Nicoll
d43346d6c2 Polish "Fix potential resource leaks"
Closes gh-11624
2018-01-17 13:56:53 +01:00
igor-suhorukov
5a4238acfc Fix potential resource leaks
See gh-11624
2018-01-17 13:54:50 +01:00