Commit Graph

6359 Commits

Author SHA1 Message Date
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
Tommy Ludwig d8247657a0 Auto-configure CassandraHealthIndicator
Add auto-configuration for the CassandraHealthIndicator. Also update
the implementation to use CassandraOperations rather than
CassandraAdminOperations.

Closes gh-4409
2015-11-10 13:49:39 -08:00
Phillip Webb 9f17fe4454 Merge pull request #4300 from bohuslav-burghardt/configurable-trace-options-request-handling
* pr/4300:
  Make OPTIONS/TRACE request handling configurable
2015-11-10 13:12:05 -08:00
Bohuslav Burghardt 88cf65427f Make OPTIONS/TRACE request handling configurable
Add properties to WebMvcProperties allowing control of if TRACE/OPTIONS
requests should go through the regular dispatching chain.

Closes gh-4300
2015-11-10 13:10:27 -08:00
Phillip Webb a8b23f9deb Fix import order 2015-11-10 13:03:33 -08:00
Phillip Webb 6c17442415 Merge pull request #4237 from awgtek/master
* pr/4237:
  Switch MongoCredential method
2015-11-10 12:59:44 -08:00
awgtek deaa9051bc Switch MongoCredential method
Update MongoProperties to use `MongoCredential.createCredential` rather
than `MongoCredential.createMongoCRCredential`. This allows connections
to Mongo 3.0 servers to authenticate using the SCRAM-SHA-1 mechanism.

Closes gh-4237
2015-11-10 12:59:32 -08:00
Phillip Webb d5d6507e97 Merge pull request #4335 from izeye/ordered
* pr/4335:
  Polish
  Use Ordered.HIGHEST_PRECEDENCE constants
2015-11-10 12:15:56 -08:00
Johnny Lim c87370085b Polish 2015-11-10 12:15:27 -08:00
Johnny Lim 83e8bfedb2 Use Ordered.HIGHEST_PRECEDENCE constants
Use Ordered.HIGHEST_PRECEDENCE rather than Integer.MIN_VALUE.

Closes gh-4335
2015-11-10 12:13:15 -08:00
Phillip Webb 9f8eda18b7 Merge pull request #4362 from marcingrzejszczak/issues/config-props-before-default
* pr/4362:
  Add config properties before default properties
2015-11-10 12:09:56 -08:00
Marcin Grzejszczak 19f141dc59 Add config properties before default properties
Update ConfigFileApplicationListener so that configuration properties
are added before `defaultProperties` if they exist.

Fixes gh-4362
2015-11-10 12:09:50 -08:00
Phillip Webb 18db4f6c62 Merge pull request #4371 from pmvilaca/fix-#4369-launch-script
* pr/4371:
  Don't remove PID file before stopping the service
2015-11-10 11:18:39 -08:00
Pedro Vilaca 98be051cfa Don't remove PID file before stopping the service
Update the launch script so that the PID file is not longer removed at
the beginning of the stop method. Prior to this commit if a service
wasn't able to stop on the first run, it wasn't possible to use the
launch script anymore.

Fixes gh-4369
Closes gh-4371
2015-11-10 11:16:00 -08:00
Phillip Webb 0bac6ebda7 Fix typo
See gh-4419
2015-11-10 09:52:39 -08:00