Commit Graph

4275 Commits

Author SHA1 Message Date
Phillip Webb 1f0d45d795 Protect against NPE and improve error message
Update ConfigurationMetadataAnnotationProcessor so that `prefix` is
only obtained when the annotation is not null. Also improve exception
message by including the element.
2015-02-23 18:28:23 -08:00
Phillip Webb 10257d96f2 Merge branch '1.1.x' 2015-02-23 18:02:23 -08:00
Phillip Webb 7ac8cac3b5 Reorganize integration tests
Make spring-boot-integration-tests a top level project and move the
existing gradle tests and security tests to be sub-modules.
2015-02-23 17:24:05 -08:00
Phillip Webb f0ef882ff2 Filter integration tests to only pom folders
Update invoker configuration so that only folders with a pom.xml file
are invoked. This helps when switching between the 1.1.x and master
branches since empty folders left by git no longer fail the build.
2015-02-23 15:03:56 -08:00
Phillip Webb 8a8b5d3aa7 Polish 2015-02-23 13:34:55 -08:00
Stephane Nicoll 2fca72f768 Merge pull request #2534 from izeye/derby
* derby:
  Add dependency management for Apache Derby
2015-02-23 16:46:16 +01:00
izeye 31639be94b Add dependency management for Apache Derby 2015-02-23 16:44:20 +01:00
Stephane Nicoll a1b20c3745 Fix typo 2015-02-22 09:48:29 +01:00
Stephane Nicoll 1d69a71b75 Upgrade to Spring 4.1.5
Closes gh-2413
2015-02-20 13:55:52 +01:00
Stephane Nicoll 91bf484527 Merge pull request #2524 from StevenGeens/master
* pull2524:
  Update documentation on resources filtering
2015-02-20 13:30:17 +01:00
StevenGeens dc97d56cb7 Update documentation on resources filtering
Add an explicit note about the spring-boot:run goal that prevents the use
of resources filtering by default.
2015-02-20 13:28:13 +01:00
Andy Wilkinson 17fd3d44b7 Add workaround for Undertow WebSocket client sending illegal Origin
Undertow’s WebSocket client sends an illegal Origin header – it does
not include the scheme, e.g. it’ll send “localhost” rather than
“http://localhost”. This commit works around the problem by allowing
access to the SockJS endpoints from any origin, thereby disabling
OriginHandlerInterceptor’s checking of the Origin header.
2015-02-19 14:30:23 +00:00
Andy Wilkinson 6253cc5dc7 Merge branch '1.1.x' 2015-02-19 11:26:50 +00:00
Andy Wilkinson df81b3145f Backport to 1.1.x the fix for gh-2474 (originally made in e42fa79f7) 2015-02-19 11:22:06 +00:00
Andy Wilkinson 67ec89e74d Merge branch '1.1.x' 2015-02-19 10:41:43 +00:00
Andy Wilkinson 8622e5db20 Apply f9816ea and 64e94f3 to 1.1.x
Fixes gh-2473
2015-02-19 10:38:40 +00:00
Stephane Nicoll f8b191ff56 Revert "Add Version and VersionRange utilities"
This reverts commit 34ede2f31f.
2015-02-18 18:26:35 +01:00
Andy Wilkinson ecdc6a06a1 Merge branch '1.1.x'
Fixes gh-2212
2015-02-18 16:55:39 +00:00
Andy Wilkinson b29c5a3297 Upgrade to Groovy 2.3.10
Closes gh-2429
2015-02-18 16:54:31 +00:00
Andy Wilkinson 64e94f3b1b Correct javadoc syntax and apply code formatting 2015-02-18 16:52:30 +00:00
Stephane Nicoll 9d0e50c6ac Support of spring initializr meta-data v2.1
Update the `init` command to support the latest meta-data format. Recent
Spring Initializr version also supports Spring Boot CLI now and generates
a textual service capabilities when requested. The command no longer
generates the capabilities of the service unless said service does not
support it.

