Commit Graph

5918 Commits

Author SHA1 Message Date
Phillip Webb
75bf01840b Add Eclipse Installer setup file
Add `spring-boot-project.setup` to `/eclipse` to setup and configure
new Eclipse installations.

Fixes gh-4110
2015-10-07 23:40:42 -07:00
Phillip Webb
c525689b0f Polish 2015-10-07 23:40:34 -07:00
Phillip Webb
aae38db9af Fix compiler warnings only shown in Eclipse Mars 2015-10-07 23:40:28 -07:00
Phillip Webb
a0fc90a5ec Compile samples and integration tests with Java 8
Update the samples and integration tests to use Java 8. There's no
specific reason to keep them on Java 6 and it helps keep Eclipse happy
if we upgrade.
2015-10-07 23:40:20 -07:00
Phillip Webb
2a16c25977 Replace import-control checkstyle file with regex
Fix Eclipse build warnings by replacing checkstyle's import-control file
with a simple regex rule.

Fixes gh-4006
2015-10-07 23:40:14 -07:00
Phillip Webb
82fffe3062 Relax ParenPad checkstyle rule
Eclipse Mars has a formatter bug (#479291) that sometimes adds
additional whitespace on annotations. Until it's fixed we need to relax
the `ParenPad` checkstyle rule.
2015-10-07 23:37:47 -07:00
Phillip Webb
c9fb9916b8 Reformat code using Eclipse Mars 2015-10-07 23:37:10 -07:00
Phillip Webb
e473364e4e Merge branch '1.2.x' 2015-10-07 23:34:08 -07:00
Phillip Webb
6ab376e2e8 Reformat code use Eclipse Mars 2015-10-07 23:32:31 -07:00
Phillip Webb
47576354f7 Merge branch '1.2.x' 2015-10-07 23:19:50 -07:00
Phillip Webb
ba7c1fda72 Convert Gradle plugin from Groovy to Java
Replace existing Groovy code with Java since the Groovy Eclipse tooling
currently forces the use of an old jdt plugin which has formatter bugs.

Fixes gh-4113
2015-10-07 23:12:25 -07:00
Phillip Webb
09395f956a Compile samples and integration tests with Java 8
Update the samples and integration tests to use Java 8. There's no
specific reason to keep them on Java 6 and it helps keep Eclipse happy
if we upgrade.
2015-10-07 19:46:11 -07:00
Phillip Webb
cb6e30c8f5 Ignore helpmojo from Eclipse m2e config
Ignore the `helpmojo` goal to save needing an additional Eclipse plugin.
2015-10-07 19:45:20 -07:00
Andy Wilkinson
291955613f Fix compile error in tests that doesn’t affect the compiler in Eclipse 2015-10-07 15:12:26 +01:00
Andy Wilkinson
0cdf19a4cb Update test to align with more precise information about target class
The latest Spring Framework 4.2.2 snapshots have reworked
EventListenerMethodProcessor so that it no longer queries a proxies
target class. Previously, when this was happening, it happened early
in the context's lifecycle when the bean's concrete type was unknown.
The led to the target class being set as the proxied interface.

With the latest 4.2.2 snapshots, the first call to
AopUtils.getTargetClass() happens in the test, by which time the
actual concrete type of the bean is known. This commit updates the
test so that its expectations match the more precise result.
2015-10-07 14:51:45 +01:00
Andy Wilkinson
377107c4ff Correct timeout logic when awaiting exception in LiveReloadServerTests 2015-10-07 13:55:18 +01:00
Andy Wilkinson
b7ecccf0a3 Fix race condition in LiveReloadServerTests.clientClose 2015-10-07 13:39:59 +01:00
Andy Wilkinson
500eeb6a70 Merge branch '1.2.x' 2015-10-07 11:58:11 +01:00
Andy Wilkinson
3697dd52a0 Use main Apache archive for Tomcat binaries to improve(?) build stability
Mirrors of archive.apache.org only mirror the latest release of each
project so, as new releases are made, builds using older versions will
break as the mirrors are updated.

This commit updates the Tomcat deployment test to use the main Apache
archive site. This should provide long-term access to Tomcat binaries,
improving build stability and ensuring that tagged builds are
repeatable.

Backport of 5f087e6444
2015-10-07 11:57:46 +01:00
Andy Wilkinson
08aa6f788d Merge branch '1.2.x' 2015-10-07 11:34:29 +01:00
Andy Wilkinson
9a703ab4d1 Correct quotation marks in spring-boot-actuator’s README
Closes gh-4095
2015-10-07 11:33:43 +01:00
Vedran Pavic
1761157023 Upgrade MariaDB JDBC driver to 1.2.3
Closes gh-4100
2015-10-07 10:30:09 +01:00
Vedran Pavic
ef31c87196 Upgrade PostgreSQL JDBC driver to 9.4-1203-jdbc41
Closes gh-4099
2015-10-07 10:30:08 +01:00
Stephane Nicoll
4ccbca259b Properly escape command line arguments
Closes gh-3841
2015-10-07 10:58:07 +02:00
Andy Wilkinson
a314982d29 Provide dependency management for all of Spring REST Docs
Add dependency management for spring-restdocs-core
2015-10-06 17:17:23 +01:00
Andy Wilkinson
a5ca1eb019 Move dependency management for Spring REST Docs into dependencies pom 2015-10-06 16:58:35 +01:00
Andy Wilkinson
5f087e6444 Use main Apache archive for Tomcat binaries to improve(?) build stability
Mirrors of archive.apache.org only mirror the latest release of each
project so, as new releases are made, builds using older versions will
break as the mirrors are updated. T

This commit updates the Tomcat deployment test to use the main Apache
archive site. This should provide long-term access to Tomcat binaries,
improving build stability and ensuring that tagged builds are
repeatable.
2015-10-06 15:37:41 +01:00
Andy Wilkinson
953ef7091b Remove use of Ordered from auto-configuration classes
Closes gh-4056
2015-10-06 14:44:44 +01:00
Andy Wilkinson
89ed2aa020 Merge branch '1.2.x' 2015-10-06 11:44:39 +01:00
Andy Wilkinson
d793d5abcb Work around intermittent failure caused by SPR-13079
See gh-4098
2015-10-06 11:43:53 +01:00
Andy Wilkinson
aa17419e11 Merge branch '1.2.x' 2015-10-06 11:26:28 +01:00
Andy Wilkinson
6387f36efa Work around MockMvc bug (SPR-13079) that has only been fixed in 4.2
See gh-4098
2015-10-06 11:25:18 +01:00
Andy Wilkinson
bc590a8bf4 Polishing, primarily to keep Checkstyle happy 2015-10-06 11:14:05 +01:00
Andy Wilkinson
b7719a131b Merge branch '1.2.x' 2015-10-06 11:01:07 +01:00
Andy Wilkinson
b8b4ea489e Improve MetricsFilter’s handling of async requests
Previously, MetricsFilter would treat async requests the same as
sync requests and would record their response status as soon as the
request had been processed by the filter chain. This would result in a
200 response being recorded and the actual response status produced by
the async processing being ignored. Furthermore, the time that was
recorded for the request would not include the time take for any async processing.

This commit updates MetricsFilter to check whether or not an async
request has been started before it records the metrics for the request.
In the event of an async request having been started no metrics are
recorded. Instead, the StopWatch is stored in a request attribute that
is then retrieved during the filtering of the request’s async
dispatch(es). Once the async processing has completed (isAsyncStarted()
returns false), the StopWatch is stopped, removed from the request’s
attributes and the metrics for the request are recorded.

Closes gh-4098
2015-10-06 11:00:59 +01:00
Andy Wilkinson
45cad3c3b7 Merge branch 'gh-4082' 2015-10-06 09:58:06 +01:00
Andy Wilkinson
2c2c7cee8d Polish contribution
See gh-4082
2015-10-06 09:58:00 +01:00
Benedikt Ritter
6978694cb8 Improve error reporting when driver class version is unsupported
ClassUtils.isPresent(String, ClassLoader) swallows all Throwables when
trying to load a class by name. For this reason
UnsupportedClassVersionError will also be swallowed when user code is
trying to use a driver library which has been compiled with a later
JDK than the one the application is running with. All the user would

see was "Cannot load driver class". This change simply propagates the
UnsupportedClassVersionNumberError so that it is easier for users to
find the root cause of the problem.

Closes gh-4082
Closes gh-4091
2015-10-06 09:58:00 +01:00
Dave Syer
e17eab6430 Add placeholder resolution to OnResourceCondition
Users can write @ConditionalOnResource("${path.to.file}") and
placeholders are resolved from the environment.
2015-10-06 09:33:07 +01:00
Dave Syer
5d8ccbacdf Add a convenience AstTransformation base class for BOMs
Plugin authors can extend this class, provide missing methods,
and specify a BOM to add to the dependency management lookup
(i.e. dependencies by artifactId)
2015-10-06 09:31:23 +01:00
Stephane Nicoll
7e6097e419 Merge pull request #4093 from r11runner/typos
* pr/4093:
  Fix typos
2015-10-06 09:33:09 +02:00
r11runner
586f525a6b Fix typos
Closes gh-4093
2015-10-06 09:32:15 +02:00
Dave Syer
44c1348094 Fix DependencyResolutionContext for multiple boms
The problem was that it was not accumulating DependencyManagement
instances. It was throwing away the old ones and replacing with
only the latest.
2015-10-05 21:39:20 +01:00
Andy Wilkinson
60d508cda2 Fix FileSystemWatcherTests.sourceFolderMustExist on Windows 2015-10-05 17:32:07 +01:00
Andy Wilkinson
2292cff1ea Document the need to use spring.data.mongodb.uri with Mongo 3.0
Closes gh-4051
2015-10-05 15:22:26 +01:00
Andy Wilkinson
cff1eea4c4 Make new configuration inner class static
See gh-4079
2015-10-05 14:35:00 +01:00
Alexander Tokarev
91a40dd66c Disable unnecessary database initialization
If a DataSource class is found in the classpath then
EmbeddedDataSourceConfiguration will not be used, so the in-memory
database will not be shutdown on application context closing.
As a result, unnecessary database initialization may cause subsequent
tests to fail, for example see [1].

[1] https://github.com/spring-projects/spring-boot/issues/1712
2015-10-05 14:18:39 +01:00
Andy Wilkinson
bee7d24c1a Provide an example of using a .conf file with a truly executable jar
Closes gh-3522
2015-10-05 14:14:51 +01:00
Andy Wilkinson
a4eec42813 Ensure that new JPA-based test doesn’t accidentally enable Bitronix 2015-10-05 14:07:01 +01:00
Andy Wilkinson
d01236db30 Fix compile failure that doesn’t occur in Eclipse but does on Travis 2015-10-05 13:47:35 +01:00