Commit Graph

21595 Commits (a7e3257e7f76902116040a24b3c5f07e3695bf02)
 

Author SHA1 Message Date
Andy Wilkinson 096951d531 Merge branch '2.0.x' into 2.1.x
Closes gh-17305
5 years ago
Andy Wilkinson 57bc03ac57 Merge branch '1.5.x' into 2.0.x 5 years ago
Madhura Bhave 74912ee126 Remove setting.xml from .gitignore
Closes gh-17309
5 years ago
Andy Wilkinson 3fb06ee29e Merge branch '2.0.x' into 2.1.x
Closes gh-17320
5 years ago
Andy Wilkinson 4973a2b217 Merge branch '1.5.x' into 2.0.x 5 years ago
Andy Wilkinson 72f7985219 Drop back to Eclipse 2019-03 to avoid m2e regression
Closes gh-15200
5 years ago
Andy Wilkinson 0cfcfb104e Link to Apache Licence in Maven Plugin docs rather than inlining it
Closes gh-17317
5 years ago
Madhura Bhave 26b61e6f8d Fix deprecation warnings in pipeline.yml
Closes gh-17310
5 years ago
Phillip Webb 02e705c8e4 Relax nohttp requirement for service.wsdl
Unfortunately https references cause eclipse errors so we need to
relax the requirement for this file.

Fixes gh-17307
5 years ago
Andy Wilkinson 7e4111954f Merge branch '2.0.x' into 2.1.x
Closes gh-17305
5 years ago
Andy Wilkinson 23e119c239 Merge branch '1.5.x' into 2.0.x 5 years ago
Andy Wilkinson 1ee7b80162 Update the Oomph setup for Eclipse 2019-06
Closes gh-15200
5 years ago
Stephane Nicoll 374e02cac8 Simplify HibernateJpaAutoConfiguration classes check
This commit removes the now outdated `HibernateEntityManagerCondition`
in favour of a simple check of `SessionImplementor`. As of
Hibernate 5.2, a single `hibernate-core` jar is required so a single
class check is enough.

Closes gh-17288
5 years ago
Stephane Nicoll 86ace26049 Fix broken link to Spring Integration reference guide
Closes gh-17279
5 years ago
Andy Wilkinson a5ae1de706 Fix spring-boot-loader's tests on Windows
Closes gh-17275
5 years ago
Stephane Nicoll 7e5ca6d280 Merge branch '2.0.x' into 2.1.x
Closes gh-17268
6 years ago
Stephane Nicoll 11dee3c0d8 Merge branch '1.5.x' into 2.0.x 6 years ago
Stephane Nicoll 29de792148 Merge pull request #17068 from ielatif
* pr/17068:
  Fix javadoc of management server port

Closes gh-17068
6 years ago
Issam El-atif fca97ff86c Fix javadoc of management server port
See gh-17068
6 years ago
Phillip Webb 6e5ba8077a Fix sync-to-maven-central script 6 years ago
Phillip Webb 11b8e7c2de Don't exit script on error
Update CI scripts so that command failures do not cause an immediate
exit. Prior to this commit, some of our looping logic would never run
because the entire script would exit.
6 years ago
Spring Buildmaster fb90803dbf Next development version (v2.1.7.BUILD-SNAPSHOT) 6 years ago
Phillip Webb ffbb23bc6d Always use credentials in forward merge script
Closes gh-17257
6 years ago
Phillip Webb b0415c4044 Don't ignore images on CI build
Closes gh-17255
6 years ago
Phillip Webb 718c1d7204 Upgrade Java 12 version in CI image
Closes gh-17246
6 years ago
Phillip Webb 064240266f Upgrade Java 11 version in CI image
Closes gh-17244
6 years ago
Phillip Webb 3869da88d4 Upgrade Java 8 version in CI image
Closes gh-17245
6 years ago
Phillip Webb de037f55dc Fix detect JDK CI script 6 years ago
Phillip Webb 3eb7af1506 Upgrade to Infinispan 9.4.15.Final
Closes gh-17235
6 years ago
Phillip Webb d82ccf1405 Ensure META-INF/MANIFEST.MF remains as first entry
Update Gradle archive tasks to ensure that `META-INF/` and
`META-INF/MANIFEST.MF` remain as the first entries of the archive.

