Commit Graph

146 Commits

Author SHA1 Message Date
Stephane Nicoll
052565ef2b Merge branch '2.3.x' into 2.4.x
Closes gh-24626
2021-01-01 09:18:13 +01:00
dreis2211
261b7a5b18 Update copyrights to 2021
See gh-24625
2021-01-01 09:17:13 +01:00
Stephane Nicoll
08b692581a Prepare 2.4.x branch 2020-12-14 14:22:07 +01:00
Brian Clozel
dc9cdb71f5 Merge branch '2.3.x'
Closes gh-24381
2020-12-07 20:29:14 +01:00
Brian Clozel
d2895e7453 Upgrade to Spring Doc Resources 0.2.5
Fixes gh-24146
2020-12-07 20:28:04 +01:00
Phillip Webb
e0a061707e Fix checkstyle header violation
See gh-24337
2020-12-05 07:51:37 -08:00
Phillip Webb
30c27274e2 Merge branch '2.3.x'
Closes gh-24339
2020-12-04 18:31:55 -08:00
Phillip Webb
5f351a6983 Merge branch '2.2.x' into 2.3.x
Closes gh-24338
2020-12-04 18:21:57 -08:00
Stephane Nicoll
b3165f1b36 Merge branch '2.3.x'
Closes gh-24196
2020-11-18 10:35:39 +01:00
Stephane Nicoll
ac05356427 Merge branch '2.2.x' into 2.3.x
Closes gh-24195
2020-11-18 10:34:17 +01:00
Andy Wilkinson
bce2029bc6 Merge branch '2.3.x'
Closes gh-24132
2020-11-12 08:12:39 +00:00
Andy Wilkinson
189046bd4f Revert "Reduce scope of META-INF customizations to main, source, and javadoc jars"
Closes gh-24131
2020-11-12 08:11:00 +00:00
Brian Clozel
fe359bcbfb Merge branch '2.3.x'
Closes gh-24067
2020-11-06 14:49:42 +01:00
Brian Clozel
e98db484bc Upgrade to spring-doc-resources 0.2.4
Closes gh-24066
2020-11-06 14:48:53 +01:00
Andy Wilkinson
38821c15da Merge branch '2.3.x'
Closes gh-24057
2020-11-05 15:01:49 +00:00
Andy Wilkinson
1e100677c7 Reduce scope of META-INF customizations to main, source, and javadoc jars
Closes gh-23955
2020-11-05 15:01:08 +00:00
Andy Wilkinson
d6f10e16f7 Merge branch '2.3.x'
Closes gh-24056
2020-11-05 14:37:49 +00:00
Andy Wilkinson
49ea023a64 Upgrade to test-retry-gradle-plugin 1.1.9
Closes gh-24055
2020-11-05 14:37:22 +00:00
Andy Wilkinson
b50f8359b5 Merge branch '2.3.x'
Closes gh-24003
2020-11-03 09:51:06 +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
Phillip Webb
fe28ad88db Merge branch '2.3.x' 2020-10-29 09:17:42 -07:00
Phillip Webb
33d66b7f82 Fix to spring-doc-resources version
See gh-23824
2020-10-29 09:16:37 -07:00
Phillip Webb
98dbfd572f Merge branch '2.3.x'
Closes gh-23971
2020-10-29 09:06:59 -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
dcb42c36f9 Ensure that additional metadata is available to annotation processor
Fixes gh-23934
2020-10-29 09:07:05 +00:00
Andy Wilkinson
3be4e225e7 Merge branch '2.3.x'
Closes gh-23954
2020-10-28 20:19:43 +00:00
Andy Wilkinson
9b12d2d7cb Ensure that additional metadata is available to annotation processor
Fixes gh-23934
2020-10-28 20:18:36 +00:00
Andy Wilkinson
1c4b4cb0cd Provide config properties for configuring WebFlux's locale resolution
Previously, the locale context resolver used with WebFlux could only be
configured by provided a custom LocaleContextResolver bean. By
constrast, when using Spring MVC, the spring.mvc.locale and
spring.mvc.locale-resolver properties could be used to configure the
locale and the resolver (fixed or Accept header) respectively.

This commit introduces spring.web.locale and spring.web.locale-resolver
properties and deprecates their spring.mvc equivalents. The new
properties can be used to configure locale resolution with either
Spring MVC or WebFlux.

Closes gh-23449
2020-10-27 11:12:00 +00:00
Phillip Webb
79b98c9edd Add ConfigurationProperty.toString() for debugging
Update `ConfigurationProperty` with a sensible `toString()` to help
debug task failures.
2020-10-26 23:47:13 -07:00
Scott Frederick
d44ecf5086 Merge branch '2.3.x'
Closes gh-23731
2020-10-16 18:00:09 -05:00
Scott Frederick
9c672deb2d Add javadoc links in Maven plugin parameter docs
This commit modifies the documentation generated for the
Maven plugin to include links to javadoc when Spring
Boot types are mentioned. Some javadoc was also polished
to improve the generated docs.

