Commit Graph

8188 Commits

Author SHA1 Message Date
Stephane Nicoll 3290313eb7 Fix Docker socket creation on Windows
Closes gh-19908
2020-01-27 07:29:16 +01:00
Andy Wilkinson 66d4319abd Deprecate refresh(ApplicationContext) and add refresh(ConfigurableAC)
refresh can only ever be called with a ConfigurableApplicationContext
and we want to evolve the refresh API to reflect that. This commit
takes the first step by overloading refresh(ApplicationContext) with
a new refresh(ConfigurationApplicationContext) method and deprecating
refresh(ApplicationContext). Where the call to refresh is made, the
argument is cast to ApplicationContext to ensure that
refresh(ApplicationContext) is called. This ensures that any existing
override of the method is still effective.

Closes gh-18519
2020-01-26 11:39:58 +00:00
Stephane Nicoll d1867c1b8b Merge branch '2.2.x'
Closes gh-19930
2020-01-26 08:44:01 +01:00
dreis2211 56ab129077 Upgrade to Testcontainers 1.12.5
See gh-19902
2020-01-26 08:42:28 +01:00
dreis2211 d75de39456 Upgrade to JUnit Jupiter 5.6.0
See gh-19907
2020-01-26 08:39:12 +01:00
Andy Wilkinson 4130638702 Upgrade to SQLite JDBC 3.30.1
Closes gh-19925
2020-01-25 13:23:40 +00:00
Andy Wilkinson 6d9d4fc531 Upgrade to Solr 8.4.1
Closes gh-19924
2020-01-25 13:23:39 +00:00
Andy Wilkinson f4d27f90ba Upgrade to Rabbit AMQP Client 5.8.0
Closes gh-19923
2020-01-25 13:23:37 +00:00
Andy Wilkinson d477084a1e Upgrade to MongoDB 3.12.1
Closes gh-19922
2020-01-25 13:23:36 +00:00
Andy Wilkinson b0831d0b54 Upgrade to Mongo Driver ReactiveStreams 1.13.0
Closes gh-19921
2020-01-25 13:23:35 +00:00
Andy Wilkinson ccabfe7b8c Upgrade to Log4j2 2.13.0
Closes gh-19920
2020-01-25 13:23:33 +00:00
Andy Wilkinson dcbdd0afba Upgrade to JUnit 4.13
Closes gh-19919
2020-01-25 13:23:32 +00:00
Andy Wilkinson 128127820b Upgrade to Jedis 3.2.0
Closes gh-19918
2020-01-25 13:23:30 +00:00
Andy Wilkinson 273dc93e03 Upgrade to InfluxDB Java 2.17
Closes gh-19917
2020-01-25 13:23:29 +00:00
Andy Wilkinson c5ffb25239 Upgrade to Commons Pool2 2.8.0
Closes gh-19916
2020-01-25 13:23:27 +00:00
Andy Wilkinson f7328825ec Upgrade to Commons Codec 1.14
Closes gh-19915
2020-01-25 13:20:18 +00:00
Andy Wilkinson d7e18a714d Upgrade to Artemis 2.11.0
Closes gh-19914
2020-01-25 13:13:39 +00:00
Madhura Bhave 1d62debf11 Fix typo 2020-01-24 16:37:48 -08:00
Stephane Nicoll 0bd03fa278 Fix xml syntax in example
Closes gh-19906
2020-01-24 16:01:44 +01:00
dreis2211 42e34673a6 Remove obsolete files
See gh-19896
2020-01-24 14:20:21 +01:00
Stephane Nicoll cb7e8cdbef Merge branch '2.2.x'
Closes gh-19904
2020-01-24 14:18:21 +01:00
Stephane Nicoll 99330325c0 Merge branch '2.1.x' into 2.2.x
Closes gh-19903
2020-01-24 14:16:35 +01:00
Stephane Nicoll ddcc52a085 Upgrade to Micrometer 1.3.3
Closes gh-19645
2020-01-24 14:11:14 +01:00
Stephane Nicoll 7fd8cce465 Polish "Close TomcatMetrics on shutdown for cleanup"
See gh-19880
2020-01-24 14:07:53 +01:00
Johnny Lim 51dfd528bd Close TomcatMetrics on shutdown for cleanup
See micrometer-metrics/micrometer#1424
See gh-19880
2020-01-24 14:04:13 +01:00
Stephane Nicoll c3d0b9c43a Upgrade to Micrometer 1.1.10
Closes gh-19639
2020-01-24 13:58:33 +01:00
dreis2211 d84ca1149c Test the Gradle Plugin against Gradle 6.1
See gh-19776
2020-01-24 13:46:00 +01:00
Stephane Nicoll 142a0cbb85 Fix warnings in spring-boot-autoconfigure's Kotlin test code
Closes gh-19877
2020-01-24 10:48:11 +01:00
Stephane Nicoll eb9b1972cf Adapt Cassandra documentation of v4 driver upgrade
See gh-18621
2020-01-23 18:30:55 +01:00
Stephane Nicoll 0a6fa64ff9 Fix default value for spring.data.couchbase.contact-points
See gh-18621
2020-01-23 18:22:40 +01:00
Stephane Nicoll df7b3839a1 Add local-datacenter property for Cassandra
The Cassandra v4 driver does not longer have automatic local DC inference
from contact points. As a result, the "local-datacenter" property must be
set with the default load balancing policy and the contact points must
be of that data center.

