Commit Graph

6373 Commits

Author SHA1 Message Date
Phillip Webb b51b32bdeb Upgrade to Spring WS 2.2.3
Closes gh-4485
2015-11-13 17:37:13 -08:00
Phillip Webb 2ac14748c9 Upgrade to JOOQ 3.7.1
Closes gh-4477
2015-11-13 17:37:07 -08:00
Phillip Webb c67aba0098 Upgrade to Spring Social 1.1.3
Fixes gh-4464
2015-11-13 16:56:53 -08:00
Phillip Webb e006e1795c Merge remote-tracking branch 'springsource/1.2.x' 2015-11-13 16:52:04 -08:00
Phillip Webb 604ca52491 Revert "Upgrade to Spring Social 1.1.3"
This reverts commit 331a26a497.
2015-11-13 16:50:30 -08:00
Phillip Webb 83e870a2dc Merge branch '1.2.x' 2015-11-13 14:10:58 -08:00
Phillip Webb 331a26a497 Upgrade to Spring Social 1.1.3
Fixes gh-4464
2015-11-13 14:09:24 -08:00
Phillip Webb e9440ad5b5 Formatting 2015-11-13 10:35:55 -08:00
Phillip Webb 3e8cafaf97 Add support for `spring-devtools.properties`
Allow `META-INF/spring-devtools.properties` files to be used by
application developers to declare is specific jars should be included
or excluded from the RestartClassLoader.

A typical example where this might be used is a company that develops
it's own set of internal JARs that are used by developers but not
usually imported into their IDE.

See gh-3316
2015-11-13 10:32:44 -08:00
Stephane Nicoll 78f739dbdd Merge pull request #4463 from izeye/typo-20151113
* pr/4463:
  Fix typos
2015-11-13 13:55:04 +01:00
Johnny Lim 0a85281a66 Fix typos
Closes gh-4463
2015-11-13 13:54:50 +01:00
Stephane Nicoll b83368a503 Fix case for MockMvc
Closes gh-4459
2015-11-13 13:12:27 +01:00
Stephane Nicoll 54604805ae Merge pull request #4455 from izeye/polish-20151113
* pr/4455:
  Polish
2015-11-13 10:15:38 +01:00
Johnny Lim e5b31beb68 Polish
This commit resolves typos and naming inconsistency.

Closes gh-4455
2015-11-13 10:15:15 +01:00
Stephane Nicoll b27d66fedd Merge pull request #4456 from eddumelendez/gh-4325
* pr/4456:
  Polish contribution
  Add timeout configuration for CRaSH
2015-11-13 10:13:55 +01:00
Stephane Nicoll ba2aea4ef1 Polish contribution
Closes gh-4456
2015-11-13 10:13:44 +01:00
Eddú Meléndez 41300c35ab Add timeout configuration for CRaSH
Closes gh-4325
2015-11-13 09:55:54 +01:00
Stephane Nicoll 0c8d302a98 Polish
See gh-4448
2015-11-13 09:50:04 +01:00
Stephane Nicoll 2ac18a33d5 Add a note to define what triggers a Devtools change
Closes gh-4453
2015-11-13 09:41:40 +01:00
Phillip Webb b09d0e1e3b Merge pull request #4449 from eddumelendez/gh-4445
* pr/4449:
  Fix springProfile with multi profiles separated by comma and whitespace
2015-11-12 10:50:58 -08:00
Eddú Meléndez bd709f30c5 Fix springProfile with multi profiles separated by comma and whitespace
Previously springProfile supported multi profiles separated by comma but
it doesn´t work if there are whitespaces. Now, springProfile will read
values cleaning whitespaces.

See gh-4445
2015-11-12 10:48:46 -08:00
Phillip Webb 6a32955cd4 Merge pull request #4448 from eddumelendez/gh-4444
* pr/4448:
  Add `spring.mvc.static-path-pattern` property
2015-11-12 10:47:20 -08:00
Eddú Meléndez 066533de7e Add `spring.mvc.static-path-pattern` property
Add a `spring.mvc.static-path-pattern` property which can be used to
configure the path pattern used to serve static resources.

Fixes gh-4444
Closes gh-4448
2015-11-12 10:46:27 -08:00
Stephane Nicoll 854dadc6af Merge pull request #4446 from izeye/polish-20151112
* pr/4446:
  Polish docs
2015-11-12 17:23:23 +01:00
Johnny Lim 4d9111606b Polish docs
Closes gh-4446
2015-11-12 17:23:04 +01:00
Dave Syer 8749fc745b Disallow all extensions in actuator endpoints (except .json)
Along with the recent change in Spring to use content-disposition
"inline" (which prevents the download), it also makes sense to limit
the extensions allowed by the actuator endpoints. Really there *is*
no extension for these endpoints, but since all of them explicitly
produce JSON we can add .json for browsers as a convenience in case
the app would otherwise choose to send XML.