Fixes gh-21555
2020-10-16 17:45:46 -05:00
Andy Wilkinson
23073d9e76 Make block switches work on every page of multi-page docs
There's a bug in some versions of AsciidoctorJ where extensions are
only called on this first conversion performed by a given Asciidoctor
instance. This affects the multi-page documentation where there are
multiple conversions performed – one for each page in the
documentation.

This commit upgrades the version of AsciidoctorJ used by the
Asciidoctor Gradle plugin to 2.4.1, which contains fix for the problem.

Closes gh-23709
2020-10-16 14:44:14 +01:00
Phillip Webb
68d65376d2 Refine configuration property table column sizes
Increase the size of the first column to improve readability.

Closes gh-23604
2020-10-06 19:26:12 -07:00
Stephane Nicoll
75554ce236 Polish "Add support for Oracle UCP"
See gh-23403
2020-09-29 16:09:55 +02:00
Andy Wilkinson
1591da6ce4 Update Bomr to treat CalVer versions as newer than release train versions
Closes gh-23451
2020-09-24 10:50:37 +01:00
Andy Wilkinson
f0dfff81d4 Merge branch '2.3.x'
Closes gh-23378
2020-09-16 18:26:36 +01:00
Andy Wilkinson
358b9f839a Remove spring-boot.version property from spring-boot-dependencies
The version of Spring Boot should not be modifiable by a property,
only being using a different version of spring-boot-dependencies or
spring-boot-starter-parent.

Fixes gh-23174
2020-09-16 18:25:17 +01:00
Andy Wilkinson
3a4228c432 Make it possible to link to individual configuration properties
Closes gh-16267
2020-09-11 15:39:37 +01:00
dreis2211
be56cac2bb Note starters' and annotation processors' jar type in their manifest
See gh-22203
2020-09-10 14:37:06 +01:00
Andy Wilkinson
e240c180f3 Merge branch '2.3.x'
Closes gh-22831
2020-08-07 17:19:03 +01:00
Andy Wilkinson
181e3b34ba Isolate Maven Plugin's integration tests from repo.spring.io
Previously, the Maven plugin integration tests used a settings.xml file
that defined https://repo.spring.io/snapshot as a repository. This
allowed them to resolve snapshots of the plugin's Spring Framework
dependencies but it had the unfortunate side-effect of also allowing
them to resolve snapshots of other Spring Boot modules from Artifactory
rather than using those currently being built.

This commit replaces the repositories in settings.xml with a Gradle
task that resolves the necessary dependencies and populates a local
repository with the dependencies' jars and pom files. This is achieved
using a ComponentMetadataRule that creates a custom variant of each
dependency that includes its pom file, inspired by the example in
gradle/gradle/#11449. A configuration that extends the
runtimeClasspath configuration and select the custom variant via its
attribute is then used to resolve the jars and pom files of the runtime
classpath such that they can then be used to populate the local
repository.

Closes gh-22828
2020-08-07 17:18:47 +01:00
Andy Wilkinson
d064ccabc4 Ensure Maven plugin descriptor inputs are out-of-date on version change
Closes gh-22766
2020-08-06 18:18:04 +01:00
Andy Wilkinson
782adc5f5f Merge branch '2.3.x'
Closes gh-22772
2020-08-06 18:17:36 +01:00
Stephane Nicoll
dac63fc3e5 Polish 2020-08-06 17:35:01 +02:00
Andy Wilkinson
a495b83b25 Ensure Maven plugin descriptor inputs are out-of-date on version change
Closes gh-22766
2020-08-06 16:25:45 +01:00
Brian Clozel
6f2098ad71 Upgrade to Spring Framework 5.3.0-SNAPSHOT
This commit also switches to RSocket SNAPSHOTs and updates the
repository configuration to rely on "libs-snapshot", since the RSocket
SNAPSHOTs are mirrored there.

See gh-22640
2020-07-29 14:41:17 +02:00
Stephane Nicoll
8c418adb9b Polish "Add auto-configuration for Neo4j driver"
See gh-22301
2020-07-27 16:26:32 +02:00
Gerrit Meier
6134ff19f9 Add auto-configuration for Neo4j driver
This commit adds the support for creating a managed instance of the
Neo4j Java driver. The low-level support for Neo4j is helpful in
situations where the high-level abstraction of Spring Data Neo4j is not
needed.

See gh-22301
2020-07-27 16:26:32 +02:00
Andy Wilkinson
98115239b3 Only create effective bom artifact when needed
Closes gh-22143
2020-07-24 16:44:46 +01:00
Andy Wilkinson
1f27644e9d Merge branch '2.3.x'
Closes gh-22363
2020-07-16 16:10:08 +01:00