This commit adds a new property for the local datacenter so that it can
be specified without the use of a customizer.

Closes gh-19779
2020-01-23 18:16:05 +01:00
Andy Wilkinson cbee16318f Fix version references in Maven Plugin's reference documentation
Closes gh-19878
2020-01-23 16:37:18 +00:00
Stephane Nicoll 331ebe90e0 Restore @since on build-image parameters 2020-01-23 16:47:03 +01:00
Stephane Nicoll 63019ab3f1 Add documentation for Maven plugin's build-image support
Closes gh-19830
2020-01-23 16:35:45 +01:00
Stephane Nicoll 6df5e7af4f Add integration tests for Maven plugin's build-image support
See gh-19830
2020-01-23 16:06:11 +01:00
Andy Wilkinson 0a9fe65443 Use line endings on all OSs when writing image config JSON
Previously \r\n was used on Windows and \n was used on other
platforms. This resulted in different JSON content being written to
the archive. As the config's entry name is the SHA-256 hash of its
content, it also resulted in the entry name being different.

This commit updates the JSON that's written into the archive to use
\n line endings, irrespective of the OS on which the image is being
built.

See gh-19828
2020-01-23 14:37:06 +00:00
Andy Wilkinson a0b4cdee44 Make line ending expectations in TotalProgressBarTests OS-independent
See gh-19828
2020-01-23 14:14:14 +00:00
Andy Wilkinson 1d396abec5 Fix bootBuildImage integration tests on Java 13
We build with Java 8, 11, and 13 without specifying target
compatibility for the bytecode of the app that's placed in the image.
The built image uses Java 11 and when the app is built with Java 13
it fails to start as the Java 11 VM can't read that Java 13 bytecode.

This commit configures the app that's placed in the image to be built
with target compatibility of 1.8. This allows it to be compiled with
all version of Java with which we build and to also be compatible
with the JVM that's in the image.

See gh-19831
2020-01-23 13:50:22 +00:00
Andy Wilkinson fccc241ded Remove unnecessary dependency from HATEOAS starter
Closes gh-19874
2020-01-23 13:45:18 +00:00
Stephane Nicoll 105db66553 Polish 2020-01-23 14:04:19 +01:00
Stephane Nicoll e044817fe7 Migrate remaining use of ClassLoader.loadClass to Class.forName
Closes gh-19824
2020-01-23 13:15:45 +01:00
Andy Wilkinson 01a0a54f78 Include layertools in layered jars build with Gradle
Closes gh-19867
2020-01-23 11:43:19 +00:00
Andy Wilkinson 288f5ceaee Fix zip compression of libs in layered jars
Closes gh-19792
2020-01-23 11:40:13 +00:00
Andy Wilkinson 0bd0b2a6c0 Add support for building OCI images using the Gradle plugin
Closes gh-19831
2020-01-23 10:52:57 +00:00
Andy Wilkinson bc452bc094 Polish BootJarTests
See gh-19847
See gh-19792
2020-01-23 10:05:33 +00:00
Stephane Nicoll 95be419527 Use Class.forName rather than ClassLoader.loadClass
This commit changes uses of ClassLoader.loadClass to Class.forName for
consistency with what was initiated in #19342 and better compatibility
with GraalVM.

Closes gh-19824
2020-01-23 10:47:53 +01:00
Scott Frederick 8f30cf916f Upgrade to Kafka 2.4.0 and Spring Kafka 2.4.1
See gh-19764
2020-01-23 10:16:36 +01:00
Stephane Nicoll c80e9f7fc4 Upgrade to Spring Integration 5.3.0.M1
Closes gh-19650
2020-01-23 10:13:40 +01:00
Stephane Nicoll 2b06a423d0 Merge branch '2.2.x'
Closes gh-19873
2020-01-23 09:54:09 +01:00
Stephane Nicoll c77d4c07d7 Merge branch '2.1.x' into 2.2.x
Closes gh-19872
2020-01-23 09:53:11 +01:00
Stephane Nicoll 650e55c242 Polish "Encourage use of SpringBootApplication"
See gh-19855
2020-01-23 09:51:03 +01:00
protyay 3131616c5a Encourage use of SpringBootApplication
See gh-19855
2020-01-23 09:40:30 +01:00
Phillip Webb b5b4a02c61 Automatically add jarmode jars when packaging
Update the `Packager` to automatically add the layertools jarmode jar
when producing a layered jar.

Closes gh-19865
2020-01-22 23:14:47 -08:00
Phillip Webb 2b83edeb27 Fix jarmode support in unexploded jars
Update `LaunchedURLClassLoader` to ensure that the `JarModeLauncher`
is created in the correct classloader.

Prior to this commit the launcher was created by the application
classloader and did not have access to any of the required
`org.springframework` classes.

See gh-19848
2020-01-22 23:07:18 -08:00
Phillip Webb 57db621b70 Polish 2020-01-22 23:06:58 -08:00
Phillip Webb 77bbe089b2 Update copyright year of changed files 2020-01-22 20:24:23 -08:00
Phillip Webb 71ce212f7f Rename spring-boot-layertools
Rename `spring-boot-layertools` to `spring-boot-jarmode-layertools`.

