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
674e61d87d
Add dependency management for some additional Hibernate modules
...
hibernate-jpamodelgen was requested by a Boot user. hibernate-ehcache
and hibernate-envers were requested by a Spring IO Platform user (see
spring-io/platform#11
Closes gh-1896
2014-11-11 16:40:24 +00:00
ade22c87ec
Update WarLauncher to remove the root of the war from the classpath
...
Previously, WarLauncher included its root on the classpath. It also used
a filtered version of its root archive to hide both the WEB-INF and
META-INF directories. This meant that files in WEB-INF and META-INF
could be found by the classloader (as they were on the classpath) but
could not be read as the filtered archive was hiding them.
This commit updates WarLauncher to remove the root of the war file from
the classpath. It also removes the filtering of the archive, thereby
allowing files in META-INF and WEB-INF to be accessed via the
ServletContext.
Closes gh-1792
2014-11-11 14:42:19 +00:00
215689bd4d
Use a local temp directory in logging system tests
...
Previously, the tests for Boot’s various logging systems used the
JVM’s default temp directory as the location of the spring.log file.
It is suspected that this was causing intermittent CI failures when
multiple Boot builds were running in parallel and tests were checking
for the presence of the spring.log file in the shared temp directory.
This commit updates AbstractLoggingSystemTests to configure a local
temp directory for the duration of the tests, thereby hopefully
eliminating failures caused by concurrent builds sharing the same
directory.
The previous attempt at fixing the intermittent CI failures (504de8a
2014-11-11 13:30:11 +00:00
f9221e24ef
Polish method name in HibernateJpaAutoConfiguration
2014-11-11 12:37:34 +00:00
40d7927aad
Merge branch '1.1.x'
...
Conflicts:
spring-boot-dependencies/pom.xml
2014-11-11 12:32:05 +00:00
eecdb92728
Upgrade to Spring 4.0.8.RELEASE
...
Closes gh-1785
2014-11-11 12:31:07 +00:00
5194953030
Upgrade to Tomcat 8.0.15
...
Closes gh-1890
2014-11-11 12:30:12 +00:00
04f9872693
Upgrade to Jedis 2.5.2
...
Closes gh-1895
2014-11-11 11:26:47 +00:00
aefd53059a
Upgrade to SnakeYAML 1.14
...
Closes gh-1894
2014-11-11 11:26:47 +00:00
15991b2fd0
Upgrade to Mockito 1.10.8
...
Closes gh-1892
2014-11-11 11:26:47 +00:00
8b1905bb01
Upgrade to Hibernate Validator 5.1.3
...
Closes gh-1891
2014-11-11 11:26:47 +00:00
14b16712ed
Upgrade to Log4j 2 2.1
...
Closes gh-1889
2014-11-11 11:26:47 +00:00
a8fb5b10a7
Upgrade to Joda Time 2.5
...
Closes gh-1888
2014-11-11 11:26:47 +00:00
325d751225
Upgrade to HikariCP 2.2.4
...
Closes gh-1887
2014-11-11 11:26:46 +00:00
21354db647
Upgrade to H2 1.4.182
...
Closes gh-1886
2014-11-11 11:26:46 +00:00
0014f6dba7
Upgrade to Jackson 2.4.3
...
Closes gh-1885
2014-11-11 11:26:46 +00:00
7401e29f57
Upgrade to Spring Framework 4.1.2.RELEASE
...
Closes gh-1805
2014-11-11 11:26:46 +00:00
109c3a3439
Auto configure CharacterEncodingFilter
...
Provide a default UTF-8 encoding for HTTP requests and responses unless
specified otherwise.
Fixes gh-1182
2014-11-11 12:01:15 +01:00
6eab4628f4
Merge branch '1.1.x'
2014-11-11 10:32:58 +00:00
21adc5066e
Upgrade to Spring Mobile 1.1.3.RELEASE
...
Closes gh-1893
2014-11-11 10:32:17 +00:00
7d1606dcfa
Merge branch '1.1.x'
...
Conflicts:
spring-boot-dependencies/pom.xml
2014-11-11 10:13:51 +00:00
Dave Syer
Phillip Webb
Spring Buildmaster
Stephane Nicoll
Johannes Stelzer
Andy Wilkinson