Phillip Webb
e473364e4e
Merge branch '1.2.x'
2015-10-07 23:34:08 -07:00
Phillip Webb
6ab376e2e8
Reformat code use Eclipse Mars
2015-10-07 23:32:31 -07:00
Spring Buildmaster
9409c49c10
Next development version
2015-09-16 09:00:17 -07:00
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
2015-08-19 17:09:34 +02:00
Spring Buildmaster
7ce391db4f
Next development version
2015-07-01 22:48:01 -07:00
Phillip Webb
61fc4f3f12
Polish copyright headers
2015-06-23 10:22:14 -07:00
Phillip Webb
1ce617f1ae
Polish sample package names
2015-06-23 00:47:12 -07:00
Spring Buildmaster
5d81c87b43
Next Development Version
2015-06-04 00:49:11 -07:00
Spring Buildmaster
e03c11dda8
Next development version
2015-03-30 22:56:20 -07:00
Phillip Webb
a57a88f5cf
Move master to 1.3.0.BUILD-SNAPSHOT
2015-02-26 17:01:02 -08:00
Spring Buildmaster
8f0ad02237
Next development version
2015-02-26 15:26:53 -08:00
Spring Buildmaster
60725cd8bd
Next development version
2015-01-07 23:37:07 -08:00
Spring Buildmaster
1a788c1741
Next development version
2014-12-10 16:35:50 -08:00
Phillip Webb
d039f43107
Update samples to use @SpringBootApplication
...
Update the relevant samples to use the new @SpringBootApplication
annotation.
Closes gh-1842
2014-11-06 22:51:09 -08:00
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
2014-09-17 10:11:30 -07:00
Phillip Webb
62a5ce52d0
Backport Jetty/Tomcat SSL support
...
Fixes gh-1570
Cherry-picked from 0960908
and 258c6f1
2014-09-17 10:08:05 -07:00
Phillip Webb
da5c36c3a9
Polish
2014-07-29 13:06:47 -07:00
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
2014-07-24 15:10:09 +01:00