Closes gh-19853
2020-01-22 20:24:23 -08:00
Madhura Bhave 13f7db2d8c Write classpath index file from Gradle plugin
Closes gh-19847
2020-01-22 19:32:08 -08:00
Scott Frederick 462f5635d6 Reinstate JobLauncherCommandLineRunner
This class was mistakenly marked as deprecated in 2.2.0 instead of deprecated
in 2.3.0. This resulted in the class being deleted as part of the 2.3.0
cleanup.

Putting it back in place now with the correct deprecation noted.

Closes gh-19861
2020-01-22 18:48:55 -06:00
Phillip Webb e0013454b5 Use parentheses when declaring dependencies
Update all dependencies declarations to use the form `scope(reference)`
rather than `scope reference`.

Prior to this commit we declared dependencies without parentheses unless
we were forced to add them due to an `exclude`.
2020-01-22 16:02:38 -08:00
Phillip Webb 0209cd3e4c Polish quote form used in Gradle scripts
Replace Gradle single quote strings with the double quote form
whenever possible. The change helps to being consistency to the
dependencies section where mostly single quotes were used, but
occasionally double quotes were required due to `${}` references.
2020-01-22 15:49:52 -08:00
Scott Frederick ed6fbc6bec Remove Spring Cloud Connectors auto-config/starter
The Spring Cloud Connectors project has been deprecated in favor of the
Java CFEnv project. The Boot auto-configuration and starter that support
Connectors were deprecated in Boot 2.2.

This commit removes the Connectors auto-configuration, starter,
and dependency management.

Closes gh-19798
2020-01-22 17:06:32 -06:00
Madhura Bhave df5b0f1163 Add support for layered jars in gradle plugin
Closes gh-19792

Co-authored-by: Andy Wilkinson <awilkinson@pivotal.io>
2020-01-22 14:53:36 -08:00
Scott Frederick 9ff50f903f Default spring.datasource.generate-unique-name to true
This change ensures that each test in a test suite that shares an
application context gets a unique embedded database, to prevent
inconsistent embedded database state between tests.

Closes gh-16747
2020-01-22 15:41:40 -06:00
Phillip Webb 951d0b0fdf Fix exploded jar classloader issues
Fix a bug in `ExplodedURLClassLoader` and merge the code into the
existing `LaunchedURLClassLoader` class. Also polish a few method
names relating to layer support.

See gh-19848
See gh-19767
2020-01-22 12:56:14 -08:00
Phillip Webb e28338d6cd Rename spring-boot-cloudnativebuildpack
Rename the `spring-boot-cloudnativebuildpack` module to
`spring-boot-buildpack-platform` and update the the package
name to `org.springframework.boot.buildpack.platform`.

Closes gh-19851
2020-01-22 11:01:32 -08:00
Scott Frederick 288889685d Change default BootstrapMode for JPA repositories
Change the default `BootstrapMode` for auto-configured `JpaRepositories`
to `BootstrapMode.DEFERRED` to allow the initialization of
`EntityManagerFactory` to be parallelized for increased startup efficiency.

Prior to this change, the default BootstrapMode for all auto-configured
Spring Data repositories was `BootstrapMode.DEFAULT`.

Closes gh-16230
2020-01-22 10:55:51 -08:00
dreis2211 23e87f8266 Treat Java 11+'s NoSuchFileException the same as FileNotFoundException
See gh-19850
2020-01-22 11:45:11 +00:00
Andy Wilkinson adc6444272 Upgrade to Micrometer 1.3.3
Closes gh-19652
2020-01-22 11:24:01 +00:00
Phillip Webb e513fe4666 Add layertools jarmode
Add a new `spring-boot-layertools` module which provides jarmode support
for working with layers. The module works with both classic fat jars,
as well as layered jars.

Closes gh-19849
2020-01-22 01:26:55 -08:00
Phillip Webb 73a42050d6 Add jarmode support to the loader code
Update the `Launcher` class to allow a packaged jar to be  launched in
a different mode. The launcher now checks for a `jarmode` property and
attempts to find a `JarMode` implementation using the standard
`spring.factories` mechanism.

Closes gh-19848
2020-01-22 01:23:11 -08:00
Phillip Webb d5a70688cb Reserve layer names for future use
Update layered jar support so that the name `ext` and any name
starting `springboot` are reserved.

See gh-19767
2020-01-22 01:13:54 -08:00
Phillip Webb 3af4930f75 Add cloudnativebuildpack to dependencies
Update the managed dependencies to include the recently added
`spring-boot-cloudnativebuildpack` module.

See gh-19828
2020-01-22 01:10:57 -08:00
Phillip Webb 7d8f8d47c8 Fix packager code to generate layer index file
Update `Packager` to create the layer index file when repackaging.

