Commit Graph

28111 Commits

Author SHA1 Message Date
Andy Wilkinson f9ff39a7a6 Merge branch '2.2.x' into 2.3.x
Closes gh-24014
2020-11-03 16:38:33 +00:00
Andy Wilkinson 35bff55097 Ensure that Quartz can be auto-configured with a Quartz-specific TM
Previously, Quartz could be configured with a specific DataSource
using `@QuartzDataSource` but it was not possible to configure a
Quartz-specific transaction manager. This could result in the
different DataSources being used by Quartz itself and Quart'z
DataSourceTransactionManager.

This commit introduces a new qualifier, `@QuartzTransactionManager`,
that can be used to avoid the above-described problem. Any
`@QuartzTransactionManager`-annotated bean will be used by the
Quartz auto-configure configuration instead of the application's main
`TransactionManager`. If no such qualified bean is present, the
application's main TransactionManager, if any, will be used as before.

Fixes gh-20184
2020-11-03 15:56:44 +00:00
Andy Wilkinson dc86e8ce30 Merge branch '2.2.x' into 2.3.x
Closes gh-24012
2020-11-03 14:58:28 +00:00
Andy Wilkinson 6548ca4c11 Implement equals and hashCode in TestTypeExcludeFilter
Fixes gh-23978
2020-11-03 14:50:00 +00:00
Andy Wilkinson 2dce4aa42b Merge branch '2.2.x' into 2.3.x
Closes gh-24009
2020-11-03 14:04:08 +00:00
Andy Wilkinson 30a0ccab02 Remove use of `@PostConstruct` from main code
When running on Java 11 (where `@PostConstruct` is no longer part of
the JRE) and without a dependency on jakarta-annotation-api,
`@PostContruct` annotions are silently dropped. This leads to obscure and
hard-to-track down changes in the behaviour of our auto-configuration
as the `@PostConstruct`-annotated methods are not invoked.

To allow users to run on Java 11 without having jakarta-annotation-api
on the classpath, this commit removes use of `@PostConstruct` from main
code. A Checkstyle rule has also been added to prevent its usage in
main code from being reintroduced.

Closes gh-23723
2020-11-03 13:59:38 +00:00
Andy Wilkinson 2513071b1f Merge branch '2.2.x' into 2.3.x
Closes gh-24006
2020-11-03 10:27:38 +00:00
Andy Wilkinson 622606d85a Make it clearer that only the main DataSource bean may be replaced
Closes gh-23808
2020-11-03 10:24:44 +00:00
Andy Wilkinson b846143c37 Merge branch '2.2.x' into 2.3.x
Closes gh-24004
2020-11-03 10:17:00 +00:00
Andy Wilkinson d32d65b02c Add tip about providing as much typo info as possible in @Bean methods
Closes gh-22925
2020-11-03 10:16:20 +00:00
Andy Wilkinson e820400748 Polish manifests of source and javadoc jars
Previously, the main jar file and the source and javadoc jar files all
had the same changes applied to their manifests.

The commit changes the Implementation-Title of source and javadoc jars
so that the title indicates that's what they are. Rather than using
the project's description as the title (as is done for the main jar),
the titles for source and javadoc jars will now be "Source for
${project.name}" and "Javadoc for ${project.name}" respectively.

