Commit Graph

23481 Commits

Author SHA1 Message Date
Dave Syer
5d797ce00f Add spring-boot-groovy-templates to list in docs 2014-05-28 16:48:18 +01:00
Dave Syer
dba9667e93 Add spring-boot-starter-groovy-templates
Fixes gh-974
2014-05-28 16:13:16 +01:00
Andy Wilkinson
ee12840bf7 Remove redundant Quartz exclusion
Quartz is an optional dependency of spring-context-support so there's
no need to exclude it

This is a baby-step towards using the Spring Framework bom (#955)
2014-05-28 15:37:12 +01:00
Phillip Webb
4417d05f3a Fixup incorrect parent version
Inadvertently missed during a 1.0.x merge.
2014-05-28 15:26:05 +01:00
Phillip Webb
99af5dbe23 Merge branch '1.0.x'
Conflicts:
	spring-boot-dependencies/pom.xml
2014-05-28 14:57:13 +01:00
Phillip Webb
30b181573e Fix Jasper on Tomcat 8
Refactor Jasper initialization code to call JasperInitializer during
server start.

Fixes gh-962
See gh-919
2014-05-28 14:52:21 +01:00
Phillip Webb
d848f03c43 Fix URL methods in JarURLConnection
Update JarURLConnection to return correct values from `getURL()`,
`getJarFileURL()` and `getEntryName()`.

Fixes gh-973
2014-05-28 14:41:15 +01:00
Phillip Webb
695571ad0b Unify versions in POMs started by the invoker
Unify the versions used in integration tests launched by the
maven-invoker-plugin. Allows for already cached local copies to be
used, hopefully speeding up the build.
2014-05-28 14:35:28 +01:00
Dave Syer
05d1a104e4 Add spring-test annotations to auto imports 2014-05-28 14:05:13 +01:00
Andy Wilkinson
27b31acd05 Provide dependency management for all of Spring Social Facebook 2014-05-28 13:54:26 +01:00
Andy Wilkinson
62382371c8 Merge branch 'social-auto-configuration'
Closes #941
2014-05-28 13:49:14 +01:00
Andy Wilkinson
195a3dd80d Use latest versions of Spring Social Facebook and LinkedIn 2014-05-28 13:39:26 +01:00
Andy Wilkinson
47e3a72390 Source code formatting 2014-05-28 13:38:03 +01:00
Craig Walls
5e1913576e Document Spring Social support 2014-05-28 13:30:41 +01:00
Craig Walls
f006b1231c Add Spring Social autoconfiguration 2014-05-28 13:30:41 +01:00
Andy Wilkinson
5807c8747e Upgrade to Groovy 2.3.2
Closes #971
2014-05-28 13:27:30 +01:00
Dave Syer
064998697d Ensure CLI adds @EnableAutoConfiguration in an appropriate place
Up to now we have been treating the *first* class to be compiled
as the "main" application and adding @EnableAutoConfiguration. This
isn't always appropriate (e.g. if it's a test case), so now we
look for an appropriate annotation before falling back to the old
behaviour.

In addition ensures classes with a field of type Reactor trigger
the reactor auto imports.

See gh-969
2014-05-28 13:00:31 +01:00
Dave Syer
84633dae00 Clarify in docs that @PropertySource is parsed late
Fixes gh-970
2014-05-28 12:20:28 +01:00
Dave Syer
d8eeba98e8 Add JAVA_OPTS advice to some docs 2014-05-28 12:11:07 +01:00
Dave Syer
3d9da64382 Add auto imports for integration testing
JUnit tests can now be @SpringApplicationConfiguration
and @IntegrationTest without any explicit imports. Also
makes @RunWith(SpringJUnit4ClassRunner) optional.

Fixes gh-969
2014-05-28 10:58:56 +01:00
Phillip Webb
3d76d9d73b Merge branch '1.0.x' 2014-05-28 10:23:33 +01:00
Phillip Webb
819b3b9761 Fix JasperInitializerLifecycleListener
Update JasperInitializerLifecycleListener to call JasperInitializer as
a ServletContainerInitializer (not a ServletContextInitializer).

Fixes gh-962
See gh-919
2014-05-28 10:21:10 +01:00
Dave Syer
f746cd5dc2 Upgrade to reactor 1.1.1 (fixes gh-845) 2014-05-28 09:38:38 +01:00
bjornerik
769ffe2834 Missing space destroys formatting in doc 2014-05-28 09:11:19 +01:00
Graeme Rocher
514dad6d22 allow subclassing of SpringApplicationBuilder 2014-05-28 09:09:03 +01:00
bjornerik
021f8eba03 Missing space destroys formatting in doc 2014-05-28 08:59:26 +01:00
Dave Syer
27aa644b52 Merge branch '1.0.x' 2014-05-28 08:41:50 +01:00
Dave Syer
f659a2e253 Use the ServerProperties to add prefixes to paths
when server.servletPath is set we need to add prefixes to
the security filter paths, and the /error path.

