Commit Graph

3898 Commits (9dd4d43cece1865faa181286108117b150ca15d2)
 

Author SHA1 Message Date
Stephane Nicoll 16164b30a9 Do not exclude Flyway's MigrationVersion
flyway.init and flyway.target are two options that are missing from the
meta-data following the change in f0bc3c0. It turns out that both these
properties have an additional setter taking a String so they shouldn't be
excluded after all

Closes gh-2088
10 years ago
Stephane Nicoll 1da0deeef6 Add missing keys in appendix 10 years ago
Stephane Nicoll 4164cad077 Add meta-data for banner keys
Fixes gh-2093
10 years ago
Stephane Nicoll d59718447b Upgrade to Spring Framework 4.1.3
Closes gh-2038
10 years ago
Phillip Webb 9c66624deb Polish 10 years ago
Phillip Webb 7dbe0474b9 Merge branch '1.1.x' 10 years ago
Phillip Webb 1c031abdd2 Fix session timeout default value
Update DEFAULT_SESSION_TIMEOUT to use TimeUnit.MINUTES.toSeconds(30)
rather than TimeUnit.SECONDS.toMinutes(30) which would always return
0.

See gh-2084
(cherry picked from commit b33bbd56)
10 years ago
Phillip Webb 2f03351cf6 Fix auto-configuration order for Spring Data Rest
Update Rest, Hypermedia and HttpMessageConverter auto-configuration to
ensure beans are created in the correct order.

Prior to this commit the MappingJackson2HttpMessageConverter bean would
not be created because Spring Data Rest's TypeConstrained versions had
already been registered.

Fixes gh-1729
10 years ago
Phillip Webb b33bbd56e7 Fix session timeout default value
Update DEFAULT_SESSION_TIMEOUT to use TimeUnit.MINUTES.toSeconds(30)
rather than TimeUnit.SECONDS.toMinutes(30) which would always return
0.

See gh-2084
10 years ago
Phillip Webb 4fc8a183f2 Add Jersey Jackson support
Fixes gh-2091
10 years ago
Phillip Webb e6d46f5711 Revert "Defer WebApplicationContext initialization"
This reverts commit 17631486f2.
10 years ago
Phillip Webb 17631486f2 Defer WebApplicationContext initialization
Update SpringBootServletInitializer so that the WebApplicationContext is
not initialized until ServletContextListener.contextInitialized() is
called. This makes it easier to subclass SpringBootServletInitializer
to add additional listeners to be called in a specific order.

Fixes gh-2070
10 years ago
Stephane Nicoll d33c0ebf8f Fix data type of telnet and ssh ports
Define shell.ssh.port and shell.telnet.port as integer properties
so that the generated meta-data exposes the proper type.

Fixes gh-2076
10 years ago
Sebastien Deleuze 27d9d7fd55 Add support for autowired Jackson handlers
Inject the ApplicationContext into Jackson2ObjectMapperBuilder to allow
Jackson handlers to be autowired. See SPR-10768.

Fixes gh-2081
10 years ago
Phillip Webb 4b7c6f61b4 Polish 10 years ago
Phillip Webb f0bc3c08e1 Add additional ElementExcludeFilter items
Fixes gh-2088
10 years ago
Phillip Webb 2b91471286 Add formatted version numbers for banner expansion
Add `application.formatted-version` and `spring-boot.formatted-version`
properties for use in banner.txt files. The `application.version` and
`spring-boot.version` properties now return a simple version number
without any formatting.

Fixes gh-2090
10 years ago
Phillip Webb 4bfabfcf29 Ensure Undertow session timeout is set correctly
Assume that Undertow uses -1 for "no expiry".

See gh-2084
10 years ago
Phillip Webb 083f9757cd Merge branch '1.1.x'
Conflicts:
	spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java
10 years ago
Phillip Webb c23a764a1c Set the default session timeout to 30 mins
Update AbstractConfigurableEmbeddedServletContainer to set the default
session timeout to 30 minutes. Also correct Javadoc to specify that
the default is '30 minutes'.

Fixes gh-2084
10 years ago
Phillip Webb 22e8478aa3 Cross-reference "Create a deployable war" how-to
Add a tip for both the Maven and Gradle "Packaging executable jar and
war files" section referring to the how-to.