Closes gh-19767
2020-01-21 23:26:19 -08:00
Phillip Webb bfd2ca7fd9 Polish Gradle expression references
Expand all expression `$` references to the full `${...}` form.
2020-01-21 18:33:33 -08:00
Andy Wilkinson 89237634c7 Fix classpath used for Gradle Plugin integration tests in Eclipse
See gh-19841
2020-01-21 14:59:07 +00:00
Stephane Nicoll 4d70f58bc8 Polish "Upgrade to Infinispan 10.1.1.Final"
See gh-19790
2020-01-21 14:53:09 +01:00
Scott Frederick 511258f486 Upgrade to Infinispan 10.1.1.Final
See gh-19790
2020-01-21 14:46:56 +01:00
Stephane Nicoll 08967bca3e Merge branch '2.2.x'
Closes gh-19843
2020-01-21 14:44:01 +01:00
Stephane Nicoll 84324c438b Merge branch '2.1.x' into 2.2.x
Closes gh-19842
2020-01-21 14:34:44 +01:00
Stephane Nicoll 34c263a828 Polish actuator dependencies and test resources
This commit removes references of cache infra following the move to
Micrometer. We no longer ships an infinispan specific binder so the
dependency has been removed as well.

Closes gh-19838
2020-01-21 14:20:28 +01:00
Andy Wilkinson 1e72fa202c Rework loader-tools resource generation to work with Buildship
Previously, the generated resources were added as an output to the
main source set. This worked on the command line, but resulted in
the META-INF folder that contains the loader jar not being on the
classpath of downstream projects in Eclipse.

This commit changes loader-tools to add the generated resources
as a srcDir to the main source set. This results in it appearing on
the classpath of other projects in Eclipse that depend on loader-tools
such as the Gradle plugin, thereby allowing its tests to be run in
the IDE as well as on the command line.

Fixes gh-19841
2020-01-21 12:52:02 +00:00
Andy Wilkinson 62a848f1b1 Register JNA's native library integration in LinuxSocketDomain
See gh-19836
2020-01-21 11:09:31 +00:00
dreis2211 991bcf5ce4 Revisit documentation that mentions Gradle "compile" configuration
See gh-19797
2020-01-21 11:09:41 +01:00
Stephane Nicoll d421c63747 Disable integration test on Linux
See gh-19836
2020-01-21 10:46:55 +01:00
Stephane Nicoll ffd7670843 Attempt to make DockerApiIntegrationTests work on Linux 2020-01-21 10:19:56 +01:00
dreis2211 042694bc53 Reinstate running of OutputCaptureRuleTests
See gh-19826
2020-01-21 09:47:41 +01:00
dreis2211 088e79f446 Add UTF-8 encoding to spring-boot-starter-parent POM
See gh-19835
2020-01-21 09:36:38 +01:00
Phillip Webb cb4928ad51 Add build-image support to the maven plugin
Add a new `build-image` goal to the Maven plugin to allow Docker images
to be create via using the cloud native buildpack.

See gh-19830
2020-01-20 23:48:47 -08:00
Phillip Webb 16e6bc89ed Create a new ImagePackager tools class
Pull functionality from `Repackager` into a new `Packager` base class
and develop a variant for Docker image creation. The new `ImagePackager`
class provides a general purpose way to construct jar entries without
being tied to an actual file. This will allow us to link it to a
buildpack and provide application content directly.

Closes gh-19834
2020-01-20 23:48:47 -08:00
Phillip Webb aa1954717c Add cloud native buildpack module
Add a Java implementation of the buildpacks.io specification allowing
projects to be packaged into OCI containers. The `builder` class
provides a Java equivalent of `pack build` command and is based on
the `pack` CLI Go code published at https://github.com/buildpacks/pack.

Closes gh-19828
2020-01-20 23:48:47 -08:00
Andy Wilkinson 29d8b6db5a Merge branch '2.2.x'
Closes gh-19822
2020-01-20 15:18:18 +00:00
Andy Wilkinson f708aace65 Merge branch '2.1.x' into 2.2.x
Fixes gh-19821
2020-01-20 15:18:00 +00:00
Stephane Nicoll 67bba7c64a Merge branch '2.2.x'
Closes gh-19820
2020-01-20 16:13:03 +01:00
Stephane Nicoll 3dba4c8f4e Polish "Document RedisCacheManagerBuilderCustomizer"
See gh-19819
2020-01-20 16:02:38 +01:00
Dmytro Nosan 61d8bacd23 Document RedisCacheManagerBuilderCustomizer
See gh-19819
2020-01-20 16:02:20 +01:00
Andy Wilkinson c85f19b75b Revert "Add profiles directly to the application environment for tests"
This reverts commit 487b9cbf96.

Fixes gh-19788
2020-01-20 15:01:09 +00:00
Andy Wilkinson 235b74ca12 Merge branch '2.2.x'
Closes gh-19814
2020-01-20 11:33:56 +00:00
Andy Wilkinson 7693d332fa Upgrade to Dependency Management Plugin 1.0.9.RELEASE
Closes gh-19783
2020-01-20 11:32:09 +00:00
Stephane Nicoll 4ab19c3cfb Upgrade to Reactor Dysprosium-SR4
Closes gh-19809
2020-01-20 09:24:43 +01:00
Stephane Nicoll ae561ce59b Upgrade to Reactor Dysprosium-SR4
Closes gh-19795
2020-01-20 09:22:38 +01:00
Andy Wilkinson bfdb49f2a2 Retry when findAvailableTcpPort returns an unavailable port
Closes gh-19801
2020-01-18 12:25:13 +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 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 724597d45f Use a centrally managed version for commons-compress 2020-01-17 10:34:55 +00:00
Stephane Nicoll 986bef9cba Upgrade to Spring Data Neumann-M2
Closes gh-19588
2020-01-17 09:49:17 +01: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
Stephane Nicoll e44206e88e Upgrade to Spring Data Neumann-M1
Closes gh-19588
2020-01-16 16:28:12 +01:00
dreis2211 dcdadb9aa7 Make Tomcat javadoc link version dependent
See gh-19632
2020-01-16 15:51:36 +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 d6631a578b Upgrade to Micrometer 1.3.2
Closes gh-19778
2020-01-16 12:52:52 +00:00
Andy Wilkinson 9b5af810dd Merge branch '2.2.x'
Closes gh-19774
2020-01-16 10:06:24 +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 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 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
Andy Wilkinson ebebe09a9d Fix file handle leak in JarFileTests
The JarFile was not being closed which linked a file handle and caused
a test failure on Windows.

