root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity
28,398 Commits 23 Branches 348 Tags 287 MiB
Commit Graph

10538 Commits

Author SHA1 Message Date
Phillip Webb 8fd9c685a2 Reduce HTTP debug logging when building image 
Update `BuildImageMojo` so that commons HTTP wire logging is configured
to ERROR. Without this update, running `mvn -X` will produce a great
deal of logging since by default HTTP Client logs all bytes transfered
at DEBUG and Maven will enable DEBUG for all logs.

Closes gh-22674
 2020-08-19 13:20:06 -07:00
Phillip Webb c8d7aa8fbc Upgrade to Spring Kafka 2.6.0-SNAPSHOT 
See gh-23012
 2020-08-19 10:55:19 -07:00
Phillip Webb 847baba0b1 Upgrade to Spring AMQP 2.3.0-SNAPSHOT 
See gh-23011
 2020-08-19 10:53:39 -07:00
Phillip Webb 0beb30bb5a Upgrade to Spring Integration 5.4.0-SNAPSHOT 
See gh-23010
 2020-08-19 10:52:25 -07:00
Phillip Webb ea8bd75ba1 Merge branch '2.3.x' 2020-08-19 10:34:17 -07:00
Phillip Webb 73038267a0 Merge branch '2.2.x' into 2.3.x 2020-08-19 10:34:06 -07:00
Phillip Webb 17e2d72bcb Fix Windows path issue in JarFileWrapperTests 
See gh-22991
 2020-08-19 10:33:23 -07:00
Phillip Webb bb57c7eacf Merge branch '2.3.x' 2020-08-19 10:26:25 -07:00
Phillip Webb 8722c2c5de Close writer after use in ExtractCommandTests 
Update `ExtractCommandTests` so that the writer is closed after the
contents have been written.

See gh-22993
 2020-08-19 10:25:37 -07:00
Phillip Webb bd5266b9b1 Merge branch '2.3.x' 2020-08-19 10:22:55 -07:00
Phillip Webb 0dd38a7264 Merge branch '2.2.x' into 2.3.x 2020-08-19 10:22:45 -07:00
Phillip Webb 3fe2005e06 Use @AfterEach to close the source jar file 
Update `JarFileWrapperTests` so that the jar files are closed after each
test.

See gh-22991
 2020-08-19 10:22:10 -07:00
Stephane Nicoll d04f2583f1 Merge branch '2.3.x' 
Closes gh-23005
 2020-08-19 10:09:43 +02:00
Stephane Nicoll 9a374f7d67 Merge branch '2.2.x' into 2.3.x 
Closes gh-23004
 2020-08-19 10:09:22 +02:00
dreis2211 06eb7e9777 Mention correct JUnit 5 annotations in Kotlin testing section 
See gh-23002
 2020-08-19 10:07:40 +02:00
Phillip Webb 899e8e189b Merge branch '2.3.x' 
Closes gh-23001
 2020-08-18 16:49:12 -07:00
Phillip Webb f7452b9383 Ensure LayoutFactory is not passed an empty file 
Update `Repackager` to ensure that `getLayout` is called before we
backup the source file. This restores earlier behavior that some
custom `ModuleFactory` implementations were relying on.

Closes gh-22995
 2020-08-18 16:45:44 -07:00
Phillip Webb cfc053d75e Merge branch '2.3.x' 2020-08-18 16:21:23 -07:00
Phillip Webb c5b12effbf Merge branch '2.2.x' into 2.3.x 2020-08-18 16:21:03 -07:00
Phillip Webb 2a137a2d8a Remove Mockito from JarFileWrapperTests 
Remove Mockto from JarFileWrapperTests since it seems to be failing on
later versions of Java.

See gh-22991
 2020-08-18 16:20:05 -07:00
Phillip Webb ea8762c484 Update copyright year of changed files 2020-08-18 15:40:05 -07:00
Phillip Webb 2fb08ca48f Merge branch '2.3.x' 2020-08-18 15:39:29 -07:00
Phillip Webb 15a0cbc96b Update copyright year of changed files 2020-08-18 15:39:23 -07:00
Phillip Webb aa2580bb51 Merge branch '2.3.x' 2020-08-18 15:39:08 -07:00
Phillip Webb ba2ab3363b Merge branch '2.2.x' into 2.3.x 2020-08-18 15:38:53 -07:00
Phillip Webb 60b5de192c Merge branch '2.2.x' into 2.3.x 2020-08-18 15:38:11 -07:00
Phillip Webb 4e76138ebc Update copyright year of changed files 2020-08-18 15:37:59 -07:00
Phillip Webb 5997cbd21f Refine AbstractJarFile method visibility 
Refine method visibility in an attempt to fix test issues on Java 11+.