Fixes gh-4402
2015-11-12 10:25:06 +00:00
Phillip Webb 1204559815 Refine agent reloader detection
Fixes gh-4366
2015-11-11 21:33:54 -08:00
Phillip Webb 6ae021969b Use TestPropertySourceUtils to convert properties
Fixes gh-4384
2015-11-11 21:24:20 -08:00
Phillip Webb 09b5222f52 Disable suffix pattern matching for Endpoints
Update EndpointHandlerMapping so that setUseSuffixPatternMatch is set
to false. This prevents URLs of the form /beans.json from returning
results and provides another line of defense against RDF attacks.

Fixes gh-4402
2015-11-11 20:15:28 -08:00
Phillip Webb 10d407a516 Exclude commons-logging from ActiveMQ dependencies
Add commons logging exclusions to:

* org.apache.activemq:activemq-leveldb-store
* org.apache.activemq:activemq-spring
* org.apache.activemq:activemq-console

Fixes gh-4116
2015-11-11 14:43:33 -08:00
Phillip Webb c2c451d3f1 Merge pull request #4319 from mbenson/interpolate-profile-properties
* pr/4319:
  Interpolate property values for repositories
2015-11-11 14:41:33 -08:00
Matt Benson 5e7376fb3c Interpolate property values for repositories
Update RepositoryConfigurationFactory to apply a RegexBasedInterpolator
to repository IDs and URLs.

Fixes gh-4318
Closes gh-4319
2015-11-11 14:41:28 -08:00
Phillip Webb 5df807926e Merge pull request #4432 from cornelcreanga/master
* pr/4432:
  Add Cassandra username/password properties
2015-11-11 14:12:28 -08:00
cornelcreanga@yahoo.com 190b0d4fe9 Add Cassandra username/password properties
Allow Cassandra credentials to be specified using properties.

Fixes gh-4431
Closes gh-4432
2015-11-11 14:12:04 -08:00
Phillip Webb 4254cc46c3 Merge pull request #4434 from izeye/patch-48
* pr/4434:
  Rename a test method to use dir instead folder
2015-11-11 14:04:27 -08:00
Johnny Lim aa432daa3e Rename a test method to use dir instead folder
Closes gh-4434
2015-11-11 14:03:59 -08:00
Phillip Webb 4b302e177a Upgrade to Reactor 2.0.7.BUILD-SNAPSHOT
See gh-4394
2015-11-11 12:10:03 -08:00
Phillip Webb 8c0decac94 Clear list after handling uncaught exceptions
See gh-4423
2015-11-11 12:10:03 -08:00
Stephane Nicoll c595d89717 Merge pull request #4433 from izeye/polish-20151111
* pr/4433:
  Polish docs
2015-11-11 15:05:01 +01:00
Johnny Lim 4c1398148b Polish docs
Closes gh-4433
2015-11-11 15:04:45 +01:00
Stephane Nicoll f7fb470f29 Merge pull request #4428 from izeye/test
* pr/4428:
  Remove redundant assertions
2015-11-11 09:52:30 +01:00
Johnny Lim 12a9a6e195 Remove redundant assertions
Closes gh-4428
2015-11-11 09:52:09 +01:00
Phillip Webb a530221213 Ensure startup failures are only logged once
Update SpringApplication so that startup exceptions are only logged
once. A custom UncaughtExceptionHandler is now used when running in
the main thread to suppress errors that have already been logged.

Fixes gh-4423
2015-11-10 23:02:13 -08:00
Stephane Nicoll e8b28796d9 Merge pull request #4429 from jadekler/master
* pr/4429:
  Upgrade hikaricp to 2.4.2
2015-11-11 06:52:47 +01:00
Jean de Klerk 01bc9d35ad Upgrade hikaricp to 2.4.2
Closes gh-4427
2015-11-11 06:51:55 +01:00
Phillip Webb a3fac37904 Fix checkstyle error 2015-11-10 15:32:25 -08:00
Phillip Webb 287a62c8f3 Update Johannes Edmeier author attribution
Congratulations to Johannes Edmeier on getting married!
2015-11-10 15:29:44 -08:00
Phillip Webb a99e72f91d Merge pull request #4333 from joshiste/logfile-resource-handler
* pr/4333:
  Improve resource handling in LogFileMvcEndpoint
2015-11-10 15:20:42 -08:00
Johannes Edmeier a1b1cdb18f Improve resource handling in LogFileMvcEndpoint
Update `LogFileMvcEndpoint` to use a `ResourceHttpRequestHandler` when
serving the log file resource. This gives support for requesting parts
of the logfile via the HTTP Range header. Requests with the
`If-Modified-Since` header are now also handled correctly.

Closes gh-4333
2015-11-10 15:17:06 -08:00
Phillip Webb 77e885836d Merge pull request #4409 from shakuzen/health-cassandra
* pr/4409:
  Auto-configure CassandraHealthIndicator
2015-11-10 13:51:39 -08:00