The local variable has been renamed as, when declared in a
try-with-resources, Checkstyle was confused by the shadowing of the
jarFile field and required references to jarFile within the try-block
the be prefixed with this.

See gh-19595
2020-01-15 20:43:54 +00:00
Andy Wilkinson 18462796bf Upgrade to Spring Kafka 2.3.5
Closes gh-19613
2020-01-15 20:36:13 +00:00
Andy Wilkinson 072b253b14 Upgrade to Spring Integration 5.2.3
Closes gh-19647
2020-01-15 20:35:31 +00:00
Andy Wilkinson cef9f0f3f5 Upgrade to Spring AMQP 2.2.3
Closes gh-19646
2020-01-15 20:34:06 +00:00
Andy Wilkinson b982bbec37 Upgrade to Spring Kafka 2.2.12.RELEASE
Closes gh-19761
2020-01-15 19:40:29 +00:00
Andy Wilkinson 5c7bd33fed Upgrade to Spring AMQP 2.1.13
Closes gh-19641
2020-01-15 19:38:48 +00:00
Andy Wilkinson 2e8dc83a80 Upgrade to Spring Data Moore-SR4
Closes gh-19648
2020-01-15 15:09:58 +00:00
Andy Wilkinson e6fa8530d7 Upgrade to Spring HATEOAS 1.0.3.RELEASE
Closes gh-19644
2020-01-15 15:09:58 +00:00
Andy Wilkinson 6e93ea3631 Upgrade to Spring Retry 1.2.5.RELEASE
Closes gh-19758
2020-01-15 15:09:58 +00:00
Andy Wilkinson 8d4711617f Upgrade to Slf4j 1.7.30
Closes gh-19757
2020-01-15 15:09:58 +00:00
Andy Wilkinson 5083209447 Upgrade to Postgresql 42.2.9
Closes gh-19756
2020-01-15 15:09:58 +00:00
Andy Wilkinson 89c20a3ada Upgrade to Neo4j Ogm 3.2.6
Closes gh-19755
2020-01-15 15:09:58 +00:00
Andy Wilkinson 443d1a6a21 Upgrade to Liquibase 3.8.5
Closes gh-19754
2020-01-15 15:09:58 +00:00
Andy Wilkinson 17d584fd1d Upgrade to Kotlin Coroutines 1.3.3
Closes gh-19753
2020-01-15 14:53:04 +00:00
Andy Wilkinson 57414039e6 Upgrade to Infinispan 9.4.17.Final
Closes gh-19752
2020-01-15 14:53:04 +00:00
Andy Wilkinson 2989af4cee Upgrade to Hibernate 5.4.10.Final
Closes gh-19751
2020-01-15 14:53:04 +00:00
Andy Wilkinson 911d86d232 Upgrade to Elasticsearch 6.8.6
Closes gh-19750
2020-01-15 14:53:04 +00:00
Andy Wilkinson 7ba8eed286 Upgrade to Jetty 9.4.25.v20191220
Closes gh-19749
2020-01-15 14:53:04 +00:00
Andy Wilkinson 570b1ba630 Upgrade to Groovy 2.5.9
Closes gh-19748
2020-01-15 14:53:04 +00:00
Andy Wilkinson 2d461fef37 Upgrade to Awaitility 4.0.2
Closes gh-19747
2020-01-15 14:53:03 +00:00
Andy Wilkinson 3de1abfacf Upgrade to Httpcore 4.4.13
Closes gh-19746
2020-01-15 14:53:03 +00:00
Andy Wilkinson a77ccf7763 Upgrade to Byte Buddy 1.10.6
Closes gh-19745
2020-01-15 14:53:03 +00:00
Andy Wilkinson d8645bafcd Upgrade to Mysql 8.0.19
Closes gh-19744
2020-01-15 14:53:03 +00:00
Andy Wilkinson 4df55a64ab Upgrade to Undertow 2.0.29.Final
Closes gh-19743
2020-01-15 14:53:03 +00:00
Andy Wilkinson 073d362078 Upgrade to Rxjava2 2.2.17
Closes gh-19742
2020-01-15 14:53:03 +00:00
Andy Wilkinson 285ae01691 Upgrade to Netty 4.1.45.Final
Closes gh-19741
2020-01-15 14:53:03 +00:00
Andy Wilkinson d6f93704e9 Upgrade to Dropwizard Metrics 4.1.2
Closes gh-19740
2020-01-15 14:48:21 +00:00
Andy Wilkinson cb951d1103 Upgrade to Hikaricp 3.4.2
Closes gh-19739
2020-01-15 14:48:19 +00:00
Andy Wilkinson 37e699b391 Upgrade to Unboundid Ldapsdk 4.0.14
Closes gh-19738
2020-01-15 14:48:18 +00:00
Andy Wilkinson bbcf9e2d9f Upgrade to Okhttp3 3.14.6
Closes gh-19737
2020-01-15 14:48:13 +00:00
Andy Wilkinson f47a75a9f9 Upgrade to Hazelcast 3.12.5
Closes gh-19736
2020-01-15 14:48:11 +00:00
Andy Wilkinson 1e9afc6482 Upgrade to Jackson 2.10.2
Closes gh-19735
2020-01-15 14:48:10 +00:00
Andy Wilkinson 589c58a21e Upgrade to Spring Retry 1.2.5.RELEASE
Closes gh-19734
2020-01-15 13:12:31 +00:00
Andy Wilkinson be11ddd4f9 Upgrade to Slf4j 1.7.30
Closes gh-19733
2020-01-15 13:12:31 +00:00
Andy Wilkinson 9989e14b0d Upgrade to Postgresql 42.2.9
Closes gh-19732
2020-01-15 13:12:31 +00:00
Andy Wilkinson 22c127878f Upgrade to Neo4j Ogm 3.1.16
Closes gh-19731
2020-01-15 13:12:31 +00:00
Andy Wilkinson b63f63ff9d Upgrade to Infinispan 9.4.17.Final
Closes gh-19730
2020-01-15 13:12:31 +00:00
Andy Wilkinson c52f2828a8 Upgrade to Hibernate 5.3.15.Final
Closes gh-19729
2020-01-15 13:12:31 +00:00
Andy Wilkinson 501f98c25c Upgrade to Jetty 9.4.25.v20191220
Closes gh-19728
2020-01-15 13:12:31 +00:00
Andy Wilkinson f2e93774e4 Upgrade to Groovy 2.5.9
Closes gh-19727
2020-01-15 13:12:30 +00:00
Andy Wilkinson 8ec2c77b83 Upgrade to Httpcore 4.4.13
Closes gh-19726
2020-01-15 13:12:30 +00:00
Andy Wilkinson 9f979cb03f Upgrade to Mysql 8.0.19
Closes gh-19725
2020-01-15 13:12:30 +00:00
Andy Wilkinson 3f45874245 Upgrade to Undertow 2.0.29.Final
Closes gh-19724
2020-01-15 13:12:30 +00:00
Andy Wilkinson 159be1a78d Upgrade to Rxjava2 2.2.17
Closes gh-19723
2020-01-15 13:12:30 +00:00
Andy Wilkinson f73c4a837c Upgrade to Netty 4.1.45.Final
Closes gh-19722
2020-01-15 13:12:30 +00:00
Andy Wilkinson 64df377600 Upgrade to Unboundid Ldapsdk 4.0.14
Closes gh-19721
2020-01-15 12:35:10 +00:00
Andy Wilkinson 1e6cc4c308 Upgrade to Hazelcast 3.11.6
Closes gh-19720
2020-01-15 12:35:08 +00:00
Andy Wilkinson 727b4d164e Upgrade to Jackson 2.9.10.20200103
Closes gh-19719
2020-01-15 12:35:07 +00:00
Andy Wilkinson 714a187d8f Rework dep mgmt again to avoid consumers picking up strict constraints
This paves the way for publishing Gradle module metadata once the
problem caused by snapshot versions and our two-step publication
process has been addressed.

