Commit Graph

27490 Commits

Author SHA1 Message Date
Stephane Nicoll
24c2e7d182 Merge branch '1.4.x' into 1.5.x 2016-09-23 08:00:22 +02:00
Stephane Nicoll
c81a83522c Merge pull request #7002 from candrews:patch-3
* pr/7002:
  Exclude `META-INF/build-info.properties` from restart
2016-09-23 07:59:59 +02:00
Craig Andrews
d94eedfd8a Exclude META-INF/build-info.properties from restart
Prior to this commit any application configured to write
`META-INF/build-info.properties` could trigger unexpected application
restarts. The problem is particularly prevalent when using Eclipse M2E in
combination with Maven's `spring-boot-maven-plugin` `build-info` goal
and Gradle's `springBoot` `buildInfo()`.

Closes gh-7002
2016-09-23 07:58:39 +02:00
Andy Wilkinson
39c1005ade Merge branch '1.5.x' 2016-09-22 19:51:38 +01:00
Andy Wilkinson
a9ca8ef769 Start building against Spring Integration Java DSL 1.2.0 snapshots
See gh-7000
2016-09-22 19:51:07 +01:00
Andy Wilkinson
2745c565aa Merge branch '1.5.x' 2016-09-22 14:40:59 +01:00
Andy Wilkinson
a674357b15 Remove dependency management for cassandra-driver-dse
The 3.1 release of the Cassandra Driver does not include the
cassandra-driver-dse module.

See gh-5835
2016-09-22 14:40:35 +01:00
Stephane Nicoll
04bcade3de Merge branch '1.5.x' 2016-09-22 07:54:00 +02:00
Stephane Nicoll
d117ec45b8 Merge branch '1.4.x' into 1.5.x 2016-09-22 07:53:27 +02:00
Stephane Nicoll
85fb273596 Fix spring-boot-antlib version
See gh-6978
2016-09-22 07:52:02 +02:00
Andy Wilkinson
7efe90848b Merge branch '1.5.x' 2016-09-21 20:57:14 +01:00
Andy Wilkinson
aaf435ff2a Suppress Neo4J-related deprecation warnings
See gh-6976
2016-09-21 20:57:05 +01:00
Andy Wilkinson
1d1714ee8b Merge branch '1.5.x' 2016-09-21 20:51:08 +01:00
Andy Wilkinson
bdc949d1b7 Remove deprecated merge and locations attributes from @ConfigurationProperties
Closes gh-6972
2016-09-21 20:50:21 +01:00
Andy Wilkinson
bd8a9bb310 Polish
See gh-6971 and commit ce1e41d
2016-09-21 19:54:55 +01:00
Andy Wilkinson
08842c1273 Suppress Neo4J-related deprecation warnings
See gh-6976
2016-09-21 19:52:18 +01:00
Andy Wilkinson
beca5e486e Polish 2016-09-21 18:54:39 +01:00
Andy Wilkinson
0cdbbd49b5 Address warnings caused by deprecations in Spring Framework 5
See gh-6977
2016-09-21 17:34:54 +01:00
Andy Wilkinson
312292b93e Update Animal Sniffer and related annotations for Java 8 baseline
Closes gh-6981
2016-09-21 17:20:49 +01:00
Andy Wilkinson
16a0f72df5 Merge branch '1.5.x' 2016-09-21 17:03:35 +01:00
Andy Wilkinson
c108da9d53 Upgrade to Spring Data Ingalls M1
Closes gh-6785
Closes gh-5835
2016-09-21 17:01:47 +01:00
Stephane Nicoll
9bc77254a7 Start building against Spring Framework 5 snapshot
This commit enables compatibility build against Spring Framework 5.

The Velocity and Guava support that are deprecated in the 1.x line have
been removed and few other classes contain minor change to comply to non
backward compatible changes in Spring Framework 5.

This commit also switches the required java version to 8.