Prior to this commit, rewritten archives would violate the implicit
specification of `JarInputStream` that these entries should be first.

Fixes gh-16698
6 years ago
Phillip Webb 5e3438f095 Merge pull request #16535 from ayudovin
* pr/16535:
  Polish "Fix connection timeout configuration for Netty"
  Fix connection timeout configuration for Netty
  Chain predicates in PropertyMapper when methods

Closes gh-16535
6 years ago
Phillip Webb 692bda1595 Polish "Fix connection timeout configuration for Netty"
See gh-16535
6 years ago
ayudovin b0e4c716d3 Fix connection timeout configuration for Netty
Update `NettyWebServerFactoryCustomizer` to deal with the fact that
Netty treats `0` and negative connection timeout values differently to
Tomcat, Undertow and Jetty.

See gh-16535
6 years ago
ayudovin c2d1cb2c70 Chain predicates in PropertyMapper when methods
Update `PropertyMapper` to correctly combine predicates when repeated
calls are made to `when` and `whenNot`. Prior to this commit, subsequent
invocations would replace the previous predicate.

Fixes gh-17225
6 years ago
Andy Wilkinson 88fbc529e6 Upgrade to Micrometer 1.1.5
Closes gh-17222
6 years ago
Andy Wilkinson fe9db792ee Complete dependency management for JavaBeans Activation Framework
Fixes gh-17062
6 years ago
Andy Wilkinson ade4f32f96 Merge branch '2.0.x' into 2.1.x 6 years ago
Andy Wilkinson 5011338714 Merge branch '1.5.x' into 2.0.x 6 years ago
Andy Wilkinson e8e9ec93bb Merge branch '2.0.x' into 2.1.x 6 years ago
Andy Wilkinson a51d31b4d5 Merge branch '1.5.x' into 2.0.x 6 years ago
Andy Wilkinson 844873c18a Starting building against Spring Framework 4.3.25 snaphots
See gh-17221
6 years ago
Andy Wilkinson ceace66a28 Merge pull request #16485 from lorenzodee
* gh-16485:
  Polish "Honour base path from @WebAppConfiguration in @WebMvcTest"
  Honour base path from @WebAppConfiguration in @WebMvcTest

Closes gh-16485
6 years ago
Andy Wilkinson 645514f848 Polish "Honour base path from @WebAppConfiguration in @WebMvcTest"
See gh-16485
6 years ago
Lorenzo Dee 7340d546b8 Honour base path from @WebAppConfiguration in @WebMvcTest
See gh-16485
6 years ago
Andy Wilkinson 6f4d598418 Merge pull request #16814 from deakandris
* gh-16814:
  Polish "Consider properties from @AutoConfigureTestDatabase"
  Consider properties from @AutoConfigureTestDatabase

Closes gh-16814
6 years ago
Andy Wilkinson 5dc2339ec2 Polish "Consider properties from @AutoConfigureTestDatabase"
See gh-16814
6 years ago
András Deák 92256c80d0 Consider properties from @AutoConfigureTestDatabase
Both Flyway and Liquibase makes use of DataSourceProperties to get
default properties. Previously, both used strictly the configuration
properties and failed to consider embedded datasource properties
autoconfigured by @AutoConfigureTestDatabase. In case a database layer
test e.g. @JdbcTest relies on the autoconfigured embedded datasource,
Flyway and Liquibase autoconfiguration fails as they are not aware of
the embedded datasource properties.

See gh-16814
6 years ago
Andy Wilkinson ba85394e83 Merge pull request #17066 from nosan
* gh-17066:
  Polish "Auto-configure caching in jOOQ sliced tests"
  Auto-configure caching in jOOQ sliced tests

Closes gh-17066
6 years ago
Andy Wilkinson c2a4a3f630 Polish "Auto-configure caching in jOOQ sliced tests"
See gh-17066
6 years ago
Dmytro Nosan 4701d8f82a Auto-configure caching in jOOQ sliced tests
See gh-17066
6 years ago