- 17 Nov, 2014 8 commits
-
-
Phillip Webb authored
-
Andy Wilkinson authored
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
-
Andy Wilkinson authored
Closes gh-1897
-
Stephane Nicoll authored
Fixes gh-1829
-
Stephane Nicoll authored
Closes gh-1799
-
Stephane Nicoll authored
-
Stephane Nicoll authored
Closes gh-1904
-
Dave Syer authored
-
- 14 Nov, 2014 4 commits
-
-
Phillip Webb authored
-
Phillip Webb authored
Relax the servlet version check in Maven integration tests. See gh-1797
-
Phillip Webb authored
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
-
Phillip Webb authored
Fixes gh-1797
-
- 13 Nov, 2014 3 commits
-
-
Phillip Webb authored
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
-
Phillip Webb authored
Replace the getMaxActive() call with getMaxActiveSessions(). Fixes gh-1902
-
Phillip Webb authored
Fixes gh-1918
-
- 12 Nov, 2014 4 commits
-
-
Dave Syer authored
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
-
Phillip Webb authored
-
Spring Buildmaster authored
-
Phillip Webb authored
Relocate AnsiOutputApplicationListener to `context.embedded.config` to fix package tangle. See gh-1243
-
- 11 Nov, 2014 21 commits
-
-
Stephane Nicoll authored
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
-
Phillip Webb authored
Fixes gh-1848
-
Phillip Webb authored
* metrics/activeSessions: Add Tomcat public metrics for session usage
-
Johannes Stelzer authored
Fixes gh-1860
-
Phillip Webb authored
Fixes gh-1900
-
Phillip Webb authored
Fixes gh-1898
-
Phillip Webb authored
This reverts commit 325d7512. Conflicts: spring-boot-dependencies/pom.xml
-
Phillip Webb authored
Fixes gh-1872
-
Phillip Webb authored
Fixes gh-1899
-
Phillip Webb authored
-
Phillip Webb authored
-
Phillip Webb authored
-
Andy Wilkinson authored
Conflicts: spring-boot-dependencies/pom.xml
-
Andy Wilkinson authored
-
Andy Wilkinson authored
-
Phillip Webb authored
Fixes gh-1874
-
Andy Wilkinson authored
Closes gh-1849
-
Andy Wilkinson authored
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
-
Andy Wilkinson authored
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
-
Andy Wilkinson authored
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 (504de8a7) has been removed as part of this commit as it did not fix the problem. Closes gh-1864
-
Andy Wilkinson authored
-