Conflicts:
	spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementSecurityAutoConfiguration.java
2014-05-28 08:41:22 +01:00
Phillip Webb
d4d3ffa93c Unify versions in POMs started by the invoker
Unify the versions used in integration tests launched by the
maven-invoker-plugin. Allows for already cached local copies to be
used, hopefully speeding up the build.
2014-05-27 21:25:34 +01:00
Phillip Webb
a91e85b848 Add local.management.port when on same port
Add a `local.management.port` alias when the management server is
running on the same port as the main server.

Fixes gh-952
2014-05-27 21:25:33 +01:00
Phillip Webb
91bd78047e Rename TraceWebFilterAutoConfigurationTest
Rename TraceWebFilterAutoConfigurationTest to
TraceWebFilterAutoConfigurationTests
2014-05-27 21:25:33 +01:00
Christian Dupuis
057e149846 Introduce Health.Builder to clean up HealthIndicator implementations 2014-05-27 20:44:54 +02:00
Phillip Webb
0ed4afd647 Fix a couple of velocity documentation issues
Fixes gh-961
2014-05-27 16:36:05 +01:00
Andy Wilkinson
96c92fd3b8 Merge branch '1.0.x' 2014-05-27 15:03:57 +01:00
Andy Wilkinson
362df05f65 Upgrade to Tomcat 7.0.54
Closes #960
2014-05-27 15:02:50 +01:00
Dave Syer
55f3ca0172 Remove misplaced re-ordering of default property source
The early re-ordering (and in particular the temporary remove of the
default properties) seemed to be a relic of an older approach that is
no longer there since we refactored to support more sane profile ordering.
Removing it doesn't seem to break anything and it allows you to specify
the config file locations in SpringApplicationBuilder.properties().

Fixes gh-953, fixes gh-920
2014-05-27 12:11:25 +01:00
Phillip Webb
3c1815ef43 Revert "Add spring-boot-versions to the full build"
This reverts commit 50ea717a0b.
2014-05-27 10:13:52 +01:00
Spring Buildmaster
b643600060 Next development version 2014-05-26 18:24:01 -07:00
Phillip Webb
50ea717a0b Add spring-boot-versions to the full build 2014-05-27 01:03:44 +01:00
Phillip Webb
9391b2c594 Add parent to prepare build
Hopefully allowing us to release
2014-05-27 00:11:47 +01:00
Phillip Webb
4fd4e2f7cb Downgrade to Reactor 1.1.0
Downgrade the Reactor version since we cannot depend on snapshots for
the M2 release.

See gh-845
2014-05-26 22:07:16 +01:00
Phillip Webb
6381fdcb49 Polish 2014-05-26 21:48:19 +01:00
Stephane Nicoll
96adb87bbd Fix typo
Relates to gh-667
2014-05-26 19:00:14 +02:00
Stephane Nicoll
a51739c0e1 Integration tests documentation
This commit clarifies how @IntegrationTest can be used as an
alternative of starting the (web) application prior to running the
tests suite.

Fixes gh-667
2014-05-26 15:40:38 +02:00
Dave Syer
b3022fd24a Use PropertiesConfigurationFactory to bind to SpringApplication
Then non-enumerable property sources will be accessible (like
SystemProperties in principle). This is the same way that other
beans are bound to the environment, but this one never got the
same treatment.

Fixes gh-951, gh-934
2014-05-26 10:40:24 +01:00
Dave Syer
43481725b9 Fix bug in DataSourceBuilder 2014-05-26 10:06:18 +01:00
Dave Syer
0938a874ad Ensure startup error is logged (and rethrown)
Fixes gh-948
2014-05-26 09:21:27 +01:00
Dave Syer
32295b9bdc Add options for Flyway to have its own DataSource
Either set flyway.[url,user,password] or create a DataSource
@Bean and mark it @FlywayDataSource.

Fixes gh-807
2014-05-26 08:55:28 +01:00
Roy Clarkson
9f52a0dbd7 Add Spring Mobile SitePreferenceAutoConfiguration
New feature in Spring Mobile (user preferences per site).

Fixes gh-946
2014-05-26 07:00:03 +01:00
Dave Syer
3d99a5dd98 Add test for inaccessible configuration class
See gh-948
2014-05-26 06:40:50 +01:00