See gh-22991
 2020-08-18 15:37:37 -07:00
Scott Frederick 341615d7d0 Merge branch '2.3.x' 
Closes gh-23000
 2020-08-18 17:07:25 -05:00
Scott Frederick 3f80638a36 Fail on layertools extract with launch script 
This commit adds a check to the `layertools extract` command to
ensure that the jar file being processed is readable and has a
valid directory.

Fixes gh-22993
 2020-08-18 17:06:31 -05:00
Phillip Webb b60820564e Merge branch '2.3.x' 
Closes gh-22999
 2020-08-18 14:35:59 -07:00
Phillip Webb 2b1b096fac Merge branch '2.2.x' into 2.3.x 
Closes gh-22998
 2020-08-18 14:35:45 -07:00
Phillip Webb aac367e9c5 Attempt to fix memory leak in JarFile class 
Create a new `JarFileWrapper` class so that we can wrap and existing
`JarFile` and offer a version that can be safely closed.

Prior to this commit, we provided wrapper functionality in the `JarFile`
class itself. Unfortunately, because we override `close` and also create
a lot of wrappers this caused memory issues when running on Java 11.

With Java 11 `java.util.zip.ZipFile` class uses `FinalizableResource`
for any implementation that overrides `close()`. This means that any
wrapper classes will not be garbage collected until the JVM finalizer
thread runs.

Closes gh-22991
 2020-08-18 14:07:03 -07:00
Stephane Nicoll 0b28236e55 Rename neo4j.version to neo4j-java-driver.version 
Closes gh-22952
 2020-08-18 11:00:11 +02:00
Phillip Webb 9460d74e8a Rename CompositeMeterRegistryAutoConfiguration 
Rename `CompositeMeterRegistryAutoConfiguration` to
`MeterRegistryAutoConfiguration` since it can also create non-composite
registries.

Closes gh-22988
 2020-08-17 16:41:10 -07:00
Phillip Webb 12bae2ad52 Merge branch '2.3.x' 
Closes gh-22990
 2020-08-17 16:18:23 -07:00
Phillip Webb ff36f8bab8 Merge branch '2.2.x' into 2.3.x 
Closes gh-22989
 2020-08-17 16:17:47 -07:00
Phillip Webb 10da595302 Polish 'Order metrics auto-configurations correctly' 
See gh-21134
 2020-08-17 16:10:18 -07:00
Martin Benda 02b7ec787e Order metrics auto-configurations correctly 
Update metrics auto-configurations so that they are auto-configured
after `CompositeMeterRegistryAutoConfiguration` in order to ensure
the `MeterRegistry` bean has been defined.

Prior to this commit, metrics auto-configurations that depended on a
`MeterRegistry` has `@AutoConfigureAfter(MetricsAutoConfiguration.class)`
which is not sufficient since `MetricsAutoConfiguration` does not export
a `MeterRegistry`.

See gh-21134
 2020-08-17 16:03:27 -07:00
Scott Frederick b7fdf8fe87 Preserve user-provided values in MongoClientSettings 
Prior to this commit, values from MongoProperties would always
overwrite matching fields in MongoClientSettings. This commit
preserves all values in MongoClientSettings if the client app
provides the MongoClientSettings bean, and only overwrites from
MongoProperties if no MongoClientSettings bean is provided.

Fixes gh-22321
 2020-08-17 16:07:40 -05:00
Phillip Webb 9c6f0d8f7e Merge branch '2.3.x' 
Closes gh-22984
 2020-08-17 12:40:18 -07:00
Scott Frederick c2ec46c5b1 Polish "Fix include exception handling in DefaultErrorAttributes" 
See gh-22750
 2020-08-17 13:33:59 -05:00
Lopfest c49605cd7b Fix include exception handling in DefaultErrorAttributes 
This commit fixes a problem with the handling of the includeException
field in DefaultErrorAttributes.

See gh-22750
 2020-08-17 13:33:59 -05:00
Stephane Nicoll f8265e3e44 Merge branch '2.3.x' 
Closes gh-22980
 2020-08-17 14:20:50 +02:00
Jean-Baptiste Nizet 27528fdd07 Fix custom image name example and documentation 
There is no `artifactId` property in a gradle Project, and the default
value uses the project name.

See gh-22918
 2020-08-17 13:59:42 +02:00
Stephane Nicoll b1e631e8a6 Remove trailing whitespaces 2020-08-17 13:59:08 +02:00
Stephane Nicoll 8c0318edc7 Polish "Consider RecordFilterStrategy in Kafka auto-configuration" 
See gh-22973
 2020-08-17 13:54:20 +02:00
