Commit Graph

24788 Commits

Author SHA1 Message Date
Andy Wilkinson c5e47c725c Merge branch '2.2.x'
Closes gh-19800
2020-01-17 20:56:24 +00:00
Andy Wilkinson b44442ee3c Merge branch '2.1.x' into 2.2.x
Closes gh-19799
2020-01-17 20:53:28 +00:00
Andy Wilkinson fabd692812 Upgrade to Spring HATEOAS 1.1.0.M1
Closes gh-19649
2020-01-17 20:27:33 +00:00
Andy Wilkinson 34ac3c5f7d Upgrade to spring-javaformat 0.0.19
Closes gh-19710
2020-01-17 20:25:51 +00:00
Andy Wilkinson 60fcc4bab1 Upgrade to Spring AMQP 2.2.3.RELEASE
Closes gh-19651
2020-01-17 20:13:18 +00:00
Andy Wilkinson 408f17f821 Close FileInputStreams in RepackagerTests 2020-01-17 20:04:31 +00:00
Andy Wilkinson 04d6b21dfb Sort test failures before logging them
See gh-19696
2020-01-17 11:40:16 +00:00
Andy Wilkinson 736963e7db Update ConventionsPlugin's javadoc
See gh-19784
2020-01-17 11:11:47 +00:00
Andy Wilkinson 724597d45f Use a centrally managed version for commons-compress 2020-01-17 10:34:55 +00:00
Andy Wilkinson 2ac931cacb Log some information about all test failures when the build completes
Closes gh-19696
2020-01-17 09:22:26 +00:00
Stephane Nicoll 986bef9cba Upgrade to Spring Data Neumann-M2
Closes gh-19588
2020-01-17 09:49:17 +01:00
Phillip Webb 0bb00c9a43 Compile with Java with the '-parameters' option
Update the `ConventionsPlugin` to apply the `-parameters` compiler
argument.

Closes gh-19784
2020-01-16 23:12:14 -08:00
Phillip Webb abad00754b Revert "Upgrade to Spring Data Neumann-M1"
This reverts commit e44206e88e.
2020-01-16 16:54:43 -08:00
Phillip Webb fd792cedaf Polish DisabledIfDockerUnavailable
Convert `DisabledIfDockerUnavailable` to be an annotation and make
it slightly less noisy.
2020-01-16 16:54:43 -08:00
Madhura Bhave cf01f9fba0 Add tests for configuring layered jar layout
Closes gh-19768
2020-01-16 11:27:41 -08:00
Andy Wilkinson aed51abb4e Merge branch '2.2.x' 2020-01-16 16:53:24 +00:00
Spring Buildmaster 78008ffe6b Next development version (v2.2.4.BUILD-SNAPSHOT) 2020-01-16 15:28:31 +00:00
Stephane Nicoll e44206e88e Upgrade to Spring Data Neumann-M1
Closes gh-19588
2020-01-16 16:28:12 +01:00
Stephane Nicoll 9e2a7a2ee4 Merge pull request #19632 from dreis2211
* pr/19632:
  Make Tomcat javadoc link version dependent

Closes gh-19632
2020-01-16 15:53:48 +01:00
dreis2211 dcdadb9aa7 Make Tomcat javadoc link version dependent
See gh-19632
2020-01-16 15:51:36 +01:00
Stephane Nicoll e1a557ef3b Merge pull request #19658 from dreis2211
* pr/19658:
  Polish "Pass CI branch parameter to build scan"
  Pass CI branch parameter to build scan

Closes gh-19658
2020-01-16 15:42:39 +01:00
Stephane Nicoll 4ea739f91c Polish "Pass CI branch parameter to build scan"
See gh-19658
2020-01-16 15:41:41 +01:00
dreis2211 240f2fb2c8 Pass CI branch parameter to build scan
See gh-19658
2020-01-16 15:41:22 +01:00
Stephane Nicoll 33e414fcb2 Merge pull request #19699 from scottfrederick
* pr/19699:
  Polish "Remove deprecated Joda-Time support"
  Remove deprecated Joda-Time support
  Remove deprecated 2.2 code
  Remove deprecated HealthIndicator and HealthAggregator 2.2 code
  Remove deprecated Actuator metrics 2.2 code
  Polish "Remove deprecated logging properties"
  Remove deprecated logging properties

