Commit Graph

15232 Commits

Author SHA1 Message Date
Andy Wilkinson
cafe6dbbb1 Suppress debug log output during Logback initialization
Closes gh-11761
2018-02-01 12:48:59 +00:00
Andy Wilkinson
e954bbbb86 Upgrade to Jackson 2.9.4
Closes gh-11830
2018-02-01 11:40:43 +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
Andy Wilkinson
9542f5182c Move scripts for new launch script tests to correct location
See gh-11397
2018-02-01 09:26:16 +00:00
Stephane Nicoll
0091d4278d Merge pull request #11874 from dreis2211:remove-obsolete-comment
* pr/11874:
  Remove obsolete comment
2018-02-01 09:00:51 +01:00
dreis2211
3e84f5bdbe Remove obsolete comment
Closes gh-11874
2018-02-01 09:00:32 +01:00
Stephane Nicoll
0cfef1bc92 Merge pull request #11871 from izeye:polish-20180201
* pr/11871:
  Polish
2018-02-01 08:36:52 +01:00
Johnny Lim
3cead7693d Polish
Closes gh-11871
2018-02-01 08:35:42 +01:00
Madhura Bhave
71e9db012b Convert tests to use ApplicationContextRunner 2018-01-31 19:03:09 -08:00
Madhura Bhave
905666e797 Document usage of AuthenticationEventPublisher
Closes gh-11420
2018-01-31 18:41:08 -08:00
Andy Wilkinson
a6bb48a2f4 Remove remaining references to no longer supported container versions
Closes gh-11504
2018-01-31 17:29:55 +00:00
Andy Wilkinson
4179ed5a35 Start building against Spring Security 5.0.2 snapshots
See gh-11870
2018-01-31 17:17:53 +00:00
Andy Wilkinson
7e629cb4ba Remove dependency management for Javassist
Closes gh-11225
2018-01-31 17:08:40 +00:00
Andy Wilkinson
fa0e536a1c Merge pull request #11866 from Tony Findeisen
* gh-11866:
  Add dependency management for remaining REST Assured modules
  Add dependency management for io.rest-assured:spring-mock-mvc
2018-01-31 17:05:22 +00:00
Stephane Nicoll
c1ad9b73ba Allow caching for an Endpoint operation with optional arguments
This commit makes sure that caching is enabled if an operation has
nullable parameters and the actual invocation provides null values.

Closes gh-11795
2018-01-31 17:48:55 +01:00
Andy Wilkinson
518d0ead1a Add dependency management for remaining REST Assured modules
Close gh-11866
2018-01-31 16:40:58 +00:00
Tony Findeisen
85e6954e6b Add dependency management for io.rest-assured:spring-mock-mvc
See gh-11866
2018-01-31 16:39:17 +00:00
Andy Wilkinson
de11fa6279 Replace references to jcl-over-slf4j with details of spring-jcl
Closes gh-10138
2018-01-31 16:36:04 +00:00
Stephane Nicoll
9d6cc3be46 Polish 2018-01-31 15:48:17 +01:00
Andy Wilkinson
8f116f7e6f Align ordering of BootJar and BootWar archive entries
Previously, the ordering of the entries in an archive produced by
BootJar was different to the ordering of the entries in an archive
produced by BootWar. The latter placed application classes before
any nested jars, whereas the former was the other way around.

This commit updates BootJar to use the same ordering as BootWar and
adds tests to verify that the ordering is the following:

1. Loader classes
2. Application classes (BOOT-INF/classes or WEB-INF/classes)
3. Nested jars (BOOT-INF/lib or WEB-INF/lib)
4. Provided nested jars in a war (WEB-INF/lib-provided)

The tests also verify that the position of a library is not affected
by it requiring unpacking.

See gh-11695
See gh-11696
2018-01-31 14:38:38 +00:00
Phillip Webb
6328de9e20 Add Madhura as a document author 2018-01-30 23:41:18 -08:00
Phillip Webb
7c5042d079 Don't run apply-plugin tests
Stop running apply-plugin tests as part of the build since during a
release the version number will change and the jar will not be
available.

Fixes gh-11857
2018-01-30 21:45:17 -08:00
Jon Schneider
09181d6b16 Fix CompositeMeterRegistryPostProcessor autowire
Update `CompositeMeterRegistryPostProcessor` to use constructor
autowiring for `Clock` detection.