anshlykov f68dfde35e Consider RecordFilterStrategy in Kafka auto-configuration 
See gh-22973
 2020-08-17 13:37:00 +02:00
dreis2211 61838eede1 Fix typos in docs 
See gh-22945
 2020-08-17 13:27:46 +02:00
Stephane Nicoll 80e9bfb9a6 Merge branch '2.3.x' 2020-08-17 13:26:58 +02:00
Stephane Nicoll 6b679b7d64 Polish 
See gh-22945
 2020-08-17 13:24:51 +02:00
Phillip Webb 4df618a2b1 Merge branch '2.3.x' 
Closes gh-22967
 2020-08-14 17:12:53 -07:00
Phillip Webb f75e988450 Merge branch '2.2.x' into 2.3.x 
Closes gh-22966
 2020-08-14 17:12:41 -07:00
Phillip Webb 3271542d98 Add @Interited to @TypeExcludeFilters 
Update `@TypeExcludeFilters` so that it is also annotated with
`@Inherited`.

Closes gh-22939
 2020-08-14 17:12:31 -07:00
Phillip Webb 7a85373fea Merge branch '2.3.x' 
Closes gh-22965
 2020-08-14 17:09:13 -07:00
Phillip Webb 1675b47637 Merge branch '2.2.x' into 2.3.x 
Closes gh-22964
 2020-08-14 17:08:48 -07:00
Phillip Webb 89a6f83344 Fix and improve SpringApplicationBuilder javadoc 
Update SpringApplicationBuilder.properties method javadoc to fix
inaccuracies and apply more consistency.

Closes gh-22962
 2020-08-14 17:06:39 -07:00
Phillip Webb 3e939cbabd Polish method order 2020-08-14 17:02:13 -07:00
Phillip Webb 5591a6ab77 Merge branch '2.3.x' 
Closes gh-22961
 2020-08-14 15:11:47 -07:00
Phillip Webb 03d4b89c06 Merge branch '2.2.x' into 2.3.x 
Closes gh-22960
 2020-08-14 15:11:23 -07:00
Maciej Walkowiak 15de956566 Fix typo `Assert4J` -> `AssertJ` 
See gh-22948
 2020-08-14 15:09:56 -07:00
Madhura Bhave bbbbe8e4d2 Make security auto-configs back off when SecurityFilterChain present 
Closes gh-22739
 2020-08-14 12:24:25 -07:00
Andy Wilkinson c9b8a05321 Merge branch '2.3.x' 2020-08-14 15:41:20 +01:00
Andy Wilkinson 3e35fd480f Wait longer for server port and improve diagnostics on timeout 
See gh-22909
 2020-08-14 15:34:41 +01:00
Phillip Webb 310ef6e999 Rename volumemount -> configtree 
Closes gh-22941
 2020-08-13 13:28:25 -07:00
Phillip Webb 5579f9d1c4 Polish 2020-08-13 11:53:36 -07:00
Scott Frederick 2a998a4373 Fix DataNeo4jTestReactiveIntegrationTests 
See gh-22940
 2020-08-13 13:45:04 -05:00
Stephane Nicoll 045d2f678d Document Spring Data Neo4j 6 support 
Closes gh-22652
 2020-08-13 17:51:39 +02:00
Stephane Nicoll d4ba55f8d6 Do not configure a ReactiveNeo4jTransactionManager 
The current arrangement with Neo4j does not allow us to know for sure
that the user intends to use `@Transactional` for reactive or imperative
operations.

The main reason for that is that the only trigger for the reactive
auto-configuration is the presence of reactor on the classpath given
that the Neo4j driver ships with both styles in the same jar. And
reactor can be on the classpath for a number of reasons that are
unrelated to imperative access (typically `WebClient`).

This commits removes the auto-configuration of the
ReactiveNeo4jAutoConfiguration and makes sure that if the user defines
one, the regular `PlatformTransactionManager` backs off. This is
a temporarily situation until we can provide a better signal that the
user intends to primarily use imperative repositories.

Closes gh-22940
 2020-08-13 16:57:51 +02:00
Andy Wilkinson 4398c71d12 Merge branch '2.3.x' 
Closes gh-22938
 2020-08-13 13:32:27 +01:00
Andy Wilkinson 8c4e6f766c Revert "Merge pull request #21060 from dsyer" 
This reverts commit 6547ea56f9, reversing
changes made to e9e4a34e62.

Fixes gh-22039
 2020-08-13 13:31:45 +01:00
Andy Wilkinson 1c8392e980 Upgrade to Selenium HtmlUnit 2.43.1 
Closes gh-22937
 2020-08-13 12:04:42 +01:00
Andy Wilkinson 7310b7dbcd Upgrade to Micrometer 1.5.4 
Closes gh-22936
 2020-08-13 12:04:40 +01:00
