Commit Graph

11806 Commits

Author SHA1 Message Date
Phillip Webb
6c2ff56fba Fix tests to also work in IDE 2021-01-12 17:31:53 -08:00
Scott Frederick
a9e711e503 Enforce builder and run images in the same registry
Previously, when an authenticated Docker builder registry was
configured in the Maven or Gradle plugin and the builder and run
images specified different registries, the authentication credentials
would be sent to both registries. This could cause confusion if both
registries don't recognize the same credentials. This commit enforces
that both images are in the same registry when authentication
is configured.

Fixes gh-24552
2021-01-12 17:50:28 -06:00
Phillip Webb
a6a7c06e55 Merge branch '2.3.x' into 2.4.x 2021-01-12 12:04:11 -08:00
Phillip Webb
9da0bd8523 Update copyright year of changed files 2021-01-12 12:02:57 -08:00
Phillip Webb
b6cb9c016f Detect bad properties in profile specific files
Throw an `InvalidConfigDataPropertyException` if bad properties are
detected in profile specific files. The following properties will now
trigger an exception if used in a profile specific file:

	`spring.profiles.include`
	`spring.profiles.active`
	`spring.profiles.default`
	`spring.config.activate.on-profile`
	`spring.profiles`

Prior to this commit, profile based properties in a profile specific
file would be silently ignored, making them hard to find.

Fixes gh-24733
2021-01-12 11:48:19 -08:00
Madhura Bhave
5ed2b11e34 Fix typo 2021-01-12 10:59:59 -08:00
Andy Wilkinson
5cae1a2842 Merge branch '2.3.x' into 2.4.x
Closes gh-24790
2021-01-12 16:03:48 +00:00
Andy Wilkinson
7b1d07fa98 Use SpringSessionDataSource-annotated DataSource when one is available
Fixes gh-24624
2021-01-12 15:47:33 +00:00
Stephane Nicoll
c5d4ca933b Upgrade to Reactor Dysprosium-SR16
Closes gh-24765
2021-01-12 15:00:11 +01:00
Andy Wilkinson
c3dfb9bd29 Merge branch '2.3.x' into 2.4.x
Closes gh-24768
2021-01-12 13:12:10 +00:00
Andy Wilkinson
997505005b Handle files larger than Integer.MAX_VALUE bytes in bootJar and bootWar
Fixes gh-24618
2021-01-12 13:11:46 +00:00
Stephane Nicoll
f02951fb17 Upgrade to Netty 4.1.56.Final
Closes gh-24764
2021-01-12 09:55:44 +01:00
Stephane Nicoll
2e69198f97 Upgrade to Neo4j OGM 3.2.19
Closes gh-24763
2021-01-12 09:55:43 +01:00
Stephane Nicoll
5fb1ca6043 Upgrade to Johnzon 1.2.9
Closes gh-24762
2021-01-12 09:55:41 +01:00
Stephane Nicoll
37f653121f Upgrade to Jetty Reactive HTTPClient 1.1.5
Closes gh-24761
2021-01-12 09:55:40 +01:00
Stephane Nicoll
3ae9639cbb Upgrade to Jackson Bom 2.11.4
Closes gh-24760
2021-01-12 09:55:38 +01:00
Stephane Nicoll
371e59cd80 Upgrade to Hibernate Validator 6.1.7.Final
Closes gh-24759
2021-01-12 09:55:37 +01:00
Stephane Nicoll
e48e48988a Upgrade to Hibernate 5.4.27.Final
Closes gh-24758
2021-01-12 09:55:35 +01:00
Stephane Nicoll
66daeab221 Upgrade to Hazelcast 3.12.11
Closes gh-24757
2021-01-12 09:55:34 +01:00
Stephane Nicoll
682c952306 Upgrade to Dropwizard Metrics 4.1.17
Closes gh-24756
2021-01-12 09:55:32 +01:00
Stephane Nicoll
7ab9fad062 Upgrade to Byte Buddy 1.10.19
Closes gh-24755
2021-01-12 09:55:31 +01:00
Stephane Nicoll
b3bc79b10f Upgrade to AppEngine SDK 1.9.84
Closes gh-24754
2021-01-12 09:55:29 +01:00
Stephane Nicoll
8058370f3e Upgrade to Spring Framework 5.3.3
Closes gh-24699
2021-01-12 08:28:33 +01:00
Phillip Webb
bd21c43d71 Simplify resource registration
Simplify resource registration by using the new Spring Framework API
that allows `Resource` instances to be registered directly.

See gh-24745
2021-01-11 16:40:42 -08:00
Phillip Webb
f1fcfa6fc3 Merge branch '2.3.x' into 2.4.x
Closes gh-24748
2021-01-11 14:53:57 -08:00
Phillip Webb
72dd3b5628 Merge branch '2.2.x' into 2.3.x
Closes gh-24747
2021-01-11 14:21:56 -08:00
Phillip Webb
f9e3e0d532 Register default resource path using a Resource
Update `WebMvcAutoConfiguration` so that the default "/" resource path
is registered directly as a `ServletContextResource`.

