Andy Wilkinson
8ee8c9fe90
Merge branch '1.2.x'
9 years ago
Andy Wilkinson
d33d068fae
Upgrade to Tomcat 8.0.28 and test support for SSL config from classpath
...
Prior to 8.0.28 Tomcat required the key store and trust store (if any)
to be available directly on the filesystem, i.e. classpath: resources
would not work. Tomcat 8.0.28 removed this limitation.
This commit updates to Tomcat 8.0.28, updates the tests to verify
the new Tomcat capability and removes the obsolete documentation of
the restriction.
Closes gh-4048
9 years ago
Phillip Webb
e473364e4e
Merge branch '1.2.x'
9 years ago
Phillip Webb
6ab376e2e8
Reformat code use Eclipse Mars
9 years ago
Spring Buildmaster
9409c49c10
Next development version
9 years ago
Stephane Nicoll
7c0c953f81
Add value alias for SpringApplicationConfiguration
...
Given that Spring Boot uses java config accross the board, a new `value`
attribute is now aliased to the existing `classes` attribute such that
one could write the following:
@SpringApplicationConfiguration(MyConfig.class)
public class MyTest {}
Closes gh-3635
9 years ago
Spring Buildmaster
7ce391db4f
Next development version
10 years ago
Phillip Webb
61fc4f3f12
Polish copyright headers
10 years ago
Phillip Webb
1ce617f1ae
Polish sample package names
10 years ago
Spring Buildmaster
5d81c87b43
Next Development Version
10 years ago
Spring Buildmaster
e03c11dda8
Next development version
10 years ago
Phillip Webb
a57a88f5cf
Move master to 1.3.0.BUILD-SNAPSHOT
10 years ago
Spring Buildmaster
8f0ad02237
Next development version
10 years ago
Spring Buildmaster
60725cd8bd
Next development version
10 years ago
Spring Buildmaster
1a788c1741
Next development version
10 years ago
Phillip Webb
d039f43107
Update samples to use @SpringBootApplication
...
Update the relevant samples to use the new @SpringBootApplication
annotation.
Closes gh-1842
10 years ago
Phillip Webb
4f610fa5a1
Merge branch '1.1.x'
...
Conflicts:
spring-boot-samples/spring-boot-sample-tomcat-ssl/pom.xml
spring-boot-samples/spring-boot-sample-tomcat-ssl/src/test/java/sample/tomcat/SampleTomcatSslApplicationTests.java
spring-boot/src/main/java/org/springframework/boot/context/embedded/ConfigurableEmbeddedServletContainer.java
spring-boot/src/main/java/org/springframework/boot/context/embedded/Ssl.java
10 years ago
Phillip Webb
62a5ce52d0
Backport Jetty/Tomcat SSL support
...
Fixes gh-1570
Cherry-picked from 0960908
and 258c6f1
10 years ago
Phillip Webb
da5c36c3a9
Polish
10 years ago
Andy Wilkinson
0960908bd7
Add support for configuring SSL declaratively
...
Both Tomcat and Jetty can now be configured to use SSL via the
environment (typically application.properties or application.yml)
Closes #1084
10 years ago