Commit Graph

3711 Commits

Author SHA1 Message Date
Phillip Webb 3a9d6242ea Sync up versions used in Maven integration tests
Fixes gh-1797
2014-11-13 18:45:35 -08:00
Phillip Webb 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
Phillip Webb 0a6c635f5e Use getMaxActiveSessions() in Tomcat metrics
Replace the getMaxActive() call with getMaxActiveSessions().

Fixes gh-1902
2014-11-13 13:58:58 -08:00
Phillip Webb 4840d2c88c Restore `spring.main.disable_banner=fase` support
Fixes gh-1918
2014-11-13 13:48:34 -08:00
Dave Syer 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
Phillip Webb 345ced1675 Fixup version numbers following release 2014-11-11 18:05:23 -08:00
Spring Buildmaster 46b7738334 Next development version 2014-11-11 17:12:24 -08:00
Phillip Webb 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
Stephane Nicoll 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
Phillip Webb 3e565bf421 Upgrade to Spring Integration 4.1.0.RELEASE
Fixes gh-1848
2014-11-11 15:20:57 -08:00
Phillip Webb 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
Johannes Stelzer c2a3ccde3e Add Tomcat public metrics for session usage
Fixes gh-1860
2014-11-11 15:03:55 -08:00
Phillip Webb d8c5c3262a Co-locate PublicMetrics auto-configuration
Fixes gh-1900
2014-11-11 14:07:03 -08:00
Phillip Webb 8cac63e239 Drop hibernate-jpa-2.0-api managed dependency
Fixes gh-1898
2014-11-11 13:03:25 -08:00
Phillip Webb 5834bcb59f Revert "Upgrade to HikariCP 2.2.4"
This reverts commit 325d751225.

Conflicts:
	spring-boot-dependencies/pom.xml
2014-11-11 12:53:36 -08:00
Phillip Webb f55705be1b Upgrade maven-source-plugin to 2.4
Fixes gh-1872
2014-11-11 12:51:02 -08:00
Phillip Webb 4fa8a94dd4 Update to latest Maven plugins
Fixes gh-1899
2014-11-11 12:44:31 -08:00
Phillip Webb 3e02b81e98 Merge branch '1.1.x' 2014-11-11 09:48:04 -08:00
Phillip Webb b947d6001d Polish 2014-11-11 09:47:54 -08:00
Phillip Webb 52967017a0 Polish 2014-11-11 09:47:10 -08:00
Andy Wilkinson 7aaf7c65bd Merge branch '1.1.x'
Conflicts:
	spring-boot-dependencies/pom.xml
2014-11-11 17:43:17 +00:00
Andy Wilkinson 142c183b11 Fix the ordering of versions and dependencies in the dependencies pom 2014-11-11 17:41:48 +00:00
Andy Wilkinson ff6a146c24 Merge branch '1.1.x' 2014-11-11 17:41:28 +00:00
Phillip Webb a832944c05 Rename HtppClientOption to HttpClientOption
Fixes gh-1874
2014-11-11 09:33:29 -08:00
Andy Wilkinson 6770960737 Upgrade to Spring AMQP 1.4.0.RELEASE
Closes gh-1849
2014-11-11 16:52:20 +00:00
Andy Wilkinson 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
Andy Wilkinson 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
Andy Wilkinson 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)
has been removed as part of this commit as it did not fix the problem.

Closes gh-1864
2014-11-11 13:30:11 +00:00
Andy Wilkinson f9221e24ef Polish method name in HibernateJpaAutoConfiguration 2014-11-11 12:37:34 +00:00
Andy Wilkinson 40d7927aad Merge branch '1.1.x'
Conflicts:
	spring-boot-dependencies/pom.xml
2014-11-11 12:32:05 +00:00
Andy Wilkinson eecdb92728 Upgrade to Spring 4.0.8.RELEASE
Closes gh-1785
2014-11-11 12:31:07 +00:00
Andy Wilkinson 5194953030 Upgrade to Tomcat 8.0.15
Closes gh-1890
2014-11-11 12:30:12 +00:00
Andy Wilkinson 04f9872693 Upgrade to Jedis 2.5.2
Closes gh-1895
2014-11-11 11:26:47 +00:00
Andy Wilkinson aefd53059a Upgrade to SnakeYAML 1.14
Closes gh-1894
2014-11-11 11:26:47 +00:00
Andy Wilkinson 15991b2fd0 Upgrade to Mockito 1.10.8
Closes gh-1892
2014-11-11 11:26:47 +00:00
Andy Wilkinson 8b1905bb01 Upgrade to Hibernate Validator 5.1.3
Closes gh-1891
2014-11-11 11:26:47 +00:00
Andy Wilkinson 14b16712ed Upgrade to Log4j 2 2.1
Closes gh-1889
2014-11-11 11:26:47 +00:00
Andy Wilkinson a8fb5b10a7 Upgrade to Joda Time 2.5
Closes gh-1888
2014-11-11 11:26:47 +00:00
Andy Wilkinson 325d751225 Upgrade to HikariCP 2.2.4
Closes gh-1887
2014-11-11 11:26:46 +00:00
Andy Wilkinson 21354db647 Upgrade to H2 1.4.182
Closes gh-1886
2014-11-11 11:26:46 +00:00
Andy Wilkinson 0014f6dba7 Upgrade to Jackson 2.4.3
Closes gh-1885
2014-11-11 11:26:46 +00:00
Andy Wilkinson 7401e29f57 Upgrade to Spring Framework 4.1.2.RELEASE
Closes gh-1805
2014-11-11 11:26:46 +00:00
Stephane Nicoll 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
Andy Wilkinson 6eab4628f4 Merge branch '1.1.x' 2014-11-11 10:32:58 +00:00
Andy Wilkinson 21adc5066e Upgrade to Spring Mobile 1.1.3.RELEASE
Closes gh-1893
2014-11-11 10:32:17 +00:00
Andy Wilkinson 7d1606dcfa Merge branch '1.1.x'
Conflicts:
	spring-boot-dependencies/pom.xml
2014-11-11 10:13:51 +00:00
Andy Wilkinson f07c090876 Upgrade to Mongo Java Driver 2.12.4
The exception message for a connection timeout has been updated to
include the timeout period. The tests for the sample have been updated
accordingly.

Closes gh-1884
2014-11-11 10:10:16 +00:00
Andy Wilkinson 7e95dba52e Upgrade to Jolokia 1.2.3
Closes gh-1883
2014-11-11 10:08:58 +00:00
Andy Wilkinson a09e8f7538 Upgrade to HornetQ 2.4.5
Closes gh-1882
2014-11-11 10:08:37 +00:00
Andy Wilkinson 4e9da8c86e Upgrade to Hibernate 4.3.7
Closes gh-1881
2014-11-11 10:08:09 +00:00