Closes gh-2515
2015-02-18 17:43:53 +01:00
Andy Wilkinson 9af30450c4 Upgrade to Liquibase 3.3.2
Closes gh-2512
2015-02-18 16:20:47 +00:00
Andy Wilkinson 6028f6b343 Upgrade to Jetty 9.2.7
Closes gh-2511
2015-02-18 16:20:47 +00:00
Andy Wilkinson 4178613d72 Upgrade to ActiveMQ 5.10.1
Closes gh-2510
2015-02-18 16:20:47 +00:00
Andy Wilkinson 119e37a1f9 Upgrade to JMustache 1.10
Closes gh-2508
2015-02-18 16:20:47 +00:00
Andy Wilkinson 375a08d7ce Upgrade to H2 1.4.185
Closes gh-2507
2015-02-18 16:20:47 +00:00
Andy Wilkinson ce303f9f59 Upgrade to Jackson 2.4.5
Closes gh-2506
2015-02-18 16:20:46 +00:00
Dave Syer 1f316a846d AutoConfigurationReport -> ConditionEvaluationReport
Fixes gh-2493
2015-02-18 13:47:20 +00:00
Dave Syer c3c156515f Add extra detail on servlet listeners
Fixes gh-2518
2015-02-18 10:40:47 +00:00
Rob Winch f9816ead93 Fix configureGlobal on SpringBootApplication
Fixes gh-2473
2015-02-18 09:15:46 +00:00
Rob Winch e42fa79f7b Fix fragile AuthenticationManagerConfiguration
Fixes gh-2474
2015-02-18 09:15:46 +00:00
Andy Wilkinson b8babd4eb4 Polish documentation on @ConfigurationProperties getters and setters
- Correct typo (coercable -> coercible)
 - Update description to reflect that Spring 4.1.5 supports the
   expansion of array properties and and a test that verifies the
   behaviour
2015-02-17 11:25:50 +00:00
Andy Wilkinson d87bf707a7 Merge branch '1.1.x' 2015-02-17 10:01:39 +00:00
Andy Wilkinson 11e0444814 Upgrade to Spring Security JWT 1.0.3.RELEASE
Closes gh-2304
2015-02-17 09:56:15 +00:00
Andy Wilkinson 99a0661565 Upgrade to Spring Batch 3.0.3.RELEASE
Closes gh-2503
2015-02-17 09:55:47 +00:00
Andy Wilkinson 4840417cd9 Upgrade to mongo-java-driver 2.12.5
Closes gh-2502
2015-02-17 09:55:16 +00:00
Andy Wilkinson 3b8c9418b1 Upgrade to JDom 2.0.6
Closes gh-2501
2015-02-17 09:54:51 +00:00
Andy Wilkinson 8c534547c9 Upgrade to Groovy 2.3.9
Closes gh-2500
2015-02-17 09:54:26 +00:00
Andy Wilkinson cdc2008146 Upgrade to AspectJ 1.8.5
Closes gh-2499
2015-02-17 09:54:01 +00:00
Andy Wilkinson 3f285d1bf0 Upgrade to Tomcat 7.0.59
Closes gh-2498
2015-02-17 09:53:29 +00:00
Andy Wilkinson 6a93fa1dd0 Upgrade to Jackson 2.3.5
Closes gh-2497
2015-02-17 09:52:59 +00:00
Stephane Nicoll 34ede2f31f Add Version and VersionRange utilities
Parse a version using our version format or any version that complies
with Major.Minor.Patch. Also add a VersionRange utility that can
determine if a given version is withing that range.

Closes gh-2494
2015-02-16 18:34:26 +01:00
Stephane Nicoll e8e39e4bcf polish 2015-02-13 14:56:13 +01:00
Dave Syer 5efdb85876 Enhance note about Java Bean getters and setters 2015-02-13 13:11:12 +00:00
Dave Syer e541e139a2 Add note about Java Bean getters and setters
Apparently some users are unclear that setters and getters are
mandatory for @ConfigurationProperties. This should clear it up.
2015-02-13 09:17:28 +00:00
Stephane Nicoll 2843744190 Merge pull request #2320 from joshiste/datasourceMetrics-fix
* datasourceMetrics-fix:
  Fix for empty datasource-name in metrics
2015-02-13 09:33:35 +01:00
Johannes Stelzer 05e388012d Fix for empty datasource-name in metrics
If there is more than one DataSource and the non-primary bean-name is
'datasource' an incorrect metric name is chosen.

The metrics are named datasource.active and not datasource.xxx.active. To
avoid this, the shortening of the bean-name only occurs if the bean-name
is longer than 'datasource'.

See gh-2320
2015-02-13 09:31:31 +01:00
Andy Wilkinson a8726c4ae1 Merge branch '1.1.x' 2015-02-12 17:53:07 +00:00
Andy Wilkinson d7ae0f3b06 Ensure that management endpoints with nested paths are secured
Previously each endpoint was secured for path, path/, and path.*.
This meant that a request to path/foo was not secured. This commit
secures path/** to ensure that requests to a nested endpoint path are
also secured.

Fixes gh-2476
2015-02-12 17:50:38 +00:00
Andy Wilkinson a4b4b850d5 Remove duplicate deployment tests
Closes gh-2472
2015-02-12 16:44:06 +00:00