16e2130896
Add missing properties metadata
...
Fixes gh-1829
10 years ago
eb4c1426d3
Document init CLI command
...
Closes gh-1799
10 years ago
fba69821cc
Fix typo
10 years ago
8112aca9e8
Add documentation for email integration
...
Closes gh-1904
10 years ago
25428a32ad
Change spring-cloud.version to include 'connectors'
10 years ago
f6074ff2f5
Merge branch '1.1.x'
10 years ago
608b1e65a1
Relax servlet check
...
Relax the servlet version check in Maven integration tests.
See gh-1797
10 years ago
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
10 years ago
3a9d6242ea
Sync up versions used in Maven integration tests
...
Fixes gh-1797
10 years ago
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
10 years ago
0a6c635f5e
Use getMaxActiveSessions() in Tomcat metrics
...
Replace the getMaxActive() call with getMaxActiveSessions().
Fixes gh-1902
10 years ago
4840d2c88c
Restore `spring.main.disable_banner=fase` support
...
Fixes gh-1918
10 years ago
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
10 years ago
345ced1675
Fixup version numbers following release
10 years ago
46b7738334
Next development version
10 years ago
bc76c87d44
Fix AnsiOutputApplicationListener package tangle
...
Relocate AnsiOutputApplicationListener to `context.embedded.config`
to fix package tangle.
See gh-1243
10 years ago
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
10 years ago
3e565bf421
Upgrade to Spring Integration 4.1.0.RELEASE
...
Fixes gh-1848
10 years ago
d76ff4b5c3
Merge pull request #1860 from joshiste/metrics/activeSessions
...
* metrics/activeSessions:
Add Tomcat public metrics for session usage
10 years ago
c2a3ccde3e
Add Tomcat public metrics for session usage
...
Fixes gh-1860
10 years ago
d8c5c3262a
Co-locate PublicMetrics auto-configuration
...
Fixes gh-1900
10 years ago
8cac63e239
Drop hibernate-jpa-2.0-api managed dependency
...
Fixes gh-1898
10 years ago
5834bcb59f
Revert "Upgrade to HikariCP 2.2.4"
...
This reverts commit 325d751225
10 years ago
f55705be1b
Upgrade maven-source-plugin to 2.4
...
Fixes gh-1872
10 years ago
4fa8a94dd4
Update to latest Maven plugins
...
Fixes gh-1899
10 years ago
3e02b81e98
Merge branch '1.1.x'
10 years ago
b947d6001d
Polish
10 years ago
52967017a0
Polish
10 years ago
7aaf7c65bd
Merge branch '1.1.x'
...
Conflicts:
spring-boot-dependencies/pom.xml
10 years ago
142c183b11
Fix the ordering of versions and dependencies in the dependencies pom
10 years ago
ff6a146c24
Merge branch '1.1.x'
10 years ago
a832944c05
Rename HtppClientOption to HttpClientOption
...
Fixes gh-1874
10 years ago
6770960737
Upgrade to Spring AMQP 1.4.0.RELEASE
...
Closes gh-1849
10 years ago
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
10 years ago
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
10 years ago
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
10 years ago
f9221e24ef
Polish method name in HibernateJpaAutoConfiguration
10 years ago
40d7927aad
Merge branch '1.1.x'
...
Conflicts:
spring-boot-dependencies/pom.xml
10 years ago
eecdb92728
Upgrade to Spring 4.0.8.RELEASE
...
Closes gh-1785
10 years ago
5194953030
Upgrade to Tomcat 8.0.15
...
Closes gh-1890
10 years ago
04f9872693
Upgrade to Jedis 2.5.2
...
Closes gh-1895
10 years ago
aefd53059a
Upgrade to SnakeYAML 1.14
...
Closes gh-1894
10 years ago
15991b2fd0
Upgrade to Mockito 1.10.8
...
Closes gh-1892
10 years ago
8b1905bb01
Upgrade to Hibernate Validator 5.1.3
...
Closes gh-1891
10 years ago
14b16712ed
Upgrade to Log4j 2 2.1
...
Closes gh-1889
10 years ago
a8fb5b10a7
Upgrade to Joda Time 2.5
...
Closes gh-1888
10 years ago
325d751225
Upgrade to HikariCP 2.2.4
...
Closes gh-1887
10 years ago
21354db647
Upgrade to H2 1.4.182
...
Closes gh-1886
10 years ago
0014f6dba7
Upgrade to Jackson 2.4.3
...
Closes gh-1885
10 years ago
7401e29f57
Upgrade to Spring Framework 4.1.2.RELEASE
...
Closes gh-1805
10 years ago
Stephane Nicoll
Dave Syer
Phillip Webb
Spring Buildmaster
Johannes Stelzer
Andy Wilkinson