See gh-19609
2020-01-15 12:33:18 +00:00
Andy Wilkinson 5bcd185ce1 Upgrade to Spring Data Lovelace-SR15
Closes gh-19642
2020-01-15 11:33:07 +00:00
Madhura Bhave aae1151f12 Merge branch '2.2.x'
Closes gh-19714
2020-01-14 18:52:35 -08:00
Madhura Bhave 3bf943d597 Merge branch '2.1.x' into 2.2.x
Closes gh-19713
2020-01-14 18:51:50 -08:00
Madhura Bhave f375277026 Merge pull request #19595 from nosan
* pr/19595:
  Polish "Limit ChronoField values to their range"
  Limit ChronoField values to their range

Closes gh-19595
2020-01-14 18:27:30 -08:00
Madhura Bhave 91e459a5d4 Polish "Limit ChronoField values to their range"
See gh-19595
2020-01-14 18:26:01 -08:00
Dmytro Nosan 9bc68b9877 Limit ChronoField values to their range
See gh-19595
2020-01-14 18:25:28 -08:00
Andy Wilkinson 244b5391bc Fix file handle leak in JarFileArchiveTests
Closes gh-19655
2020-01-14 17:20:29 +00:00
Stephane Nicoll dee71f064b Harmonize Cassandra bean names 2020-01-14 15:22:16 +01:00
Andy Wilkinson aefe52e4d0 Revert "Rework dep management to avoid consumers picking up strict constraints"
This reverts commit b34a311d02 as,
having disabled the publishing of Gradle's module metadata (4f75ab5),
the changes are no longer needed.