Fixes gh-11856
2018-01-30 20:27:22 -08:00
Phillip Webb
6dddceacad Always include plugin classpath in sample gradle
Update a couple of the `spring-boot-gradle-plugin` sample gradle flies
so that they include the running classpath. The additional lines are
contained within a tag which is ultimately filtered from the final
documentation.

Fixes gh-11857
2018-01-30 20:08:04 -08:00
Phillip Webb
d478e9bf57 Merge branch '1.5.x' 2018-01-30 17:17:37 -08:00
Phillip Webb
09a64bc841 Fixup version numbers following release 2018-01-30 17:16:04 -08:00
Spring Buildmaster
6414b42335 Next Development Version 2018-01-30 23:29:33 +00:00
Madhura Bhave
013310738f Get CI image in RC and release jobs 2018-01-30 15:02:17 -08:00
Phillip Webb
2f834b377c Fix variable names used in concourse stage script 2018-01-30 14:31:24 -08:00
Phillip Webb
faffea5dff Revert "Use Spring Session BOM in dependency management"
This reverts commit e5fb9c565c.
2018-01-30 13:59:31 -08:00
Phillip Webb
886b39293c Merge branch '1.5.x' 2018-01-30 12:51:45 -08:00
Phillip Webb
187c4d728c Merge branch '1.5.x' 2018-01-30 12:47:30 -08:00
Phillip Webb
9b8cb9a463 Protect against symlink attacks
Update embedded launch script to no longer change ownership of files
or folders that already exist.

Fixes gh-11397
2018-01-30 12:42:31 -08:00
Phillip Webb
604ec075eb Merge pull request #11848 from stadler
* pr/11848:
  All CLI support for Windows MINGW environments
2018-01-30 12:41:16 -08:00
Jacques Stadler
38a5466a19 All CLI support for Windows MINGW environments
Closes gh-11848
2018-01-30 12:40:31 -08:00
Andy Wilkinson
ef49c029a1 Merge pull request #11852 from Jon Schneider
* gh-11852:
  Polish "Aggregate max statistics in metrics endpoint with Double#max"
  Aggregate max statistics in metrics endpoint with Double#max
2018-01-30 20:39:46 +00:00
Andy Wilkinson
42135cd5fc Polish "Aggregate max statistics in metrics endpoint with Double#max"
Closes gh-11852
2018-01-30 20:38:14 +00:00
Jon Schneider
92287f75f7 Aggregate max statistics in metrics endpoint with Double#max
See gh-11852
2018-01-30 20:38:02 +00:00
Phillip Webb
61f7bd8576 Polish 2018-01-30 12:37:40 -08:00
Andy Wilkinson
ba54cbddf6 Merge pull request #11815 from Vedran Pavić
* gh-11815:
  Use Spring Session BOM in dependency management
2018-01-30 20:29:53 +00:00
Vedran Pavic
e5fb9c565c Use Spring Session BOM in dependency management
Closes gh-11815
2018-01-30 20:27:59 +00:00
Andy Wilkinson
6c10ca02b8 Revert "Upgrade to Jackson 2.9.4"
This reverts commit d908d0e876.

See gh-11830
2018-01-30 16:48:47 +00:00
Stephane Nicoll
f7bf79c9b3 Polish deprecated metadata 2018-01-30 17:45:01 +01:00
Stephane Nicoll
51c307f643 Merge branch '1.5.x' 2018-01-30 16:43:54 +01:00
Stephane Nicoll
f86b44f2ec Reduce StringBuilder creation in TypeExtractor.visitDeclared()
Closes gh-11845
2018-01-30 16:40:32 +01:00
Stephane Nicoll
86c1fe529d Polish 2018-01-30 15:38:31 +01:00
Stephane Nicoll
1106c582a7 Remove error-level metadata for Spring Mobile
While Spring Mobile support has been removed from Spring Boot, the
auto-configuration has been relocated to a separate module that uses
the same keys.

Flagging those keys as deprecated means that the IDE will be confused
when the extra jar is present on the classpath as it advertizes, as
it should, support fo them.

Closes gh-11844
2018-01-30 15:28:28 +01:00
Stephane Nicoll
8b3c2b01e3 Fix broken replacement ids 2018-01-30 15:23:21 +01:00
Stephane Nicoll
2d814e5102 Restore "Reason: " prefix 2018-01-30 15:14:49 +01:00
Stephane Nicoll
3291a7a76d Polish 2018-01-30 14:46:09 +01:00