Andy Wilkinson 1c930396b4 Upgrade to Flyway 6.5.4 
Closes gh-22935
 2020-08-13 12:04:39 +01:00
Stephane Nicoll 2f5145b6a1 Upgrade to Micrometer 1.5.4 
Closes gh-22932
 2020-08-13 13:04:03 +02:00
Andy Wilkinson a087d706d0 Upgrade to Spring Batch 4.3.0-M2 
Closes gh-22892
 2020-08-13 12:03:07 +01:00
Stephane Nicoll 42ca62b2e7 Merge branch '2.3.x' 
Closes gh-22931
 2020-08-13 11:49:03 +02:00
Stephane Nicoll df78105a3c Merge branch '2.2.x' into 2.3.x 
Closes gh-22930
 2020-08-13 11:48:43 +02:00
Stephane Nicoll f61a632a37 Polish "Fix conditions that lead to auto-configure PushGateway" 
See gh-22919
 2020-08-13 11:47:43 +02:00
smlc c355b95f6c Fix conditions that lead to auto-configure PushGateway 
See gh-22919
 2020-08-13 11:41:49 +02:00
Stephane Nicoll 947e484001 Merge branch '2.3.x' 
Closes gh-22928
 2020-08-13 09:44:26 +02:00
Stephane Nicoll d0662e824a Fix default value of server.jetty.accesslog.format 
Closes gh-22921
 2020-08-13 09:43:37 +02:00
Scott Frederick 7c7079f91a Merge branch '2.3.x' 2020-08-12 17:44:52 -05:00
Scott Frederick 4c6a722f18 Fix test for Java version in image building docs 
See gh-22916
 2020-08-12 17:43:37 -05:00
Scott Frederick 092bbd198e Merge branch '2.3.x' 
Closes gh-22923
 2020-08-12 17:04:54 -05:00
Scott Frederick 005ed8b8db Use Java version wildcard in image building docs 
Fixes gh-22916
 2020-08-12 17:04:17 -05:00
Scott Frederick 6b15822cb1 Polish "Add pullPolicy option for image building" 
See gh-22736
 2020-08-12 15:16:38 -05:00
anshlykov c7449b57ce Add pullPolicy option for image building 
This commit adds a pullPolicy option to the configuration of the Maven
plugin spring-boot:build-image goal and the Gradle plugin bootBuildImage
task. The new option gives users control over pulling the builder image
and run image from a remote image registry to the local Docker daemon.

See gh-22736
 2020-08-12 15:16:38 -05:00
Andy Wilkinson b35cfb7fb7 Upgrade to Spring Integration 5.4.0-M2 
Closes gh-22729
 2020-08-12 20:17:50 +01:00
Andy Wilkinson c59b48b690 Upgrade to Spring Kafka 2.5.5.RELEASE 
Closes gh-22843
 2020-08-12 19:19:57 +01:00
Andy Wilkinson ce729b7188 Upgrade to Spring AMQP 2.2.10.RELEASE 
Closes gh-22842
 2020-08-12 19:19:18 +01:00
Andy Wilkinson 2de48ac6ee Upgrade to Spring Kafka 2.6.0-M1 
Closes gh-22730
 2020-08-12 19:17:14 +01:00
dreis2211 c00d5c5643 Introduce @ForkedClassPath for testing unmodified class path 
See gh-22710
 2020-08-12 17:21:31 +01:00
Andy Wilkinson 0158213b3f Upgrade to Spring AMQP 2.3.0-M2 
Closes gh-22761
 2020-08-12 17:20:33 +01:00
Andy Wilkinson fff9193860 Merge branch '2.3.x' 
Closes gh-22917
 2020-08-12 17:06:30 +01:00
Andy Wilkinson f43a0b4891 Fix configuration of environment in Kotlin bootBuildImage examples 
Fixes gh-22913
 2020-08-12 17:06:16 +01:00
Phillip Webb bc3f028a1f Fix spring.config.activate.on-profile metadata 
Fix the `spring.config.activate.on-profile` entry which was accidentally
entered as `spring.config.import.on-profile`.

See gh-22497
 2020-08-12 07:13:11 -07:00
Stephane Nicoll 5e5c1fb4d0 Upgrade to Spring Data Neumann SR3 
Closes gh-22844
 2020-08-12 15:42:54 +02:00
Andy Wilkinson 147b048a07 Merge branch '2.3.x' 
See gh-22909
 2020-08-12 13:24:50 +01:00
Andy Wilkinson 2b1bb2f18f Improve diagnostics when remote application does not start as expected 
See gh-22909
 2020-08-12 13:24:17 +01:00