Closes gh-24745
2021-01-11 14:20:46 -08:00
Phillip Webb
53a6fa2fed Respect spring.dao.exceptiontranslation setting
Update `DataSourceTransactionManagerAutoConfiguration` to respect
the `spring.dao.exceptiontranslation` setting. If `exceptiontranslation`
is `false` then we create a classic `DataSourceTransactionManager`
rather than a `JdbcTransactionManager`.

Fixes gh-24321
2021-01-11 13:57:47 -08:00
Phillip Webb
cff3e4c831 Fix tests following upstream framework changes 2021-01-11 13:39:21 -08:00
Phillip Webb
039df1d96d Test spring.profiles.include in profile file
Add a test to ensure that `spring.profiles.include` is not silently
ignored when used in a profile-specific file.

See gh-24733
2021-01-11 12:04:14 -08:00
Phillip Webb
26a68ca2cf Polish 2021-01-11 12:04:07 -08:00
Stephane Nicoll
31de36565f Upgrade to Reactor 2020.0.3
Closes gh-24698
2021-01-11 16:29:13 +01:00
Andy Wilkinson
5ae9fbedcd Merge branch '2.3.x' into 2.4.x
Closes gh-24738
2021-01-11 11:33:30 +00:00
Andy Wilkinson
7625a979db Configure bootRun to use project's Java toolchain by default
Previously, unlike the application plugin's run task, our bootRun task
ignored the project's Java toolchain. This meant that the application
was run on a JVM with the same Java version as the one being used by
Gradle itself. This could result in a failure if the application
required a more modern JVM.

This commit updates the plugin to configure the bootRun task's
JavaLauncher convention to be one derived from the project's Java
toolchain. Toolchain support was introduced in Gradle 6.7 so this is
only done when using Gradle 6.7 and later.

Fixes gh-24517
2021-01-11 11:21:53 +00:00
Andy Wilkinson
3c3aa9e486 Merge branch '2.3.x' into 2.4.x
Closes gh-24735
2021-01-11 11:03:35 +00:00
Andy Wilkinson
064de4e073 Check configured JavaLauncher when determining version of the JVM
Previously, bootRun assumed that the Java version of the JVM that would
run the application would be the same as the Java version of the JVM
that is running the build. This assumption does not hold true when
Gradle's toolchain support is used to configure tasks that fork a new
JVM to use a version other than that being used by Gradle itself.

This commit updates the BootRun task to query the JavaLauncher property
when determining the version of Java on which the application will be
run. Toolchain support and the JavaLauncher property are new in Gradle
6.7. To support earlier versions of Gradle, NoSuchMethodError is caught
we continue as if no JavaLauncher has been configured and use the local
JVM's Java version.

Fixes gh-24512
2021-01-11 10:36:16 +00:00
Stephane Nicoll
097f878981 Upgrade to Kafka 2.6.1
Closes gh-24247
2021-01-11 09:20:59 +01:00
Stephane Nicoll
50019a7f44 Upgrade to Thymeleaf Layout Dialect 2.5.2
Closes gh-24731
2021-01-11 09:20:24 +01:00
Stephane Nicoll
aad3de2ba7 Upgrade to Spring Retry 1.3.1
Closes gh-24730
2021-01-11 09:20:22 +01:00
Stephane Nicoll
d7e6f963ab Upgrade to Netty 4.1.56.Final
Closes gh-24729
2021-01-11 09:20:20 +01:00
Stephane Nicoll
5f63b22286 Upgrade to Johnzon 1.2.9
Closes gh-24728
2021-01-11 09:20:19 +01:00
Stephane Nicoll
8867544d0d Upgrade to Jetty Reactive HTTPClient 1.1.5
Closes gh-24727
2021-01-11 09:20:17 +01:00
Stephane Nicoll
fc6fa74691 Upgrade to Jackson Bom 2.11.4
Closes gh-24726
2021-01-11 09:20:16 +01:00
Stephane Nicoll
d691d63b1e Upgrade to Hibernate Validator 6.1.7.Final
Closes gh-24725
2021-01-11 09:20:14 +01:00
Stephane Nicoll
bc0a1ff852 Upgrade to Hibernate 5.4.27.Final
Closes gh-24724
2021-01-11 09:20:13 +01:00
Stephane Nicoll
487f694872 Upgrade to Dropwizard Metrics 4.1.17
Closes gh-24723
2021-01-11 09:20:11 +01:00
Stephane Nicoll
a60b5e0f70 Upgrade to Byte Buddy 1.10.19
Closes gh-24722
2021-01-11 09:20:10 +01:00
Stephane Nicoll
180493422d Upgrade to AppEngine SDK 1.9.84
Closes gh-24721
2021-01-11 09:20:08 +01: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 ad164269e9 and adds
some additional tests.

Fixes gh-24192
2021-01-08 15:32:19 +00:00