Phillip Webb
0d0e5eb590
Merge branch '1.1.x'
10 years ago
Dave Syer
336b96b81c
Copy server customization to management context
...
If the actuator endpoints are configured on a different port then there
are some settings in the main ServerProperties that we would like to
re-use (e.g. the access log). The easiest way to do that is to just
configure the management server using the same ServerProperties instance
and then overwrite the things that are different (and stored in
ManagementServerProperties).
Fixes gh-1581
10 years ago
Phillip Webb
338288205b
Fixup version numbers following release
10 years ago
Spring Buildmaster
d63e4b4329
Next development version
10 years ago
Phillip Webb
6b083d7e0b
Merge branch '1.1.x'
...
Conflicts:
pom.xml
spring-boot-actuator/pom.xml
spring-boot-autoconfigure/pom.xml
spring-boot-cli/pom.xml
spring-boot-dependencies/pom.xml
spring-boot-docs/pom.xml
spring-boot-full-build/pom.xml
spring-boot-integration-tests/pom.xml
spring-boot-parent/pom.xml
spring-boot-samples/pom.xml
spring-boot-samples/spring-boot-sample-actuator-log4j/pom.xml
spring-boot-samples/spring-boot-sample-actuator-noweb/pom.xml
spring-boot-samples/spring-boot-sample-actuator-ui/pom.xml
spring-boot-samples/spring-boot-sample-actuator/pom.xml
spring-boot-samples/spring-boot-sample-amqp/pom.xml
spring-boot-samples/spring-boot-sample-aop/pom.xml
spring-boot-samples/spring-boot-sample-batch/pom.xml
spring-boot-samples/spring-boot-sample-data-elasticsearch/pom.xml
spring-boot-samples/spring-boot-sample-data-gemfire/pom.xml
spring-boot-samples/spring-boot-sample-data-jpa/pom.xml
spring-boot-samples/spring-boot-sample-data-mongodb/pom.xml
spring-boot-samples/spring-boot-sample-data-redis/pom.xml
spring-boot-samples/spring-boot-sample-data-rest/pom.xml
spring-boot-samples/spring-boot-sample-data-solr/pom.xml
spring-boot-samples/spring-boot-sample-flyway/pom.xml
spring-boot-samples/spring-boot-sample-hornetq/pom.xml
spring-boot-samples/spring-boot-sample-integration/pom.xml
spring-boot-samples/spring-boot-sample-jetty/pom.xml
spring-boot-samples/spring-boot-sample-liquibase/pom.xml
spring-boot-samples/spring-boot-sample-parent-context/pom.xml
spring-boot-samples/spring-boot-sample-profile/pom.xml
spring-boot-samples/spring-boot-sample-secure/pom.xml
spring-boot-samples/spring-boot-sample-servlet/pom.xml
spring-boot-samples/spring-boot-sample-simple/pom.xml
spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/pom.xml
spring-boot-samples/spring-boot-sample-tomcat/pom.xml
spring-boot-samples/spring-boot-sample-tomcat8-jsp/pom.xml
spring-boot-samples/spring-boot-sample-traditional/pom.xml
spring-boot-samples/spring-boot-sample-web-freemarker/pom.xml
spring-boot-samples/spring-boot-sample-web-groovy-templates/pom.xml
spring-boot-samples/spring-boot-sample-web-jsp/pom.xml
spring-boot-samples/spring-boot-sample-web-method-security/pom.xml
spring-boot-samples/spring-boot-sample-web-secure/pom.xml
spring-boot-samples/spring-boot-sample-web-static/pom.xml
spring-boot-samples/spring-boot-sample-web-ui/pom.xml
spring-boot-samples/spring-boot-sample-web-velocity/pom.xml
spring-boot-samples/spring-boot-sample-websocket/pom.xml
spring-boot-samples/spring-boot-sample-ws/pom.xml
spring-boot-samples/spring-boot-sample-xml/pom.xml
spring-boot-starters/pom.xml
spring-boot-starters/spring-boot-starter-actuator/pom.xml
spring-boot-starters/spring-boot-starter-amqp/pom.xml
spring-boot-starters/spring-boot-starter-aop/pom.xml
spring-boot-starters/spring-boot-starter-batch/pom.xml
spring-boot-starters/spring-boot-starter-data-elasticsearch/pom.xml
spring-boot-starters/spring-boot-starter-data-gemfire/pom.xml
spring-boot-starters/spring-boot-starter-data-jpa/pom.xml
spring-boot-starters/spring-boot-starter-data-mongodb/pom.xml
spring-boot-starters/spring-boot-starter-data-rest/pom.xml
spring-boot-starters/spring-boot-starter-data-solr/pom.xml
spring-boot-starters/spring-boot-starter-freemarker/pom.xml
spring-boot-starters/spring-boot-starter-groovy-templates/pom.xml
spring-boot-starters/spring-boot-starter-hornetq/pom.xml
spring-boot-starters/spring-boot-starter-integration/pom.xml
spring-boot-starters/spring-boot-starter-jdbc/pom.xml
spring-boot-starters/spring-boot-starter-jetty/pom.xml
spring-boot-starters/spring-boot-starter-log4j/pom.xml
spring-boot-starters/spring-boot-starter-logging/pom.xml
spring-boot-starters/spring-boot-starter-mobile/pom.xml
spring-boot-starters/spring-boot-starter-parent/pom.xml
spring-boot-starters/spring-boot-starter-redis/pom.xml
spring-boot-starters/spring-boot-starter-remote-shell/pom.xml
spring-boot-starters/spring-boot-starter-security/pom.xml
spring-boot-starters/spring-boot-starter-social-facebook/pom.xml
spring-boot-starters/spring-boot-starter-social-linkedin/pom.xml
spring-boot-starters/spring-boot-starter-social-twitter/pom.xml
spring-boot-starters/spring-boot-starter-test/pom.xml
spring-boot-starters/spring-boot-starter-thymeleaf/pom.xml
spring-boot-starters/spring-boot-starter-tomcat/pom.xml
spring-boot-starters/spring-boot-starter-velocity/pom.xml
spring-boot-starters/spring-boot-starter-web/pom.xml
spring-boot-starters/spring-boot-starter-websocket/pom.xml
spring-boot-starters/spring-boot-starter-ws/pom.xml
spring-boot-starters/spring-boot-starter/pom.xml
spring-boot-tools/pom.xml
spring-boot-tools/spring-boot-dependency-tools/pom.xml
spring-boot-tools/spring-boot-gradle-plugin/pom.xml
spring-boot-tools/spring-boot-loader-tools/pom.xml
spring-boot-tools/spring-boot-loader/pom.xml
spring-boot-tools/spring-boot-maven-plugin/pom.xml
spring-boot-versions/pom.xml
spring-boot/pom.xml
10 years ago
Phillip Webb
cac3865ffa
Fixup version numbers following release
10 years ago
Spring Buildmaster
74d0c5185a
Next development version
10 years ago
Andy Wilkinson
7f9ef1cf5b
Merge branch '1.1.x'
10 years ago
Andy Wilkinson
e185793396
Update test to correct name of metric for request that returns a 401
...
The request is being made to '/' and, while the application does have
a mapping for '/', that mapping is not looked for before Spring
Security's filter rejects the request with a 401. This means that the
request is considered to be unmapped and this is reflected in the
metric's name.
See #1331 and #1333
10 years ago
Stephane Nicoll
249e09d9bc
Switch master to 1.2.0.BUILD-SNAPSHOT
11 years ago
Phillip Webb
3c7d825658
Fixup version numbers following release
11 years ago
Spring Buildmaster
40327e1ae6
Next development version
11 years ago
Phillip Webb
fa88c481a5
Remote trailing whitespace
11 years ago
Dave Syer
fd757cb371
Add logging.level to application.properties
...
E.g.
logging.level.org.springframework: DEBUG
logging.level.org.hibernate: WARN
Fixed gh-788
11 years ago
Phillip Webb
cc61d92b88
Fixup build following release
11 years ago
Spring Buildmaster
981669b7c0
Next development version
11 years ago
Phillip Webb
200cd535c2
Revert "Next development version"
...
This reverts commit 67189477fe
.
11 years ago
Spring Buildmaster
67189477fe
Next development version
11 years ago
Phillip Webb
9632abf825
Formatting and cleanup
11 years ago
Phillip Webb
91bbd20ca0
Fixup version numbers following release
11 years ago
Spring Buildmaster
542f3cbda8
Next development version
11 years ago
Phillip Webb
143e1918b7
Fixup versions following release
11 years ago
Spring Buildmaster
4ca26a21dc
Next development version
11 years ago
Phillip Webb
9e93719922
Fixup version numbers following release
11 years ago
Spring Buildmaster
05ed7b3bcd
Next development version
11 years ago
Phillip Webb
3007a777d0
Roll back to 1.1.0.BUILD-SNAPSHOT
11 years ago
Phillip Webb
5adbf32c18
Fixup version numbers following release
11 years ago
Spring Buildmaster
c650f2391e
Next development version
11 years ago
Dave Syer
bc85f388aa
Add test for gh-1058
11 years ago
Dave Syer
68448a8c68
Use the ServerProperties to add prefixes to paths
...
when server.servletPath is set we need to add prefixes to
the security filter paths.
Fixes gh-945
11 years ago
Christian Dupuis
4648188782
Rework HealthEndpoint and HealthIndicator
...
With this commit the state of a component or subsystem becomes a first-class citizen in Boot's application health support. HealthIndicators now return a Health instance with status and some contextual details.
An aggregation strategy has been introduced to aggregate several Health instances into one final application Health instance. Out of the box OrderedHealthAggregator can be configured to allow different ordering or a custom HealthAggregator bean can be registered.
11 years ago
Andy Wilkinson
58b768b204
Merge branch '1.0.x'
11 years ago
Andy Wilkinson
6dafa15eef
Remove mouldy start.groovy from the actuator sample
...
Fixes #900
11 years ago
Phillip Webb
8bcda1bcbe
Polish
11 years ago
Dave Syer
58379e7593
Add hibernate-validator to spring-boot-starter-web
...
Fixes gh-616
11 years ago
Phillip Webb
01fcf61140
Polish
11 years ago
Dave Syer
5249f54c5a
Integrate @ConfigurationProperties @Beans with DataSource configuration
...
We now have a much simpler DataSourceAutoConfiguration that binds to whatever
DataSource concrete type it finds at runtime. To be able to quickly switch between
Hikari and the other types of DataSource there's a minute shim for translating
the common properties (username, password, url, driverClassName), but actually
only url is different. The shim and also DataSource initialization is supported
through DataSourceProperties, but the other native properties get bound directly
through the concrete runtime type of the DataSource.
The /configprops endpoint works (and is exposed in the actuator sample).
Fixes gh-840, fixes gh-477, see also gh-808.
11 years ago
Dave Syer
5dd77a725c
Enable access log explicitly in sample
11 years ago
Phillip Webb
61232395d8
Fixup versions
11 years ago
Christian Dupuis
c38f9bcdfa
Add missing tests
11 years ago
Christian Dupuis
941c5560eb
Remove duplicate hibernate-validator dependency from pom
11 years ago
Phillip Webb
decee8d871
Polish templates code
11 years ago
Dave Syer
2c087d4787
Update Boot version in gradle samples
11 years ago
Dave Syer
27580e726f
Add generic error handling to BasicErrorController
...
Since Spring supports gobal error handling through
@ControllerAdvice, it is quite easy to set up more meta-data
about an exception for the BasicErrorController. You need
to be careful not to swallow Security exceptions, and probably
others (optionally) so this feature needs a bit more work.
See gh-538
11 years ago
Phillip Webb
64a835e91a
Move master to 1.1.0.BUILD-SNAPSHOT
11 years ago
Spring Buildmaster
d3954a1703
Next development version
11 years ago
Phillip Webb
fad5ce45db
Polish
11 years ago
Dave Syer
7b07fe8ce0
Convert remaining samples to use random port
...
Partial fix for gh-337. See also gh-607 which complements this, but might
conflict on a merge.
11 years ago
Dave Syer
f134e96053
Convert Actuator sample to dynamic ports
11 years ago
Spring Buildmaster
a5864ebcd0
Next development version
11 years ago