Fixes gh-2086
10 years ago
Phillip Webb 7ae75c2707 Merge branch '1.1.x' 10 years ago
Phillip Webb fcad7c4fde Guard for null BeanFactory in @ConditionalOnBean
See gh-2080
10 years ago
Phillip Webb 43e0cae0fa Merge branch '1.1.x' 10 years ago
Phillip Webb d3ccdc6319 Polish 10 years ago
Phillip Webb fc746b802a Polish 10 years ago
Phillip Webb 191204fadb Don't resolve ConfigurationProperties placeholders
Revert commit 3ad43e0d44 to give us
a little more time to consider how this will impact tooling.
10 years ago
Phillip Webb 6e0f1f3d98 Use wesocket dependency from Undertow starter 10 years ago
Stephane Nicoll f40f17a758 Add missing description 10 years ago
Dave Syer 3ad43e0d44 Resolve placeholders in @ConfigurationProperties prefix 10 years ago
Dave Syer 79aa6e7713 Add undertow websockets dependency 10 years ago
Stephane Nicoll 826150ac41 Merge branch '1.1.x' 10 years ago
Stephane Nicoll 9b598b49c2 Fix JMS support in the CLI
Partly back port changes from affb202e and 85c95744f to fix the usage
of JMS in the CLI. Restore the integration test using HornetQ and fix the
coordinates of the JMS API.

Fixes gh-2075
10 years ago
Phillip Webb b651090fcd Document how-to for Weblogic deployment
Fixes gh-2078
10 years ago
Phillip Webb 1ca73a9f46 Improve exception message for Weblogic
Ensure that a sensible exception message is thrown if the user happens
to include the logback jar in their deployment.

Fixes gh-2077
10 years ago
Phillip Webb c8b9da0492 Ensure DeploymentInfo contextPath is never "/"
Undertow 1.1 expects that DeploymentInfo.contextPath is set to "/" for
a root context. If it is left as "" the session cookie path is not
correctly set. See UNDERTOW-350 for background.

This commit simplifies the original work-around committed in 78c22813d.

Fixes gh-2065
10 years ago
Phillip Webb 90e9187b80 Polish deployment tests 10 years ago
Phillip Webb e0ba7a4dcb Update WildFly config to also set AJP port
See gh-1736
10 years ago
Phillip Webb 52fd5dde58 Update cargo configuration to also set AJP ports
Fixes gh-1736
10 years ago
Phillip Webb 44dde9fc12 Add deployment integration tests
Add deployment tests for Tomcat, TomEE and WildFly to ensure that
a basic Spring Boot application can be deployed to a traditional
Application server.

Since the deployment tests can be quite slow, they currently only
run in the "full" build profile.

Fixes gh-1736
10 years ago
Phillip Webb 379857a111 Detect SpringBootServletInitializer @Configuration
Update SpringBootServletInitializer to automatically add itself as a
SpringApplication source if it is annotated with @Configuration.

Also throw a more meaningful exception if no sources have been
configured.

Fixes gh-2073
10 years ago
Phillip Webb 1f66277fd6 Fix JmsProperties bean not found exception
Update JndiConnectionFactoryAutoConfiguration to ensure that the
JmsProperties bean is created. Prior to this commit deployment to
a WildFly would fail with a NoSuchBeanDefinitionException.

Fixes gh-2072
10 years ago
Phillip Webb c332e5834a Add managed jackson-datatype-jdk8 dependency
Fixes gh-1750
10 years ago
Phillip Webb f3a0cebaaf Upgrade to JUnit 4.12
Closes gh-2061
10 years ago
Phillip Webb 88f64c7ad3 Upgrade to Jackson 2.4.4
Closes gh-2062
10 years ago
Phillip Webb b253cbec2d Polish 10 years ago
Phillip Webb af643e2f54 Merge branch '1.1.x'
Conflicts:
	spring-boot/src/main/java/org/springframework/boot/logging/LoggingApplicationListener.java
10 years ago
Phillip Webb c9a3919af9 Add LoggingApplicationListener constants
Extract some of the common property keys as constants.

Fixes gh-2068
10 years ago
kakawait f65c7dbeb3 Update 'flyway.locations' appendix documentation
Replace `classpath:db/migrations` with `classpath:db/migrations`.

Fixes gh-2063
10 years ago
Phillip Webb 78c22813d3 Ensure undertow session cookie path is correct
Explicitly set a ServletSessionConfig when the context path is "". This
is a workaround for UNDERTOW-350 to ensure that the session cookie path
is correctly set.

Fixes gh-2065
10 years ago