Closes gh-23974
2020-11-03 09:50:36 +00:00
Andy Wilkinson 8294083c99 Make deployment integration tests run when war changes
Closes gh-23996
2020-11-02 17:33:58 +00:00
Stephane Nicoll 1e9c9b9d73 Add missing default values in configuration properties metadata
Closes gh-23991
2020-11-02 10:44:06 +01:00
Phillip Webb d87c437862 Fix release script distribution check
Update `BintrayService.isDistributionComplete` to use unpublished
artifacts.
2020-10-29 19:10:01 -07:00
Spring Buildmaster a2d87678df Next development version (v2.3.6.BUILD-SNAPSHOT) 2020-10-29 17:40:17 +00:00
Phillip Webb 33d66b7f82 Fix to spring-doc-resources version
See gh-23824
2020-10-29 09:16:37 -07:00
Phillip Webb b0c2687aa9 Update copyright year of changed files 2020-10-29 09:07:42 -07:00
Phillip Webb 2992f40222 Upgrade to spring-doc-resources 0.2.3.RELEASE
Closes gh-23824
2020-10-29 09:06:23 -07:00
Andy Wilkinson 70d9602b3f Merge branch '2.2.x' into 2.3.x
Closes gh-23969
2020-10-29 15:31:12 +00:00
Andy Wilkinson e7eb7739dc Use overriding rather than overridden getter methods in config prop AP
Fixes gh-23966
2020-10-29 15:30:46 +00:00
Stephane Nicoll eb77a20ea1 Merge branch '2.2.x' into 2.3.x 2020-10-29 16:26:40 +01:00
Spring Buildmaster 79a833539b Next development version (v2.2.12.BUILD-SNAPSHOT) 2020-10-29 13:47:25 +00:00
Stephane Nicoll cc3c898dfe Upgrade to github-changelog-generator 0.0.4
Closes gh-23965
2020-10-29 13:36:39 +01:00
Stephane Nicoll 3b899ee326 Merge branch '2.1.x' into 2.2.x 2020-10-29 13:35:50 +01:00
Spring Buildmaster 625a0c99cb Next development version (v2.1.19.BUILD-SNAPSHOT) 2020-10-29 11:15:37 +00:00
Stephane Nicoll 2520ab4aa1 Merge branch '2.2.x' into 2.3.x 2020-10-29 11:22:11 +01:00
Stephane Nicoll 7de2711396 Merge branch '2.1.x' into 2.2.x 2020-10-29 11:21:16 +01:00
Stephane Nicoll ec57251c55 Configure release script to use .RELEASE suffix 2020-10-29 11:01:32 +01:00
Andy Wilkinson dcb42c36f9 Ensure that additional metadata is available to annotation processor
Fixes gh-23934
2020-10-29 09:07:05 +00:00
Stephane Nicoll 4f92574483 Merge branch '2.2.x' into 2.3.x 2020-10-29 09:34:07 +01:00
Stephane Nicoll 770b5f4528 Merge branch '2.1.x' into 2.2.x
See gh-23962
2020-10-29 09:33:37 +01:00
Stephane Nicoll 6c0fc7f195 Workaround broken function in concourse scripts
See spring-io/concourse-java-scripts#11
2020-10-29 09:32:50 +01:00
Stephane Nicoll 165b132346 Merge branch '2.2.x' into 2.3.x 2020-10-29 08:30:11 +01:00
Stephane Nicoll a8db6a8a83 Merge branch '2.1.x' into 2.2.x
See gh-23962
2020-10-29 08:28:25 +01:00
Stephane Nicoll 3ebd247613 Workaround broken function in concourse scripts
See spring-io/concourse-java-scripts#11
2020-10-29 08:23:55 +01:00
Phillip Webb b86dcbec72 Merge branch '2.2.x' into 2.3.x
Closes gh-23959
2020-10-28 21:18:17 -07:00
Phillip Webb cf09451ffb Retain inner-class data on incremental compile
Ensure that metadata sourced from inner-types is not deleted when
performing an incremental compile. Prior to this commit, the source
type was searched using the `Outer$Inner` format. This is not supported
`Elements.getTypeElement` so we now convert the names to `Outer.Inner`.

Closes gh-10886
2020-10-28 21:13:08 -07:00
Phillip Webb 7f4a7c21d2 Merge branch '2.2.x' into 2.3.x
Closes gh-23939
2020-10-28 19:37:32 -07:00
Phillip Webb 9b4ccf4ac6 Upgrade CI to Java 15.0.1_9
Closes gh-23953
2020-10-28 19:36:33 -07:00
Phillip Webb ec032b372e Merge branch '2.2.x' into 2.3.x
Closes gh-23941
2020-10-28 19:33:51 -07:00
Phillip Webb 719d71e31b Merge branch '2.1.x' into 2.2.x
Closes gh-23943
2020-10-28 19:33:18 -07:00
Phillip Webb 327181455c Upgrade CI to Ubuntu Focal 20201008
Closes gh-23952
2020-10-28 19:29:59 -07:00
Phillip Webb 05f0022f76 Merge branch '2.2.x' into 2.3.x
Closes gh-23940
2020-10-28 19:26:47 -07:00
Phillip Webb cf7e16e134 Merge branch '2.1.x' into 2.2.x
Closes gh-23950
2020-10-28 19:26:21 -07:00
Phillip Webb 88a1055916 Upgrade CI to Java 11.0.9_11
Closes gh-23947
2020-10-28 19:25:05 -07:00
Phillip Webb 1246597644 Merge branch '2.2.x' into 2.3.x
Closes gh-23942
2020-10-28 19:21:35 -07:00
Phillip Webb 7c188e1446 Merge branch '2.1.x' into 2.2.x
Closes gh-23951
2020-10-28 19:19:46 -07:00
Phillip Webb 6f6c0e9d08 Upgrade CI to jdk8u272-b10
Closes gh-23946
2020-10-28 19:19:00 -07:00
Stephane Nicoll 425a2084ac Upgrade to Spring Kafka 2.5.7
Closes gh-23787
2020-10-28 22:32:55 +01:00
Stephane Nicoll 18e7d6df07 Merge branch '2.2.x' into 2.3.x 2020-10-28 22:32:22 +01:00