54625cc2a0
Make LaunchedURLClassLoader lock provider static
...
Fixes gh-1380
2014-08-18 20:08:03 -07:00
fc7823bc42
Merge branch '1.1.x'
2014-08-18 17:55:21 -07:00
7685d18ed8
Add clean support for samples
...
Use ant-run to clean spring-boot-samples when `clean` is invoked on
the main project.
2014-08-18 17:29:50 -07:00
5c34b07742
Fix DefaultCounterService.reset
...
Fix DefaultCounterService.reset to call the reset method of the
underlying MetricWriter.
Fixes gh-1391
2014-08-18 17:28:23 -07:00
baec9f50a8
Merge branch '1.1.x'
2014-08-18 14:39:32 -07:00
2188e3553c
Prevent tests from picking up empty starter dirs
...
Update StarterDependenciesIntegrationTests to only consider starter
folders that contain POM files.
Fixes gh-1395
2014-08-18 14:38:02 -07:00
83bd36d8e0
Merge branch '1.1.x'
...
Conflicts:
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaProperties.java
2014-08-18 13:02:44 -07:00
eb721b1e9f
Find 'messages*.properties' in all jar URLs
...
Update the the PathMatchingResourcePatternResolver used in the
MessageSourceAutoConfiguration condition to deal with the fact
that `classpath*:` patterns do not work with URLClassLoaders when
the pattern doesn't include a folder.
The ExtendedPathMatchingResourcePatternResolver works by searching
all classpath URLs when the `findAllClassPathResources` method is
called with an empty location.
Fixes gh-1378
2014-08-18 12:58:41 -07:00
1fe1399959
Add install command
...
Fixes gh-1393
2014-08-18 18:01:22 +01:00
6e6bc25c44
Polish
2014-08-18 09:57:03 -07:00
457cea60e6
Add ServiceLoader for AST transformations
...
The loading is via a marker interface SpringBootAstTransformation
to avoid clashing with other services registered as org.groovy.*
Fixes gh-1392
2014-08-18 16:15:06 +01:00
91d3edc220
Tidy imports
2014-08-18 14:57:28 +01:00
ecdd291254
Upgrade to Joda Time 2.4
...
Closes #1388
2014-08-18 10:14:03 +01:00
5338dc2ade
Upgrade to Jackson 2.4.2
...
Closes #1387
2014-08-18 09:56:56 +01:00
b3ba86390f
Relax EntityManagerFactoryBuilder Map generic
...
Relax the generic signature on EntityManagerFactoryBuilder.properties
so that any object type can be added.
Fixed gh-1376
2014-08-15 11:49:25 -07:00
ebd0d265f8
Polish
2014-08-15 11:49:13 -07:00
8476a79dd2
Add support for RelaxedDataBinder aliases
...
Update RelaxedDataBinder to support property aliases and change
DataSourceBuilder to use them.
Fixes gh-1384
2014-08-15 10:46:06 -07:00
a6e6e1e07a
Rename Banner.write method to printBanner
...
Rename Banner.write to Banner.printBanner for consistency with the
now deprecated SpringApplication.printBanner method.
2014-08-15 10:14:03 -07:00
d0231d0dbe
Merge pull request #1363 from Stummi/master
...
* pull1363:
Support programmatic banners via setter
2014-08-15 10:11:22 -07:00
36ab01c048
Support programmatic banners via setter
...
Introduce an easy way for the user to provide an custom programmatic
banner to the Application as alternative to the static banner.txt file,
without the need to override SpringApplication class.
Fixes gh-1363
2014-08-15 10:08:31 -07:00
12fb834814
Attempt to fix travis
2014-08-15 00:01:18 -07:00
c47024ce23
Attempt to fix travis
2014-08-14 23:35:38 -07:00
7643c29961
Attempt to fix travis
2014-08-14 23:08:53 -07:00
f14a27c692
Merge pull request #1274 from raphinesse/feature-configurable-ansioutput
...
* feature-configurable-ansioutput:
Allow ANSI output to be configured by properties
2014-08-14 23:04:45 -07:00
a35a79e1a3
Allow ANSI output to be configured by properties
...
Add AnsiOutputApplicationListener which configures AnsiOutput.enabled
based on a `spring.output.ansi.enabled` property.
Fixes gh-1243
2014-08-14 23:01:38 -07:00
45c8eca4f2
Add @ConditionalOnMissingBean(MongoDbFactory)
...
Update MongoAutoConfiguration to be conditional on a missing
MongoDbFactory bean. The assumption is that if the user has declared
a MongoDbFactory they will either use it directly, or they will also
register a Mongo bean.
If the MongoDbFactory class cannot be found the existing Mongo
auto-configuration still applies. This ensures that users that do
not have Spring Data can still access a Mongo bean.
Fixes gh-1341
2014-08-14 21:41:10 -07:00
e0c3dd79f9
Add String type attribute to OnBean conditions
...
Fixes gh-1381
2014-08-14 21:02:35 -07:00
a9bd720fb3
Merge pull request #1324 from ramnivas/spring-cloud-autoconfig
...
* spring-cloud-autoconfig:
Add auto-configuration for Spring Cloud
2014-08-14 20:48:30 -07:00
912d5cf40b
Add auto-configuration for Spring Cloud
...
Enable if all of the following are true:
- spring-cloud is on the classpath
- There is no Cloud bean present
(usually done by extending AbstractCloudConfig)
- The "cloud" profile is active
Fixes gh-1302
Autoconfigure spring-cloud
2014-08-14 20:47:59 -07:00
21995cc85d
Polish
2014-08-14 20:47:39 -07:00
330be01984
Merge branch '1.1.x'
...
Conflicts:
spring-boot-docs/src/main/asciidoc/production-ready-features.adoc
2014-08-13 08:23:43 -07:00
481cf775d8
Refer explicitly to double asterix in metrics docs
...
Fixes gh-1358
2014-08-13 08:21:22 -07:00
e63bad3c4e
Merge branch '1.1.x'
2014-08-13 08:19:33 -07:00
0a3a00e9e5
Fix property keys in shell docs (consistent with appendix)
...
Fixes gh-1371
2014-08-13 08:18:42 -07:00
c556175381
Merge branch '1.1.x'
2014-08-13 08:15:59 -07:00
2fae4afe95
Ensure status in ErrorPageFilter defaults to 200
...
Fixes gh-1369. Note that this is caused by the ErrorPageFilter, so
only a problem when deployed as a WAR.
2014-08-13 08:14:09 -07:00
6634af6a25
Fix broken parent POM version
...
Update the parent POM version in spring-boot-sample-web-secure-custom
2014-08-12 13:45:19 -07:00
300910f7d5
Merge branch '1.1.x'
2014-08-11 17:43:14 -07:00
0cf1c6f0e5
Refactor AuthenticationManagerConfiguration to make sure it works
...
if user also adds @EnableWebMvcSecurity. The problem is that the ordering
of the init() and configure() methods in the Spring Security configurers
can force things to happen too early unless we are careful. It's still a bit
twitchy I would say, but this relatively small change seems to fix the GS guide
and not break any existing tests.
I added a sample which mimic ths GS guide so we get an integration test that
executes the new code paths.
Fixes gh-1364
2014-08-11 17:42:30 -07:00
029b9dba23
Merge remote-tracking branch 'springsource/1.1.x'
...
Conflicts:
spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessorTests.java
2014-08-11 16:13:45 -07:00
9a7a4a46c9
Don't cause early FactoryBean instantiation
...
Update ConfigurationPropertiesBindingPostProcessor to use
`getBeansOfType` with `allowEagerInit=false` rather than `getBean`.
This prevents FactoryBeans from being instantiated early when their
type is not known.
Fixed gh-1365
2014-08-11 16:02:21 -07:00
acb621e84f
Polish
2014-08-11 09:04:55 -07:00
7d0a3ddcce
Rename VanillaHealthIndicator to Application...
...
Rename `VanillaHealthIndicator` to `ApplicationHealthIndicator` and
changed the exposed bean name from `statusHealthIndicator` to
`applicationHealthIndicator`.
This provides less confusing JSON output:
{"status":"UP","application":{"status":"UP"}}
vs:
{"status":"UP","status":{"status":"UP"}}
Fixes gh-1291
2014-08-11 09:04:01 -07:00
d089685935
Add auto configuration for Spring 4.1 JMS features
...
This commit adds two additional auto-configuration items that are new
in Spring 4.1
* A JmsMessagingTemplate is automatically created if none is present
* A default JmsListenerContainerFactory is automatically created if
@EnableJms has been triggered and no default has been set manually
Fixes gh-1298
2014-08-11 11:52:24 +02:00
6217c1b095
polishing
2014-08-08 18:02:35 +02:00
063f67da5f
Maintain same structure in /health output
...
JSON output of /health now has the same structure for 1 or more HealthIndicators. This makes it easier to consume the response from scripts or apps
fixes #1291
2014-08-08 14:59:04 +02:00
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
cac3865ffa
Fixup version numbers following release
2014-08-07 13:11:16 -07:00
80ee963cc5
Merge branch '1.1.x'
2014-08-07 13:04:29 -07:00
74d0c5185a
Next development version
2014-08-07 11:59:17 -07:00
Phillip Webb
Phillip Webb
Dave Syer
Andy Wilkinson
Michael Stummvoll
Raphael von der Grün
Ramnivas Laddad
Stephane Nicoll
Christian Dupuis
Spring Buildmaster