See gh-19609
2020-01-14 12:15:53 +00:00
Stephane Nicoll 246f5ce8eb Polish Cassandra v4 support 2020-01-14 12:25:44 +01:00
Stephane Nicoll e5499ca17a Upgrade to Spring Framework 5.2.3
Closes gh-19534
2020-01-14 11:34:54 +01:00
Stephane Nicoll 29163041ae Upgrade to Spring Framework 5.2.3
Closes gh-19531
2020-01-14 11:32:32 +01:00
Stephane Nicoll 717439d3a0 Upgrade to Spring Framework 5.1.13
Closes gh-19530
2020-01-14 11:30:57 +01:00
Brian Clozel 711391cf2f Move spring.http.* config properties namespace
Closes gh-18827
2020-01-14 10:45:31 +01:00
Stephane Nicoll 7f6b01c3d2 Make sure Redis cache prefix includes cache name
This commit maps 'spring.cache.redis.key-prefix' to the new
'prefixCacheNameWith' method introduced in Spring Data Neumann. This
makes sure that the configured prefix includes the cache name.

Closes gh-16676
2020-01-14 09:09:33 +01:00
Phillip Webb 3fe4245ab6 Disable failing TomcatReactiveWebServerFactoryTests
Temporarily disable some tests in `TomcatReactiveWebServerFactoryTests`
that fail since the Netty upgrade.

See gh-19702
2020-01-13 18:44:04 -08:00
Phillip Webb 862462b791 Update copyright year of changed files 2020-01-13 17:04:19 -08:00
Phillip Webb 1e5ba09a3e Merge branch '2.2.x' 2020-01-13 17:03:51 -08:00
Phillip Webb 15652ae4c1 Update copyright year of changed files 2020-01-13 16:47:17 -08:00
Phillip Webb f57281340c Merge branch '2.2.x' 2020-01-13 16:46:49 -08:00
Phillip Webb 3cfbfebbb1 Merge branch '2.1.x' into 2.2.x 2020-01-13 16:45:40 -08:00
Madhura Bhave d1f51e064b Merge branch '2.2.x'
Closes gh-19701
2020-01-13 14:15:01 -08:00
Madhura Bhave e60194c7d5 Ignore trailing slash when recording Web metrics
Fixes gh-18207
2020-01-13 14:14:28 -08:00
Phillip Webb 9bd49562fe Update copyright year of changed files 2020-01-13 14:09:11 -08:00
Scott Frederick c789592e26 Remove support for deprecated Elasticsearch Jest client
Closes #19676
2020-01-13 21:03:12 +01:00
Andy Wilkinson b34a311d02 Rework dep management to avoid consumers picking up strict constraints
Previously, enforcedPlatform dependencies were using to pull in the
constraints defined in spring-boot-dependencies and
spring-boot-parent and applied them strictly so that the constrained
version had to be used. This worked as intended in Spring Boot's own
build but incorrectly enforced those same strict version requirements
on external consumers of Spring Boot's modules.

This commit reworks how Spring Boot defines its internal dependency
management so that platform dependencies are exposed to external
consumers while enforced platform dependencies are using internally.

See gh-19609
2020-01-13 19:59:56 +00:00
Stephane Nicoll be79252fbd Upgrade to Reactor Dysprosium-SR3
Closes gh-19653
2020-01-13 20:27:57 +01:00
Stephane Nicoll b3d32c7214 Upgrade to Reactor Dysprosium-SR3
Closes gh-19643
2020-01-13 20:25:59 +01:00
Stephane Nicoll 405b9b7f93 Merge branch '2.2.x'
Closes gh-19693
2020-01-13 18:50:46 +01:00
dreis2211 852659684b Fix typo in NoSuchBeanDefinitionFailureAnalyzer exception
See gh-19690
2020-01-13 18:48:35 +01:00
Andy Wilkinson 550e042ff0 Merge branch '2.2.x'
Closes gh-19691
2020-01-13 17:13:58 +00:00
Andy Wilkinson 30e9ba4659 Upgrade to Jakarta Validation 2.0.2
Closes gh-19687
2020-01-13 17:11:48 +00:00
Andy Wilkinson 4a76bc8b46 Cope with different exception messages in ValidationException failure analyzer
Fixes gh-19671
2020-01-13 17:11:11 +00:00
Andy Wilkinson 9ca588631e Merge branch '2.2.x'
Closes gh-19689
2020-01-13 17:10:16 +00:00
Andy Wilkinson 27306369c5 Cope with different exception messages in ValidationException failure analyzer
Fixes gh-19671
2020-01-13 17:10:03 +00:00
dreis2211 d454c9653c Disable tests on Java 13 that require an incompatible Gradle version
See gh-19680
2020-01-13 16:51:55 +00:00
Stephane Nicoll f13ff3b939 Merge branch '2.2.x'
Closes gh-19686
2020-01-13 17:45:06 +01:00
Stephane Nicoll 101fd14286 Merge branch '2.1.x' into 2.2.x
Closes gh-19685
2020-01-13 17:44:45 +01:00
Stephane Nicoll 8b8a4ee65e Polish "Make equality checks defensive to null reference"
See gh-19540
2020-01-13 17:38:38 +01:00
liuhuan 6d8b849361 Make equality checks defensive to null reference
See gh-19540
2020-01-13 17:38:26 +01:00
Stephane Nicoll 4796701337 Merge branch '2.2.x'
Closes gh-19683
2020-01-13 17:24:08 +01:00
Stephane Nicoll 66755105ea Merge branch '2.1.x' into 2.2.x
Closes gh-19682
2020-01-13 17:21:24 +01:00
Dmytro Nosan b7e69890f3 Fix retrieval of parent logger in PoolingDataSourceBean
See gh-19637
2020-01-13 17:16:57 +01:00
Stephane Nicoll 738ba15d0c Merge branch '2.2.x'
Closes gh-19679
2020-01-13 17:01:17 +01:00
Stephane Nicoll 0c7dae0d51 Remove duplicate note in Hazelcast section of reference guide
Closes gh-19678
2020-01-13 17:00:28 +01:00
Brian Clozel b780e5247c Remove support for Elasticsearch transport client
The Elasticsearch transport client has been deprecated since Spring Boot
2.2.0 and is about to be removed from Spring Data Elasticsearch and
Elasticsearch itself in their next major releases.

