Stephane Nicoll
19eaf86efa
Update multi release test jar to include Java 12
...
See gh-16970
2019-07-24 08:06:22 +02:00
Phillip Webb
a9ba7080ce
Merge branch '2.1.x'
2019-07-17 21:48:42 +01:00
Phillip Webb
01933f9b06
Merge previously split strings
...
Merge some string lines that were previously split because of the
90 chars wide formatting.
2019-07-15 00:24:19 +01:00
Phillip Webb
c3816bfe7b
Polish output capture names
2019-07-15 00:24:18 +01:00
Andy Wilkinson
bd22ca0268
Polish
2019-07-04 19:36:32 +01:00
Andy Wilkinson
2816635418
Polish
2019-07-04 17:51:20 +01:00
Andy Wilkinson
4b2a116fa7
Use String indexOf(char) and lastIndexOf(char) where possible
...
Closes gh-11416
2019-07-04 17:44:40 +01:00
Phillip Webb
a66c4d3096
Unify method visibility of private classes
...
Apply checkstyle rule to ensure that private and package private
classes do not have unnecessary public methods. Test classes have
also been unified as much as possible to use default scoped
inner-classes.
Closes gh-7316
2019-07-03 11:39:47 -07:00
Andy Wilkinson
6791dbb786
Merge branch '2.1.x'
...
Closes gh-17381
2019-07-01 15:47:48 +01:00
Andy Wilkinson
4083c721f2
Fix URL normalization when replacing /./ with /
...
Previously, a regular expression of /./ was used to replace /./ with
/. The '.'' in the expression matches any single character so the
replacement was more broadly applicable than it should have been. For
example, /a/ would be replaced with /.
This commit uses Pattern.LITERAL to compile the regular expression
from the CURRENT_DIR (/./) contant. This allows the constant to be
used to check for occurances of /./ in the string before attempting
replacement, while also ensuring that the '.' is treated literally.
Closes gh-17341
2019-07-01 15:42:54 +01:00
Phillip Webb
605599138e
Merge branch '2.1.x'
2019-06-28 23:56:02 -07:00
Phillip Webb
92bff3c328
Merge branch '2.0.x' into 2.1.x
2019-06-28 23:42:28 -07:00
Phillip Webb
cfeb0239b7
Merge branch '1.5.x' into 2.0.x
2019-06-28 23:28:34 -07:00
Stephane Nicoll
e560b7f6ba
Remove public modifier on JUnit5 lifecycle methods
...
See gh-17292
2019-06-21 18:09:05 +02:00
Andy Wilkinson
6d8ba654cc
Merge branch '2.1.x'
...
Closes gh-17276
2019-06-20 11:17:37 +01:00
Andy Wilkinson
a5ae1de706
Fix spring-boot-loader's tests on Windows
...
Closes gh-17275
2019-06-20 11:08:35 +01:00
Andy Wilkinson
f36af7b16d
Polish
2019-06-17 11:02:54 +01:00
Andy Wilkinson
ece8703278
Merge branch '2.1.x'
...
Closes gh-17211
2019-06-17 10:36:46 +01:00
Andy Wilkinson
7d59b78829
Fix handling of jar files with + chars in their path
...
Closes gh-17208
2019-06-17 10:31:51 +01:00
gaurav bhatnagar
1ec5fb9972
Drop deprecated 'spring.version' POM property
...
See gh-17043
2019-06-13 08:59:00 -07:00
Andy Wilkinson
cffc870fd6
Fix test failures on Windows
...
Since the move to JUnit 5, a number of tests were failing on Windows.
The majority were failing due to open file handles preventing the
clean up of the tests' temporary directory. This commit addresses
these failures by updating the tests to close JarFiles, InputStreams,
OutputStreams etc.
A change has also been made to CachingOperationInvokerTests to make
a flakey test more robust. Due to System.currentTimeMillis() being
less precise on Windows than it is on *nix platforms, the test could
fail as it would not sleep for long enough for the TTL period to have
expired.
2019-06-13 09:24:31 +01:00
Andy Wilkinson
c56fbf8c3d
Allow Archives to be closed so they can release resources
...
Closes gh-17126
2019-06-13 09:22:54 +01:00
Andy Wilkinson
048be1813e
Ensure JarFile created for nested entry InputStream is closed
...
Closes gh-17127
2019-06-12 14:22:17 +01:00
Andy Wilkinson
29d1cd3b2d
Merge branch '2.1.x'
...
Closes gh-17124
2019-06-12 13:01:40 +01:00
Andy Wilkinson
c12ccfb342
Close JarFile if failure occurs during construction
...
Fixes gh-17123
2019-06-12 12:59:14 +01:00
Phillip Webb
266d6334b2
Fix checkstyle RedundantModifier test violations
2019-06-07 20:46:33 -07:00
Andy Wilkinson
b18fffaf14
Move tests to JUnit 5 wherever possible
2019-06-07 12:25:54 +01:00
Andy Wilkinson
aef92b9295
Merge branch '2.1.x'
...
Closes gh-17079
2019-06-07 11:00:44 +01:00
Andy Wilkinson
24925c3dae
Merge branch '2.0.x' into 2.1.x
...
Closes gh-17078
2019-06-07 10:50:34 +01:00
Andy Wilkinson
c6c139d980
Merge branch '1.5.x' into 2.0.x
2019-06-07 10:46:31 +01:00
Phillip Webb
d306b31ce9
Merge branch '2.1.x'
2019-06-04 02:08:00 -07:00
Phillip Webb
ccfbd03482
Merge branch '2.0.x' into 2.1.x
2019-06-04 02:07:14 -07:00
Phillip Webb
b442d3b906
Merge branch '1.5.x' into 2.0.x
2019-06-04 01:49:03 -07:00
Phillip Webb
3a9ca5fa30
Update copyright header of changed files
2019-05-14 21:05:53 -07:00
Andy Wilkinson
5639685770
Polish "Prefer file: to jar:file: URLs in launcher"
...
See gh-16248
2019-04-29 14:41:03 +01:00
hengyunabc
c1b34d0307
Prefer file: to jar:file: URLs in launcher
...
See gh-16248
2019-04-29 14:39:20 +01:00
dreis2211
f40b086ef5
Optimize JarEntry construction
...
This commit avoids calling the underlying ZipEntry.setExtra() method
that is not very inline friendly in cases where there is no extra
information to be set.
See gh-16620
2019-04-23 15:25:56 +01:00
Andy Wilkinson
878a635bfb
Merge branch '2.1.x'
2019-03-28 11:48:47 +00:00
Andy Wilkinson
864942ad4f
Merge branch '2.0.x' into 2.1.x
2019-03-28 09:35:53 +00:00
Andy Wilkinson
ba4671f0ab
Merge branch '1.5.x' into 2.0.x
2019-03-27 19:59:36 +00:00
Andy Wilkinson
4900505425
Merge branch '2.0.x' into 2.1.x
2019-03-26 13:53:57 +00:00
Andy Wilkinson
fedb40a2bf
Merge branch '1.5.x' into 2.0.x
2019-03-26 13:48:32 +00:00
Stephane Nicoll
dec5a8cc7e
Merge branch '2.1.x'
2019-03-25 16:14:10 +01:00
Stephane Nicoll
567a82f4ba
Update multi release test jar to include Java 12
...
See gh-16212
2019-03-25 16:13:24 +01:00
Andy Wilkinson
36c1c051b8
Merge branch '2.1.x'
2019-03-20 16:55:10 +00:00
Andy Wilkinson
e23f72c8b0
Merge branch '2.0.x' into 2.1.x
2019-03-20 16:53:48 +00:00
Andy Wilkinson
9fbd38ab3c
Merge branch '1.5.x' into 2.0.x
2019-03-20 16:45:26 +00:00
Spring Operator
00ab30362c
Use HTTPS for external links in XML files
...
See gh-16270
2019-03-20 14:33:25 +00:00
Andy Wilkinson
b828b398b5
Merge branch '2.1.x'
2019-03-19 17:11:45 +00:00
Andy Wilkinson
a36aa67b52
Merge branch '2.0.x' into 2.1.x
2019-03-19 17:04:41 +00:00