Commit Graph

35 Commits

Author SHA1 Message Date
Andy Wilkinson
46c30d6bb0 Merge branch '2.1.x'
Closes gh-18476
2019-10-02 10:48:57 +01:00
Andy Wilkinson
3d4157ad6d Correct SCM URLs in published poms
Previously, Maven's default behaviour was relied up which resulted
in the artifact ID being appended to each URL as it was inherited.
This behaviour can only be disabled in Maven 3.6 and later, a version
that we cannot use due to an incompatibility with the Flatten Plugin.

This commit works around Maven's default behaviour by defining
properties for the SCM URL, connection, and developer connection and
then explicitly defining the settings in each pom using these
properties. The explicit definition of the properties in each pom
prevents them being inherited from the parent, thereby disabling the
unwanted appending of the artifact ID to the URL.

Fixes gh-18328
2019-10-02 10:48:30 +01:00
Phillip Webb
8bc780762a Merge branch '2.1.x' 2019-07-24 11:42:48 +01:00
Phillip Webb
913e831f4e Merge '1.5.x' into 2.0.x 2019-07-24 11:39:58 +01:00
Phillip Webb
01933f9b06 Merge previously split strings
Merge some string lines that were previously split because of the
90 chars wide formatting.
2019-07-15 00:24:19 +01:00
Phillip Webb
c3816bfe7b Polish output capture names 2019-07-15 00:24:18 +01:00
Phillip Webb
a66c4d3096 Unify method visibility of private classes
Apply checkstyle rule to ensure that private and package private
classes do not have unnecessary public methods. Test classes have
also been unified as much as possible to use default scoped
inner-classes.

Closes gh-7316
2019-07-03 11:39:47 -07:00
Stephane Nicoll
e560b7f6ba Remove public modifier on JUnit5 lifecycle methods
See gh-17292
2019-06-21 18:09:05 +02:00
Andy Wilkinson
b18fffaf14 Move tests to JUnit 5 wherever possible 2019-06-07 12:25:54 +01:00
Andy Wilkinson
aef92b9295 Merge branch '2.1.x'
Closes gh-17079
2019-06-07 11:00:44 +01:00
Andy Wilkinson
c6c139d980 Merge branch '1.5.x' into 2.0.x 2019-06-07 10:46:31 +01:00
Andy Wilkinson
0644a79401 Repackage output capture and always use extension declaratively
Closes gh-17029
2019-05-31 18:33:10 +01:00
Andy Wilkinson
36c1c051b8 Merge branch '2.1.x' 2019-03-20 16:55:10 +00:00
Andy Wilkinson
9fbd38ab3c Merge branch '1.5.x' into 2.0.x 2019-03-20 16:45:26 +00:00
Andy Wilkinson
b828b398b5 Merge branch '2.1.x' 2019-03-19 17:11:45 +00:00
Spring Operator
3e2b6ac8ed Update build and setup configuration to use HTTPS
See gh-16246
2019-03-19 16:58:31 +00:00
Andy Wilkinson
68bfb020aa Reduce need for bean method proxying and disable where not needed
Closes gh-9068
2019-03-12 13:18:42 +00:00
Stephane Nicoll
4cae2c9c94 Polish "Avoid NPE when replacement property does not exist"
Closes gh-15394
2018-12-28 18:19:12 +01:00
hdeadman
a1b71ef910 Avoid NPE when replacement property does not exist
See gh-15394
2018-12-28 15:34:23 +01:00
Stephane Nicoll
a6ff7c786a Remove test starter from core module
Closes gh-15463
2018-12-14 08:44:43 +01:00
Phillip Webb
997de53f20 Remove uncessary call in PropertiesMigrationReport
Closes gh-14974
2018-10-26 16:35:00 -07:00
Phillip Webb
7fc455654a Fix checkstyle ternary issues
Fix checkstyle issues with ternary expressions following the
spring-javaformat upgrade.

See gh-13932
2018-07-28 01:11:52 +01:00
Phillip Webb
41efea51a7 Polish ternary expressions
Consistently format ternary expressions and always favor `!=` as the
the check.
2018-05-03 22:43:12 -07:00
Phillip Webb
c0d79b9273 Rationalize multi-document config file handling
Update `PropertySourceLoader` so that it no longer needs to deal with
matching multi-document files using the `spring.profile` property. The
loader now simply returns one or more `PropertSource` instances for a
given `Resource`.

All property matching now occurs in the `ConfigFileApplicationListener`.
This allows document processing logic to be contained in a single place,
and allows us to rationalize the algorithm so that negative matching
profiles are processed last.

Fixes gh-12159
2018-02-26 23:30:09 -08:00
Phillip Webb
4bde6b80ee Refactor YAML profile to deal with "!" profiles
Drop `SpringProfileDocumentMatcher` and replace it with two new
implementations that restrict when YAML documents are loaded. YAML
sections are now restricted both on the specific profile that is being
loaded, and the profiles that are currently accepted.

The `PropertySourceLoader` interface has been refined to include a
predicate that determines when a profile is accepted. The
`ConfigFileApplicationListener` simply delegates the predicate logic to
the `Environment`.

Fixes gh-8011
2018-02-21 01:57:03 -08:00
Stephane Nicoll
2d814e5102 Restore "Reason: " prefix 2018-01-30 15:14:49 +01:00
Stephane Nicoll
3291a7a76d Polish 2018-01-30 14:46:09 +01:00
Phillip Webb
af50a18da9 Polish 2018-01-29 09:47:03 -08:00
Stephane Nicoll
bdd532cc20 Clarify when a property was not renamed due to an incompatible type
Closes gh-11794
2018-01-29 10:30:59 +01:00
Stephane Nicoll
43e5e83d9c Transparently handle migration from number to java.util.Duration
See gh-11794
2018-01-29 09:59:38 +01:00
Phillip Webb
b234501af3 Polish 2018-01-26 11:39:41 -08:00
Stephane Nicoll
43bac617d4 Add access to short deprecation reason
Closes gh-11770
2018-01-25 12:47:54 +01:00
Andy Wilkinson
4c23afdcd8 Polish 2018-01-25 11:04:16 +00:00
Phillip Webb
e53bef737f Rename property migrator classes
Rename packages and classes to match the new module name.

See gh-11301
2018-01-24 15:54:24 -08:00
Stephane Nicoll
b1525f4f2e Rename spring-boot-deprecated-properties-support
Rename `spring-boot-deprecated-properties-support` to
`spring-boot-properties-migrator`.

See gh-11301
2018-01-24 11:15:17 +01:00