The available REST client support variants are now the preferred way of
using Elasticsearch features.

Closes gh-19668
2020-01-13 16:00:18 +01:00
Andy Wilkinson 648e468c86 Build against Spring HATEOAS 1.1.0.M1 snapshots
See gh-19649
2020-01-13 14:56:10 +00:00
Stephane Nicoll ca1710ee56 Upgrade to Apache Cassandra 4.3.1
See gh-19588
2020-01-13 15:12:41 +01:00
Stephane Nicoll d282eb619f Upgrade to Elasticsearch 7.5.1
See gh-19588
2020-01-13 15:12:41 +01:00
Scott Frederick f268ede3c0 Start building against Spring Data Neumann-M1 snapshots
See gh-19588
2020-01-13 15:12:41 +01:00
Andy Wilkinson e415f759a2 Raise the minimum supported version of Gradle to 5.6
Closes gh-18777
2020-01-13 12:10:13 +00:00
Dmytro Nosan 25838b4794 Support nested requests in MetricsClientHttpRequestInterceptor
Prior to this commit, requests made by `HttpRequestInterceptor`
instances configured on `RestTemplate` would not be recorded
properly.

This commit ensures that nested requests are recorded separately.

See gh-19381
2020-01-13 12:18:20 +01:00
Andy Wilkinson b23b69fea3 Upgrade to Reactor Californium-SR15
Closes gh-19640
2020-01-13 11:02:41 +00:00
Andy Wilkinson c66d2e8039 Relax the Gradle plugin's Kotlin version constraint
Enforcing the spring-boot-dependencies platform makes for too strong
an opinion about the version of Kotlin that should be on the build
script's classpath. It clashes with the version of Kotlin that's
embedded in Gradle and used with Gradle's Kotlin DSL.

This commit switches to a normal platform (rather than an enforced
platform) which allows it to express an opinion about the version of
Kotlin without making it a strict requirement.

Closes gh-19609
2020-01-13 11:00:49 +00:00
Andy Wilkinson c8236a74d8 Upgrade to Spring Security 5.3.0.M1
Closes gh-19654
2020-01-13 11:00:49 +00:00
Andy Wilkinson 39d9e486dd Build against Reactor Dysprosium-SR3 snapshots
See gh-19653
2020-01-13 11:00:49 +00:00
Andy Wilkinson 16fe64ded4 Build against Micrometer 1.3.3 snapshots 2020-01-13 11:00:49 +00:00
Andy Wilkinson 3a2f25c6ff Build against Spring AMQP 2.2.3 snapshots
See gh-19651
2020-01-13 11:00:49 +00:00
Andy Wilkinson 7595336184 Build against Spring Integration 5.3.0.M1 snapshots
See gh-19650
2020-01-13 11:00:49 +00:00
Brian Clozel 18ccbf031a Remove validation starter from web starters
This commit removes the validation starter from the web and
webflux starters - we've reconsidered that choice since many were
not using this feature as part of their default web experience.

Thit commit also changes the default EL implementation for the
Jakarta implementation, aligning all servers on it and simplifying
dependency management (especially exclusions that were required
previously).

Closes gh-19550
2020-01-13 09:14:21 +01:00
Andy Wilkinson 6d16c7d860 Build against Spring Data Moore-SR4 snapshots
See gh-19648
2020-01-12 16:03:18 +00:00
Andy Wilkinson 3faf023da4 Build against Spring Integration 5.2.3 snapshots
See gh-19647
2020-01-12 16:03:18 +00:00
Andy Wilkinson 0509248bf7 Build against Spring AMQP 2.2.3 snapshots
See gh-19646
2020-01-12 16:03:05 +00:00
Andy Wilkinson 803a24d6f4 Build against Micrometer 1.3.3 snapshots
See gh-19645
2020-01-12 16:00:24 +00:00
Andy Wilkinson cedcbaccdb Build against Spring HATEOAS 1.0.3 snapshots
See gh-19644
2020-01-12 15:59:48 +00:00
Andy Wilkinson fbc958e4dd Build against Reactor Dysprosium-SR3 snapshots
See gh-19643
2020-01-12 15:59:00 +00:00
Andy Wilkinson 5e14e33c94 Start building against Micrometer 1.1.10 snapshots
See gh-19639
2020-01-12 10:44:01 +00:00
Andy Wilkinson 2d995e740a Start building against Spring Data Lovelace-SR15 snapshots
See gh-19642
2020-01-12 10:44:01 +00:00
Andy Wilkinson bcaae99fa9 Start building against Spring AMQP 2.1.13 snapshots
See gh-19641
2020-01-12 10:44:01 +00:00