1917e1eac5
Support zip64 jars
...
See gh-16091
2019-09-20 12:44:04 +01:00
1b237de5f5
Use Awaitility in our own tests
...
Closes gh-18227
2019-09-13 20:50:14 +01:00
ff1983c9ae
Merge branch '2.1.x'
...
Closes gh-18168
2019-09-06 14:38:45 +01:00
795c2f225f
Support getComment() on a nested JarFile
...
Previously, calling getComment() on a nested jar file would result
in the outer jar file's comment being returned.
This commit updates the loader's JarFile to read the file's comment
from the central directory end record and return it from getComment().
Fixes gh-18128
2019-09-06 14:29:48 +01:00
9c1f503e46
Simplify if statements
...
See gh-17884
2019-08-17 06:50:32 +02:00
b605cddb10
Polish some Collections API calls
...
See gh-17825
2019-08-11 10:36:10 +02:00
8a9c60a29a
Merge branch '2.1.x'
2019-08-08 11:52:50 -07:00
541d3c4853
Fix typo
2019-08-08 11:52:05 -07:00
8bc780762a
Merge branch '2.1.x'
2019-07-24 11:42:48 +01:00
fb1dd8fe93
Merge branch '2.0.x' into 2.1.x
2019-07-24 11:41:32 +01:00
913e831f4e
Merge '1.5.x' into 2.0.x
2019-07-24 11:39:58 +01:00
19eaf86efa
Update multi release test jar to include Java 12
...
See gh-16970
2019-07-24 08:06:22 +02:00
a9ba7080ce
Merge branch '2.1.x'
2019-07-17 21:48:42 +01:00
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
c3816bfe7b
Polish output capture names
2019-07-15 00:24:18 +01:00
bd22ca0268
Polish
2019-07-04 19:36:32 +01:00
2816635418
Polish
2019-07-04 17:51:20 +01:00
4b2a116fa7
Use String indexOf(char) and lastIndexOf(char) where possible
...
Closes gh-11416
2019-07-04 17:44:40 +01:00
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
6791dbb786
Merge branch '2.1.x'
...
Closes gh-17381
2019-07-01 15:47:48 +01:00
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
605599138e
Merge branch '2.1.x'
2019-06-28 23:56:02 -07:00
92bff3c328
Merge branch '2.0.x' into 2.1.x
2019-06-28 23:42:28 -07:00
cfeb0239b7
Merge branch '1.5.x' into 2.0.x
2019-06-28 23:28:34 -07:00
e560b7f6ba
Remove public modifier on JUnit5 lifecycle methods
...
See gh-17292
2019-06-21 18:09:05 +02:00
6d8ba654cc
Merge branch '2.1.x'
...
Closes gh-17276
2019-06-20 11:17:37 +01:00
a5ae1de706
Fix spring-boot-loader's tests on Windows
...
Closes gh-17275
2019-06-20 11:08:35 +01:00
f36af7b16d
Polish
2019-06-17 11:02:54 +01:00
ece8703278
Merge branch '2.1.x'
...
Closes gh-17211
2019-06-17 10:36:46 +01:00
7d59b78829
Fix handling of jar files with + chars in their path
...
Closes gh-17208
2019-06-17 10:31:51 +01:00
1ec5fb9972
Drop deprecated 'spring.version' POM property
...
See gh-17043
2019-06-13 08:59:00 -07:00
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
c56fbf8c3d
Allow Archives to be closed so they can release resources
...
Closes gh-17126
2019-06-13 09:22:54 +01:00
048be1813e
Ensure JarFile created for nested entry InputStream is closed
...
Closes gh-17127
2019-06-12 14:22:17 +01:00
29d1cd3b2d
Merge branch '2.1.x'
...
Closes gh-17124
2019-06-12 13:01:40 +01:00
c12ccfb342
Close JarFile if failure occurs during construction
...
Fixes gh-17123
2019-06-12 12:59:14 +01:00
266d6334b2
Fix checkstyle RedundantModifier test violations
2019-06-07 20:46:33 -07:00
b18fffaf14
Move tests to JUnit 5 wherever possible
2019-06-07 12:25:54 +01:00
aef92b9295
Merge branch '2.1.x'
...
Closes gh-17079
2019-06-07 11:00:44 +01:00
24925c3dae
Merge branch '2.0.x' into 2.1.x
...
Closes gh-17078
2019-06-07 10:50:34 +01:00
c6c139d980
Merge branch '1.5.x' into 2.0.x
2019-06-07 10:46:31 +01:00
d306b31ce9
Merge branch '2.1.x'
2019-06-04 02:08:00 -07:00
ccfbd03482
Merge branch '2.0.x' into 2.1.x
2019-06-04 02:07:14 -07:00
b442d3b906
Merge branch '1.5.x' into 2.0.x
2019-06-04 01:49:03 -07:00
3a9ca5fa30
Update copyright header of changed files
2019-05-14 21:05:53 -07:00
5639685770
Polish "Prefer file: to jar:file: URLs in launcher"
...
See gh-16248
2019-04-29 14:41:03 +01:00
c1b34d0307
Prefer file: to jar:file: URLs in launcher
...
See gh-16248
2019-04-29 14:39:20 +01:00
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
878a635bfb
Merge branch '2.1.x'
2019-03-28 11:48:47 +00:00
864942ad4f
Merge branch '2.0.x' into 2.1.x
2019-03-28 09:35:53 +00:00
ba4671f0ab
Merge branch '1.5.x' into 2.0.x
2019-03-27 19:59:36 +00:00
4900505425
Merge branch '2.0.x' into 2.1.x
2019-03-26 13:53:57 +00:00
fedb40a2bf
Merge branch '1.5.x' into 2.0.x
2019-03-26 13:48:32 +00:00
dec5a8cc7e
Merge branch '2.1.x'
2019-03-25 16:14:10 +01:00
567a82f4ba
Update multi release test jar to include Java 12
...
See gh-16212
2019-03-25 16:13:24 +01:00
36c1c051b8
Merge branch '2.1.x'
2019-03-20 16:55:10 +00:00
e23f72c8b0
Merge branch '2.0.x' into 2.1.x
2019-03-20 16:53:48 +00:00
9fbd38ab3c
Merge branch '1.5.x' into 2.0.x
2019-03-20 16:45:26 +00:00
00ab30362c
Use HTTPS for external links in XML files
...
See gh-16270
2019-03-20 14:33:25 +00:00
b828b398b5
Merge branch '2.1.x'
2019-03-19 17:11:45 +00:00
a36aa67b52
Merge branch '2.0.x' into 2.1.x
2019-03-19 17:04:41 +00:00
3e2b6ac8ed
Update build and setup configuration to use HTTPS
...
See gh-16246
2019-03-19 16:58:31 +00:00
68bfb020aa
Reduce need for bean method proxying and disable where not needed
...
Closes gh-9068
2019-03-12 13:18:42 +00:00
d6a869fa98
Switch to Jakarta EE API dependencies where possible
...
Closes gh-16113
Closes gh-16112
Closes gh-16111
Closes gh-15916
Closes gh-15689
2019-03-06 11:20:51 +00:00
9540905e73
Merge branch '2.1.x'
2019-02-18 17:30:02 +00:00
68e3de0357
Use name from header not alias when checking entry has expected name
...
Previously, an entry’s potentially aliased name would be used when
checking that it has a particular name. The alias would always be
applied, irrespective of the name in the header. As a result, when
there was a clashing hash and an entry with a particular index did
not have the expected name, this would be concealed by the alias
being applied and the name check being done with the alias.
This commit reworks JarEntry to store the name in its header in
addition to its alias, if any. When checking that the entry has the
expected name, the unaliased name is passed in and the entry compares
it with the name from the header rather than the alias.
Closes gh-15981
2019-02-18 17:29:25 +00:00
b3abd25e22
Merge branch '2.1.x'
2019-02-05 11:11:07 +00:00
8a7958ef55
Do not use reflection to fall back to JDKs jar URLStreamHandler
...
Closes gh-15844
2019-02-05 10:59:32 +00:00
6baa6b291e
Polish contribution
...
Closes gh-15695
2019-01-14 08:11:20 -05:00
af3ed9ff9f
Polish
...
See gh-15695
2019-01-14 08:09:32 -05:00
b370b1f03a
Replace indexOf() with a call to the contains()
...
See gh-15559
2018-12-24 09:52:15 +01:00
c948bdd14d
Merge branch '2.1.x'
2018-12-20 17:59:46 +01:00
51d3626c3b
Merge branch '2.0.x' into 2.1.x
2018-12-20 17:59:33 +01:00
27e89bbb8a
Optimize StringSequence
...
Closes gh-15473
2018-12-20 17:55:30 +01:00
317c4c2c38
Merge branch '2.1.x'
2018-12-17 18:26:56 +01:00
7dbe70dc61
Merge branch '2.0.x' into 2.1.x
2018-12-17 18:26:36 +01:00
c0b07a9429
Polish "Fix StringSequence.equals() for different lengths"
...
Closes gh-15465
2018-12-17 18:24:08 +01:00
2a0680c2ba
Fix StringSequence.equals() for different lengths
...
See gh-15465
2018-12-17 18:20:09 +01:00
bbf0932f0f
Exclude jcl-over-slf4j in favour of spring-jcl
...
Closes gh-15392
2018-12-07 15:37:24 +00:00
ef40241bf6
Merge branch '2.0.x' into 2.1.x
2018-12-05 15:56:04 +01:00
d864b427eb
Remove unused ByteArrayStartsWith matcher
...
Closes gh-15386
2018-12-05 15:52:42 +01:00
3fac0f0360
Polish multi-release jar support to avoid possible StackOverflowError
...
See gh-12523
2018-11-20 17:26:28 +00:00
56eebc9385
Update fat jar loader to support multi-release jar files
...
Closes gh-12523
2018-11-20 15:22:30 +00:00
f3fa20b2d1
Polish
2018-10-29 14:25:45 -07:00
e68b9e8322
Remove unnecessary parameters for String.substring
...
Closes gh-14661
2018-10-03 09:34:56 +02:00
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
11b1318cad
Reduce GC pressure in JAR handler
...
Update the JAR `Hander` so that URL `startsWith` checks produce less
garbage. Comparisons are now performed first on the `path` rather than
the full `toString`. URL `toString` operations produce quite a lot of
garbage since a `StringBuilder` is always used.
In addition, we now also cache the JarFile URL toString to save repeated
calculation.
Closes gh-14561
2018-09-20 22:33:19 -07:00
2e2f91d4a0
Merge branch '1.5.x' into 2.0.x
2018-08-30 15:59:02 -07:00
29e38f4af8
Merge branch '1.5.x' into 2.0.x
2018-08-13 11:35:46 +01:00
21691f0b20
Merge branch '1.5.x' into 2.0.x
2018-08-08 14:46:55 +02:00
0ec22c8bf9
Polish copyright date on changed files
2018-07-29 09:29:29 +01:00
aeb885192e
Polish ternary expressions
2018-07-29 09:24:46 +01:00
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
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
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
6b0ce46491
Polish
...
Closes gh-13320
2018-06-01 09:22:20 +02: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
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
3dd2f5bb05
Polish
...
See gh-13148
2018-05-14 08:19:10 +02:00
Camille Vienot
Andy Wilkinson
thelproad
dreis2211
Madhura Bhave
Phillip Webb
Stephane Nicoll
gaurav bhatnagar
hengyunabc
Spring Operator
Johnny Lim
igor-suhorukov