cea47bd48c
Merge branch '1.1.x'
...
Conflicts:
spring-boot-dependencies/pom.xml
2014-11-18 10:57:37 +00:00
33dfab08de
Upgrade to Tomcat 7.0.57
...
Closes gh-1936
2014-11-18 10:45:11 +00:00
5bc48bee5a
Upgrade to Spring AMQP 1.3.7.RELEASE
...
Closes gh-1906
2014-11-18 10:44:52 +00:00
1182495810
Upgrade to Spring Integration 4.0.5.RELEASE
...
Closes gh-1905
2014-11-18 10:44:32 +00:00
d246dee6d6
Merge branch '1.1.x'
2014-11-18 10:43:14 +00:00
6ab47db19d
Omit null pathInfo from ErrorPageFilter's error message
...
Fixes gh-1944
2014-11-18 10:41:27 +00:00
8635724521
Merge branch '1.1.x'
2014-11-18 10:25:23 +00:00
41cb567894
Don't flush in ErrorPageFilter for < 400 response that's committed
...
Previously, for a non-async response with a successful status (< 400),
ErrorPageFilter would always call flushBuffer. This triggers an
exception in Tomcat if the client has closed the connection before the
response has been fully sent. In this case, Tomcat treats the response
as successful and commits it before control returns to the filter.
This commit updates ErrorPageFilter to only perform the flush if the
response has not already been committed, leaving any further flushing
that may be necessary to be handled by the servlet container.
Fixes gh-1938
2014-11-18 10:23:55 +00:00
6cdd27a34d
Merge branch '1.1.x'
2014-11-17 21:32:27 -08:00
f224c7ac9e
Find @ConfigurationProperties annotation on proxy
...
Update ConfigurationPropertiesReportEndpoint to find
@ConfigurationProperties using `context.findAnnotationOnBean` rather
than `AnnotationUtils.findAnnotation`. This will correctly find the
annotation even if the bean is an interface based proxy.
Fixes gh-1927
2014-11-17 21:29:21 -08:00
ba2446a340
Merge branch '1.1.x'
2014-11-17 19:06:27 -08:00
285563a509
Use embedded docbook XSLT files
...
Switch from external docbook XSLT to those shipped as part of the
Maven plugin.
Fixes gh-1942
2014-11-17 19:04:26 -08:00
05cf686713
Allow servlet context parmeters to be configured via declaratively
...
Previously, configuration of a ServletContext init parameter required
the use of a ServletContextInitializer bean. This commmit adds
support for declarative configuration via the environment using
server.context_parameters.<name>=<value>.
Closes gh-1791
2014-11-17 20:20:08 +00:00
e0a0af436f
Add 'module' repacker layout
...
Add a 'module' layout for the repackager which includes all 'compile'
and 'runtime' scope dependencies and does not require a main class.
Fixes gh-1941
2014-11-17 10:20:10 -08:00
3c6c1d08e0
Polish
2014-11-17 09:37:56 -08:00
bebf26d91e
Restore compatibility with Jetty 8 when SSL is being used
...
ServerConnector is in different packages in Jetty 8 and Jetty 9 which
was leading to a NoClassDefFounderError when SSL was used with
Jetty 8.
This commit updates SslServerConnectorFactory to return an
AbstractConnector, a super class of ServerConnector, that is in the
same package in both Jetty 8 and Jetty 9. This class does not provide
a setPort method so the setting of the port has been pushed down into
the SslServerConnectorFactory implementation.
SSL samples for both Jetty 8 and Jetty 9 have been added to verify
SSL with both supported versions of Jetty.
Closes gh-1925
2014-11-17 17:18:31 +00:00
c80ff4c555
Upgrade to HikariCP 2.2.5
...
Closes gh-1897
2014-11-17 16:34:19 +00:00
16e2130896
Add missing properties metadata
...
Fixes gh-1829
2014-11-17 15:58:08 +01:00
eb4c1426d3
Document init CLI command
...
Closes gh-1799
2014-11-17 15:38:12 +01:00
fba69821cc
Fix typo
2014-11-17 14:45:13 +01:00
8112aca9e8
Add documentation for email integration
...
Closes gh-1904
2014-11-17 14:43:46 +01:00
25428a32ad
Change spring-cloud.version to include 'connectors'
2014-11-17 08:52:22 +00:00
f6074ff2f5
Merge branch '1.1.x'
2014-11-13 19:15:23 -08:00
608b1e65a1
Relax servlet check
...
Relax the servlet version check in Maven integration tests.
See gh-1797
2014-11-13 19:14:56 -08:00
3030ad42fc
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/build.gradle
spring-boot-samples/spring-boot-sample-actuator/build.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/build.gradle
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/build.gradle
spring-boot-samples/spring-boot-sample-simple/pom.xml
spring-boot-samples/spring-boot-sample-tomcat-jsp/pom.xml
spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/pom.xml
spring-boot-samples/spring-boot-sample-tomcat-ssl/pom.xml
spring-boot-samples/spring-boot-sample-tomcat/pom.xml
spring-boot-samples/spring-boot-sample-traditional/pom.xml
spring-boot-samples/spring-boot-sample-velocity/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-custom/pom.xml
spring-boot-samples/spring-boot-sample-web-secure-jdbc/pom.xml
spring-boot-samples/spring-boot-sample-web-secure/pom.xml
spring-boot-samples/spring-boot-sample-web-static/build.gradle
spring-boot-samples/spring-boot-sample-web-static/pom.xml
spring-boot-samples/spring-boot-sample-web-ui/build.gradle
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
2014-11-13 18:52:49 -08:00
3a9d6242ea
Sync up versions used in Maven integration tests
...
Fixes gh-1797
2014-11-13 18:45:35 -08:00
37d0b1a64d
Fix @IntegrationTest context caching
...
Add an additional "IntegrationTest" property to @IntegrationTests
to ensure that they get a different MergedContextConfiguration which
is used as a context cache key.
Fixes gh-1909
2014-11-13 14:28:20 -08:00
0a6c635f5e
Use getMaxActiveSessions() in Tomcat metrics
...
Replace the getMaxActive() call with getMaxActiveSessions().
Fixes gh-1902
2014-11-13 13:58:58 -08:00
4840d2c88c
Restore `spring.main.disable_banner=fase` support
...
Fixes gh-1918
2014-11-13 13:48:34 -08:00
90d25bd582
Use Set (again) for enumerating MvcEndpoints
...
This reverts a change that I assume was orphaned from work in
progress to address #1353 , but is no longer needed. Anyway
there is no reason to restrict MvcEndpoints to be unique by
path since they can declare their own @RequestMappings
(and if there are duplicates they will be detected when those
are scanned).
Fixes gh-1911
2014-11-12 15:45:44 +00:00
345ced1675
Fixup version numbers following release
2014-11-11 18:05:23 -08:00
46b7738334
Next development version
2014-11-11 17:12:24 -08:00
bc76c87d44
Fix AnsiOutputApplicationListener package tangle
...
Relocate AnsiOutputApplicationListener to `context.embedded.config`
to fix package tangle.
See gh-1243
2014-11-11 16:18:22 -08:00
630c145645
Fix order of JMS auto configuration
...
Add additional @AutoConfigureAfter elements to ActiveMQAutoConfiguration
and HornetQAutoConfiguration to ensure that they are configured after
JndiConnectionFactoryAutoConfiguration.
The possible sources for a JMS ConnectionFactory are:
1. JNDI
2. HornetQ (embedded broker or an external broker)
3. ActiveMQ (embedded broker or an external broker)
The last two auto configurations must run after JTA auto-configuration
has completed as it may register additional beans that are necessary to
enable XA.
Previously, the HornetQ embedded broker would start regardless of the
presence of a ConnectionFactory as a ConditionalOnMissingBean was
missing. Furthermore, there was no order condition for the JNDI
auto-configuration so it may just run after one of the broker has been
found.
JNDI takes now precedence to be consistent with the regular DataSource
auto configuration.
Fixes gh-1821
2014-11-11 15:32:47 -08:00
3e565bf421
Upgrade to Spring Integration 4.1.0.RELEASE
...
Fixes gh-1848
2014-11-11 15:20:57 -08:00
d76ff4b5c3
Merge pull request #1860 from joshiste/metrics/activeSessions
...
* metrics/activeSessions:
Add Tomcat public metrics for session usage
2014-11-11 15:05:03 -08:00
c2a3ccde3e
Add Tomcat public metrics for session usage
...
Fixes gh-1860
2014-11-11 15:03:55 -08:00
d8c5c3262a
Co-locate PublicMetrics auto-configuration
...
Fixes gh-1900
2014-11-11 14:07:03 -08:00
8cac63e239
Drop hibernate-jpa-2.0-api managed dependency
...
Fixes gh-1898
2014-11-11 13:03:25 -08:00
5834bcb59f
Revert "Upgrade to HikariCP 2.2.4"
...
This reverts commit 325d751225
2014-11-11 12:53:36 -08:00
f55705be1b
Upgrade maven-source-plugin to 2.4
...
Fixes gh-1872
2014-11-11 12:51:02 -08:00
4fa8a94dd4
Update to latest Maven plugins
...
Fixes gh-1899
2014-11-11 12:44:31 -08:00
3e02b81e98
Merge branch '1.1.x'
2014-11-11 09:48:04 -08:00
b947d6001d
Polish
2014-11-11 09:47:54 -08:00
52967017a0
Polish
2014-11-11 09:47:10 -08:00
7aaf7c65bd
Merge branch '1.1.x'
...
Conflicts:
spring-boot-dependencies/pom.xml
2014-11-11 17:43:17 +00:00
142c183b11
Fix the ordering of versions and dependencies in the dependencies pom
2014-11-11 17:41:48 +00:00
ff6a146c24
Merge branch '1.1.x'
2014-11-11 17:41:28 +00:00
a832944c05
Rename HtppClientOption to HttpClientOption
...
Fixes gh-1874
2014-11-11 09:33:29 -08:00
6770960737
Upgrade to Spring AMQP 1.4.0.RELEASE
...
Closes gh-1849
2014-11-11 16:52:20 +00:00
Andy Wilkinson
Phillip Webb
Stephane Nicoll
Dave Syer
Spring Buildmaster
Johannes Stelzer