Phillip Webb
1e4d974ec0
Merge remote-tracking branch 'local12x/1.2.x'
2015-10-19 12:56:55 -07:00
Phillip Webb
a79131f8d2
Organize imports with new settings
...
See gh-4234
2015-10-19 12:55:44 -07:00
Spring Buildmaster
2b38a861e3
Next Development Version
2015-10-16 05:57:24 -07:00
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
Phillip Webb
d22d0683b2
Fixup build following release
2015-09-16 12:03:23 -04:00
Spring Buildmaster
9409c49c10
Next development version
2015-09-16 09:00:17 -07:00
Phillip Webb
d09805fd75
Polish license headers
2015-09-08 16:05:05 -07:00
Phillip Webb
2615990ffb
Organize imports
2015-09-08 14:40:35 -07:00
Stephane Nicoll
1dfa1fc3a5
Polish
...
Closes gh-3800
2015-08-22 08:41:40 +02:00
Huang YunKun
3b81152ddc
Fix springloaded version
...
Closes gh-3807
2015-08-22 08:41:30 +02: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
Stephane Nicoll
7c3cdead28
Remove unnecessary mainClassName
...
Since each sample has (supposedly) only one application class and not
a lot of the code, the `mainClassName` attribute in the gradle build is
not really useful and can lead to inconsistency if the application class
is moved.
See gh-3588
2015-07-23 17:36:41 +02:00
Justin Garrick
8960b88020
Fix package name of web-ui sample
...
Closes gh-3588
2015-07-23 17:26:48 +02:00
Phillip Webb
43dc0c64c2
Fixup version numbers following release
2015-07-01 23:22:34 -07: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
Stephane Nicoll
b847b6fa4b
Fixup version numbers following release
2015-06-04 10:34:44 +02:00
Spring Buildmaster
5d81c87b43
Next Development Version
2015-06-04 00:49:11 -07:00
Andy Wilkinson
4452bb1873
Revert "Upgrade Gradle plugin’s ID so it’s suitable for the Plugin Portal"
...
This reverts commit b1c0a7cda486e4f745b4233715efb8c0dc2814df.
The plugin publishing process has moved to a new plugin-based approach
that brings with it some significant limitations:
- There's no staging to allow the promotion of good release builds
- There's no easy way to upload an existing artifact
- There's no control over the published pom.
The risk brought by these limitations, particularly the first, are
too great so we will no be publishing the Boot plugin to the Portal
until they're resolved.
Changing the plugin's ID was a breaking change that would require
users to do some work when they upgrade to Boot 1.3. The ID of the
plugin was changed purely so that it met the Portal's requirements.
Given that the plugin will not be published to the Portal for the
foreseaable future there's no need for us to inflict a breaking change
on people when there will be no benefit.
See gh-1567
2015-04-21 12:37:12 +01:00
Phillip Webb
42e69359a8
Fixup version numbers following release
2015-03-30 23:25:03 -07:00
Spring Buildmaster
e03c11dda8
Next development version
2015-03-30 22:56:20 -07:00
Andy Wilkinson
b1c0a7cda4
Upgrade Gradle plugin’s ID so it’s suitable for the Plugin Portal
...
Gradle’s plugin portal requires each plugin’s ID to be in a namespace.
Our existing ID, spring-boot, does not meet this requirement. This
commit changes the plugin’s ID to org.springframework.boot.spring-boot.
Note that, as is recommended [1], the plugin’s ID does not include
“gradle”.
See gh-1567
[1] http://plugins.gradle.org/submit
2015-03-19 14:25:07 +00:00
Phillip Webb
a57a88f5cf
Move master to 1.3.0.BUILD-SNAPSHOT
2015-02-26 17:01:02 -08:00
Phillip Webb
8ce39bda88
Fixup version numbers following release
2015-02-26 15:59:57 -08:00
Spring Buildmaster
8f0ad02237
Next development version
2015-02-26 15:26:53 -08:00
Stephane Nicoll
dfdb801533
Fix use of deprecated API.
2015-02-02 11:34:49 +01:00
Phillip Webb
9dd4d43cec
Fixup version numbers following release
2015-01-08 00:19:04 -08:00
Spring Buildmaster
60725cd8bd
Next development version
2015-01-07 23:37:07 -08:00
Phillip Webb
43fb5b63a8
Fixup version numbers following release
2014-12-10 19:49:23 -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
a3527521a2
Also resolve favicon.ico from resource folders
...
Update FaviconConfiguration to allow favicon.ico files to be resolved
from static resource folders (/META-INF/resources, /resources, /static,
/public) in addition to the root classpath.
Fixes gh-1656
2014-10-10 13:09:30 -07:00
Andy Wilkinson
8e000f3da1
Merge branch '1.1.x'
2014-10-08 15:13:52 +01:00
Andy Wilkinson
b85926e6f0
Fix the rest of the typo InMemoryRepository's name
2014-10-08 15:13:25 +01:00
Andy Wilkinson
b8759ebf69
Merge branch '1.1.x'
2014-10-08 14:48:26 +01:00
matzschmanski
02fef4295d
Fix typo: InMemoryMessageRespository -> InMemoryMessageRepository
...
Closes gh-1671
2014-10-08 14:48:00 +01:00
Phillip Webb
4f9258a345
Fixup version numbers following release
2014-09-25 21:37:40 -07:00
Spring Buildmaster
edb4b7ed7d
Next development version
2014-09-25 21:02:37 -07:00
Phillip Webb
338288205b
Fixup version numbers following release
2014-09-04 15:40:55 -07:00
Spring Buildmaster
d63e4b4329
Next development version
2014-09-04 12:15:18 -07:00
Phillip Webb
6b083d7e0b
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/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/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/pom.xml
spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/pom.xml
spring-boot-samples/spring-boot-sample-tomcat/pom.xml
spring-boot-samples/spring-boot-sample-tomcat8-jsp/pom.xml
spring-boot-samples/spring-boot-sample-traditional/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/pom.xml
spring-boot-samples/spring-boot-sample-web-static/pom.xml
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
2014-08-07 13:16:27 -07:00
Phillip Webb
cac3865ffa
Fixup version numbers following release
2014-08-07 13:11:16 -07:00
Spring Buildmaster
74d0c5185a
Next development version
2014-08-07 11:59:17 -07:00
Stephane Nicoll
249e09d9bc
Switch master to 1.2.0.BUILD-SNAPSHOT
2014-07-11 10:44:05 +02:00
Phillip Webb
3c7d825658
Fixup version numbers following release
2014-07-08 03:07:03 -07:00
Spring Buildmaster
40327e1ae6
Next development version
2014-07-08 02:33:36 -07:00
Phillip Webb
fa88c481a5
Remote trailing whitespace
2014-07-02 15:17:14 -07:00
Phillip Webb
cc61d92b88
Fixup build following release
2014-06-27 07:00:57 -07:00
