Andy Wilkinson
970f933806
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26450
2021-05-13 11:44:01 +01:00
Andy Wilkinson
2dd94b5554
Polish "Use try-with-resources statement"
...
See gh-26449
2021-05-13 11:37:10 +01:00
weixsun
5ba9db391f
Use try-with-resources statements
...
See gh-26449
2021-05-13 11:36:14 +01:00
Phillip Webb
a28a3ae090
Merge branch '2.3.x' into 2.4.x
2021-03-30 09:25:46 -07:00
Phillip Webb
9c8a97809d
Consistent use of @deprecated since
...
Restore the patch version number for consistency with `@since`
tags.
See gh-25808
2021-03-30 09:20:30 -07:00
Phillip Webb
363f5829d1
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25825
2021-03-29 15:46:50 -07:00
Phillip Webb
26dd1b9a26
Update deprecations with for removal targets
...
Update all deprecation tags to include a removal target.
Closes gh-25808
2021-03-29 15:44:58 -07:00
Phillip Webb
ca9fae6b47
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25774
2021-03-23 17:07:44 -07:00
Phillip Webb
ec21202d54
Delete unpacked jars when the JVM exits
...
Update `JarFileArchive` so that any unpacked files are now deleted when
the JVM exits.
Closes gh-25773
2021-03-23 17:06:56 -07:00
Phillip Webb
05f61bccea
Align unpack logic with Files.createTempDirectory
...
Update `JarFileArchive` to align the way that it creates temp files and
folders with the way that `Files.createTempDirectory` works.
Closes gh-25772
2021-03-23 17:06:56 -07:00
Phillip Webb
b8873578ca
Add missing @Deprecated annotations
2021-03-23 17:06:53 -07:00
Andy Wilkinson
788a42d694
Merge branch '2.3.x' into 2.4.x
...
See gh-25076
2021-02-02 15:12:27 +00:00
Andy Wilkinson
67479b6380
Add junit-platform-launcher dependency by convention
...
Closes gh-25074
2021-02-02 13:03:21 +00:00
Phillip Webb
257608a3a3
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25076
2021-02-01 16:03:43 -08:00
Phillip Webb
939b5dfc26
Add junit-platform-launcher dependency
...
Update `build.gradle` files to ensure that `junit-platform-launcher` is
a `testRuntimeOnly` dependency. This ensures that tests can be run from
Eclipse.
Closes gh-25074
2021-02-01 15:31:28 -08:00
Andy Wilkinson
9e389c8376
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24710
2021-01-08 17:07:45 +00:00
Andy Wilkinson
5ad4d627fd
Fix classpath index so entries match those expected by the launcher
...
This reverts commit ad164269e9aa7d0f39362d78d946a146dac5fdee and adds
some additional tests.
Fixes gh-24192
2021-01-08 15:32:19 +00:00
Stephane Nicoll
09fa16c58c
Merge branch '2.3.x' into 2.4.x
2020-12-21 09:59:33 +01:00
Stephane Nicoll
306b964ce3
Fix multi-release JAR test on JDK 16
...
See gh-24453
2020-12-21 09:59:01 +01:00
Phillip Webb
0730949325
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24554
2020-12-17 20:47:13 -08:00
Phillip Webb
c4e41305d5
Prevent Tomcat URL "reflective access" warnings
...
Update the jar `Handler` class to support a non-reflective fallback
mechanism when possible. The updated code attempts to capture a regular
jar URL before our handler is installed. It can then use that URL as
context when creating the a fallback URL. The JDK jar `Handler` will
be copied from the context URL to the fallback URL.
Without this commit, resolving new Tomcat URLs of the form
`jar:war:file:...` would result in an ugly "Illegal reflective access"
warning.
Fixes gh-18631
2020-12-17 20:43:41 -08:00
Phillip Webb
4fba7d0c60
Merge branch '2.3.x' into 2.4.x
2020-12-15 19:48:52 -08:00
Phillip Webb
29300530c6
Polish
2020-12-15 19:44:40 -08:00
Phillip Webb
cd5ff6e4af
Merge branch '2.3.x'
...
Closes gh-24404
2020-12-08 12:13:02 -08:00
Phillip Webb
11f285bde5
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24403
2020-12-08 12:12:51 -08:00
Andy Wilkinson
bbad377ecc
Merge branch '2.3.x'
...
Closes gh-24017
2020-11-03 18:00:22 +00:00
Andy Wilkinson
f3d4b3e5ac
Allow entries to be streamed from JarURLConnections' jar file
...
Fixes gh-23821
2020-11-03 17:59:38 +00:00
Santhoshkumar. P
5cb07e292d
Polish empty string checks
...
See gh-23550
2020-10-05 10:38:47 +02:00
Andy Wilkinson
558c2b4591
Merge branch '2.3.x'
...
Closes gh-23501
2020-09-26 09:17:08 +01:00
Andy Wilkinson
9bd040cb0f
Merge branch '2.2.x' into 2.3.x
...
Closes gh-23500
2020-09-26 09:16:46 +01:00
Andy Wilkinson
e74f777971
Remove use of spring-core's Assert from PropertiesLauncher
...
Fixes gh-23474
2020-09-26 09:11:05 +01:00
Stephane Nicoll
37ded9f6d3
Merge branch '2.2.x' into 2.3.x
...
Closes gh-23446
2020-09-22 10:10:24 +02:00
dreis2211
fba1fb23e4
Fix multi-release JAR test on JDK 15
...
Backport of 54f93e9
See gh-23445
2020-09-22 10:09:18 +02:00
Phillip Webb
3fca8c6b4e
Merge branch '2.2.x' into 2.3.x
...
Closes gh-23441
2020-09-21 22:27:45 -07:00
Phillip Webb
4945806d84
Make StringSequence.isEmpty()
public
...
Make `StringSequence.isEmpty()` public for compatibility with JDK 15.
Closes gh-23440
2020-09-21 22:26:20 -07:00
Phillip Webb
5b74d464a6
Merge branch '2.3.x'
2020-09-15 08:48:51 -07:00
Phillip Webb
5c1055dc22
Merge branch '2.2.x' into 2.3.x
2020-09-15 08:48:25 -07:00
Phillip Webb
195def0ec3
Merge branch '2.1.x' into 2.2.x
2020-09-15 08:48:00 -07:00
Phillip Webb
e0030094e2
Fix missing jar entry certificates
...
Ensure that the source jar entry is closed before reading
certificates and code signers from the entry.
gh-19041
2020-09-15 08:42:58 -07:00
Phillip Webb
433b357423
Merge branch '2.3.x'
2020-09-14 13:53:00 -07:00
Phillip Webb
a249a1a3d1
Merge branch '2.2.x' into 2.3.x
2020-09-14 13:52:22 -07:00
Phillip Webb
b8e6b2ef94
Merge branch '2.1.x' into 2.2.x
2020-09-14 13:51:24 -07:00
Phillip Webb
4138e59c33
Fix potential JarFileEntries ClassCastException
...
Update `JarFileEntries` so that the interface is obtained rather than
the concrete implementation. This allows `JarEntry` values to be used
without causing a ClassCastException.
Closes gh-19041
2020-09-14 13:48:59 -07:00
Phillip Webb
3a8c15af0d
Merge branch '2.3.x'
...
Closes gh-23265
2020-09-13 22:50:28 -07:00
Phillip Webb
45275e6586
Merge branch '2.2.x' into 2.3.x
...
Closes gh-23264
2020-09-13 22:49:21 -07:00
Phillip Webb
a20fdf8e6a
Merge branch '2.1.x' into 2.2.x
...
Closes gh-23263
2020-09-13 22:45:39 -07:00
Phillip Webb
895ff9c72d
Merge pull request #19041 from mathieufortin01
...
* pr/19041:
Polish 'Fix signed jar performance issues'
Fix signed jar performance issues
Ignore Visual Studio Code Files
Closes gh-19041
2020-09-13 22:40:05 -07:00
Phillip Webb
c6a9696dd1
Polish 'Fix signed jar performance issues'
...
Update the performance improvements to push certificate loading
and storage into the `JarFileEntries` class. This allows us to
keep certificates without needing to cache all entry data. We
now also keep certificates and code signers in a dedicated class
which is set whenever the full jar stream as been read, even if
the contained values are `null`. The logic that assumes META-INF
entries are not signed has been removed in favor of delegating to
the streamed entry results.
See gh-19041
2020-09-13 22:28:45 -07:00
mathieufortin01
4d053e15d8
Fix signed jar performance issues
...
Update Spring Boot nested JarFile support to improve the performance of
signed jars. Prior to this commit, `certificates` and `codeSigners`
were read by streaming the entire jar whenever the existing values
were `null`. Unfortunately, the contract for `getCertificates` and
get `getCodeSigners` states that `null` is a valid return value. This
meant that full jar streaming would occur whenever either method was
called on an entry that had no result. The problem was further
exacerbated by the fact that entries might not be cached.
See gh-19041
2020-09-13 22:14:03 -07:00
Andy Wilkinson
6619dfacf3
Merge branch '2.3.x'
...
Closes gh-23241
2020-09-10 10:03:09 +01:00