Closes gh-6977
2016-09-21 17:37:02 +02:00
Stephane Nicoll
6643ec3713 Next development version 2016-09-21 17:05:50 +02:00
Stephane Nicoll
5684924f60 Polish 2016-09-21 17:01:43 +02:00
Andy Wilkinson
6fb44b2410 Fix TestCommandIntegrationTests after removal of deprecated test support
See gh-6971
See gh-6973
2016-09-21 15:15:35 +01:00
Stephane Nicoll
046475a69e Remove deprecated spring-boot-starter-redis 2016-09-21 15:00:24 +02:00
Stephane Nicoll
fc00e4cbe0 Remove deprecated spring-boot-starter-ws 2016-09-21 14:59:52 +02:00
Stephane Nicoll
bd7c20eb1c Deprecate Guava support 2016-09-21 14:59:02 +02:00
Stephane Nicoll
474c2e4641 Fix checkstyle rule
See gh-6971
2016-09-21 14:39:00 +02:00
Stephane Nicoll
ce1e41dce3 Remove deprecated code
This code removes code deprecated in 1.4 with the exception of code that
requires an update to Spring Framework 5.

Closes gh-6971
2016-09-21 14:30:28 +02:00
Stephane Nicoll
d514cc3dab Merge branch '1.4.x' 2016-09-21 11:12:59 +02:00
Stephane Nicoll
6bd670edbc Initiate 1.4.x branch 2016-09-21 11:11:24 +02:00
Stephane Nicoll
97083300d7 Fixup version numbers following release 2016-09-21 10:35:52 +02:00
Spring Buildmaster
7e9ed5e1a7 Next Development Version 2016-09-21 07:58:07 +00:00
Phillip Webb
51092af739 Polish 2016-09-20 14:32:09 -07:00
Phillip Webb
0b9667c26f Drop setResolvePlaceholders()
Remove setResolvePlaceholders() from PropertySourcesPropertyValues
and instead rely only on the constructor.

See gh-6964
2016-09-20 14:22:51 -07:00
Phillip Webb
7896ec5a7b Polish 2016-09-20 14:20:52 -07:00
Stephane Nicoll
7fd169cfd2 Merge branch '1.3.x' 2016-09-20 22:54:01 +02:00
Stephane Nicoll
04a72fcb78 Fixup version numbers following release 2016-09-20 22:53:40 +02:00
Andy Wilkinson
be33827f49 Simplify property validation sample and document need for static bean method
Closes gh-6627
2016-09-20 21:33:31 +01:00
Spring Buildmaster
5f959b074f Next Development Version 2016-09-20 20:20:06 +00:00
Stephane Nicoll
43e020ef7b Merge branch '1.3.x' 2016-09-20 19:59:42 +02:00
Stephane Nicoll
4bf94ef3ca Upgrade to Spring Data Gosling SR5
Closes gh-6956
2016-09-20 19:58:43 +02:00
Dave Syer
5af4446386 Bump spring-retry to 1.1.4 2016-09-20 14:22:25 +01:00
Andy Wilkinson
564207b092 Add Tomcat-specific failure analysis for connector start failures
Previously, when a Tomcat connector failed to start it was assumed that
the failure was due to the port being in use and a PortInUseException
was thrown. Unfortunately, this assumption doesn’t always hold true.
For example, a Tomcat connector will also fail to start when its using
SSL and the key store password is wrong. This could lead to incorrect
guidance from the PortInUseFailureAnalyzer indicating that a port clash
had occurred when, in fact, it was the SSL configuration that needed to
be corrected.

Unfortunately, Tomcat only tells us that the connector failed to start.
It doesn’t provide access to the exception that would allow us to
determine why it failed to start. This commit updates the embedded
Tomcat container to throw a ConnectorStartFailedException in the event
of a connector failing to start. A new failure analyser,
ConnectorStartFailureAnalyzer, has been introduced to analyse the new
exception and offer some more general guidance.

Closes gh-6896
2016-09-20 13:55:10 +01:00
Stephane Nicoll
1641bb2105 Upgrade to Spring Data Hopper SR3
Closes gh-6583
2016-09-20 11:35:15 +02:00
Dave Syer
26a90c1d24 Add flag to PropertiesConfigurationFactory to switch off placeholder resolution
The default behaviour is unchanged, but it is useful for some applications to be
able to bind without placeholder resolution (e.g. to prevent exposing system
environment variables, if the bound object is being sent over the wire).
2016-09-20 10:13:54 +01:00
Andy Wilkinson
d1fd79cfa3 Upgrade to Hibernate 5.0.11.Final
Closes gh-6944
2016-09-20 08:50:40 +01:00
Stephane Nicoll
815fb0135b Merge branch '1.3.x' 2016-09-20 09:44:40 +02:00
Stephane Nicoll
fc5ab5685b Fix location url in test
See gh-6956
2016-09-20 09:44:21 +02:00