Closes gh-19699
2020-01-16 15:24:32 +01:00
Stephane Nicoll 7270ca5cf4 Polish "Remove deprecated Joda-Time support"
See gh-19699
2020-01-16 15:15:21 +01:00
Scott Frederick c4592e7df8 Remove deprecated Joda-Time support
See gh-19699
2020-01-16 14:48:46 +01:00
Scott Frederick 8f102aee68 Remove deprecated 2.2 code
See gh-19699
2020-01-16 14:44:52 +01:00
Scott Frederick 2e32cb2af1 Remove deprecated HealthIndicator and HealthAggregator 2.2 code
See gh-19699
2020-01-16 14:44:51 +01:00
Scott Frederick 1f1b06dfe2 Remove deprecated Actuator metrics 2.2 code
See gh-19699
2020-01-16 14:44:09 +01:00
Stephane Nicoll 03139f066b Polish "Remove deprecated logging properties"
See gh-19699
2020-01-16 14:42:38 +01:00
Scott Frederick 7031a3b17d Remove deprecated logging properties
See gh-19699
2020-01-16 14:35:41 +01:00
Stephane Nicoll 421c464dd8 Deprecate CachingOperationInvoker#apply
This commit deprecates the only public accessor to
`CacheOperationInvoker` so that we can make the entire class package
private in the next feature release.

Closes gh-19089
2020-01-16 14:30:47 +01:00
Andy Wilkinson fc36b6b6e8 Merge branch '2.2.x' 2020-01-16 12:53:34 +00:00
Andy Wilkinson d6631a578b Upgrade to Micrometer 1.3.2
Closes gh-19778
2020-01-16 12:52:52 +00:00
Andy Wilkinson 052ef66664 Merge branch '2.1.x' into 2.2.x 2020-01-16 12:52:18 +00:00
Spring Buildmaster 3f05deb311 Next development version (v2.1.13.BUILD-SNAPSHOT) 2020-01-16 12:09:50 +00:00
Andy Wilkinson 9b5af810dd Merge branch '2.2.x'
Closes gh-19774
2020-01-16 10:06:24 +00:00
Andy Wilkinson f06af5a79b Only attempt to publish a build scan when we can authenticate 2020-01-16 10:06:16 +00:00
Andy Wilkinson 9d5975bd09 Upgrade to Gradle 6.1
Closes gh-19772
2020-01-16 10:00:45 +00:00
Andy Wilkinson 4c8626ea56 Allow Boot's Jetty error handler to be overridden
Fixes gh-19520
2020-01-16 09:33:22 +00:00
Andy Wilkinson adda1936f5 Merge branch '2.2.x' 2020-01-16 09:17:45 +00:00
Andy Wilkinson a162c8ac0b Revert "Build against Micrometer 1.3.3 snapshots"
The release didn't happen in time for 2.2.3.

See gh-19645
2020-01-16 09:16:58 +00:00
Andy Wilkinson b6ea9d212d Merge branch '2.1.x' into 2.2.x 2020-01-16 09:16:07 +00:00
Andy Wilkinson 8f209ced6d Revert "Start building against Micrometer 1.1.10 snapshots"
The release did not happen in time for 2.1.12.

See gh-19649.
2020-01-16 09:13:09 +00:00
Phillip Webb 8fde088574 Add layered jar layout support to the maven plugin
Update the Maven plugin with a new `LAYERED_JAR` layout option.

See gh-19768
2020-01-15 23:33:29 -08:00
Madhura Bhave e9d61bac75 Support generation and loading of layered jars
Support an alternative fat jar format that is more amenable to Docker
image layers.

The new format arranges files in the following structure:

	BOOT-INF/
	  layers/
	    <layer-name #1>
	      /classes
	      /lib
	    <layer-name #2>
	      /classes
	      /lib

The `BOOT-INF/layers.idx` file provides the names of the layers and the
order in which they should be added (starting with the least changed).

The `JarLauncher` class can load layered jars in both fat and exploded
forms.

Closes gh-19767

Co-authored-by: Phillip Webb <pwebb@pivotal.io>
2020-01-15 23:32:58 -08:00
Madhura Bhave 45b1ab46c3 Add classpath index support for exploded archives
Update the `Repackager` class so that an additional `classpath.idx` file
is written into the jar that provides the original order of the
classpath. The `JarLauncher` class now uses this file when running as
an exploded archive to ensure that the classpath order is the same as
when running from the far jar.

Closes gh-9128

Co-authored-by: Phillip Webb <pwebb@pivotal.io>
2020-01-15 23:31:17 -08:00
Phillip Webb ad72f86bdb Polish loader and loader-tools
Polish and refactor `spring-boot-loader` and `spring-boot-loader-tools`
to make it easier to add indexing and layering support.

Closes gh-19766
2020-01-15 23:29:11 -08:00
Andy Wilkinson 56e30258fb Merge branch '2.2.x' 2020-01-15 20:45:42 +00:00
Andy Wilkinson b7e250eb04 Merge branch '2.1.x' into 2.2.x 2020-01-15 20:45:24 +00:00