Commit Graph

2309 Commits

Author SHA1 Message Date
Andy Wilkinson 2fec9c4790 Merge branch '1.0.x' 2014-05-30 15:33:47 +01:00
Andy Wilkinson 8f7c96e8f0 Honour ext and classifier on @Grabbed dependencies
We currently honour type, but ignore ext. Aether doesn't make a
distinction between the two so a Grab that specifies both type and ext
but with different values is considered to be an error.

Fixes #995
2014-05-30 15:12:09 +01:00
Dave Syer ef7390d3f0 Add extra @Conditional to be defensive in Social autoconfig
Older versions of Spring Social will not have the SocialConfigurerAdapter
so making social autoconfig conditional on that class makes sense (since it
all extends from it).

Fixes gh-986
2014-05-30 15:11:24 +01:00
Dave Syer 5557061ba1 Add social-* starters to dependency bom 2014-05-30 15:11:24 +01:00
Dave Syer 29cb21c322 Be lenient with prefix and add period if missing 2014-05-30 15:11:24 +01:00
Phillip Webb 3541495041 Drop unused objectstyle.org maven repo
Looks like a hang over from some older code.
2014-05-30 13:24:57 +01:00
Dave Syer f2e2df6759 Merge remote-tracking branch 'origin/1.0.x' 2014-05-30 13:15:49 +01:00
Dave Syer 2025dbad61 Switch basic auth back on in web-secure
Setting security.basic.enabled=false in a secure
app doesn't make a lot of sense. The sample has it
set to true now (the default) so users can login
(via the form that is sitting in front of the
basic auth filter chain).

Fixes gh-997
2014-05-30 13:10:39 +01:00
Dave Syer ed15f742fd Fix bug in GroovyTemplate convenience
It was ignoring the engine argument in the 3 arg version
of template().
2014-05-30 11:32:02 +01:00
Dave Syer b0579c1cf3 Ensure JPA vendor properties are period separated
If you bind to Map<String,Object> you get a nested Map instead
of period-separated keys. This change just makes JpaProperties
expose a Map<String,String> so the keys are sane.

Fixes gh-988
2014-05-30 10:25:01 +01:00
Dave Syer 2f653f0616 Add support for Spring HTTP in CLI tests 2014-05-30 10:18:11 +01:00
Andy Wilkinson 51518a2041 Upgrade to Spring Integration 4.0.2 and Spring AMQP 1.3.4
Closes #994
2014-05-30 09:23:53 +01:00
Andy Wilkinson bbf8ddc97c Provide dependency management for all of Spring Social 2014-05-30 09:06:49 +01:00
Dave Syer 1d7caf8e31 Man up and deal with CSRF in integration test
Fixes gh-979
2014-05-30 08:21:57 +01:00
Dave Syer ed0cfea6d2 Add SmartImportCustomizer
Only imports classes with names that are not already
imported into teh SourceUnit

Fixes gh-983
2014-05-30 06:44:38 +01:00
Phillip Webb 11a093bdc0 Polish 2014-05-30 00:31:11 +01:00
Dave Syer 48c1228253 Add support for groovy utilities in "spring jar"
Also an integration test that uses the (new)
@EnableGroovyTemplates to switch on the template conveniences
in a non-webapp

Fixes gh-990
2014-05-29 18:21:27 +01:00
Dave Syer 3c6dfb72c5 Add ExitStatus to Command.run()
The main difference for now is the removal of the --nohup
(slightly hacky) option in TestCommand. Now a TestCommand
can signal to its caller that it wants to be hung up.

Fixes gh-975
2014-05-29 13:58:12 +01:00
Dave Syer 5e3cc95ccf Adjust security.basic.enabled=false behaviour
Actually the web-secure sample is misusing
security.basic.enabled=false (IMO) - it should be a flag
to say that you want to temporarily disable the basic security
fallback on application endpoins, not  way to disable all
security autoconfiguration.

Added test case to web-secure sample to ensure a user
can log in.

Fixes gh-979
2014-05-29 13:25:01 +01:00
Andy Wilkinson b1969f5095 Correct the name and description of the Groovy Templates starter 2014-05-29 11:02:07 +01:00
Phillip Webb bdcb9407eb Restore commons-logging dependency for spring-boot
Restore the dependency on commons-logging (transitively via spring-core)
for spring-boot. This means that we are not tied directly to SLF4J, but
it is still an option that can be used via `jcl-over-slf4j`.

The `spring-boot-starter-parent` continues to replace `commons-logging`
with `jcl-over-slf4j`.

Fixes gh-981
2014-05-28 23:03:26 +01:00
Phillip Webb 5a5a7be477 Polish 2014-05-28 22:05:23 +01:00
Andy Wilkinson 7a8be3d600 Use Spring Framework bom and fully exclude commons-logging
Closes #955
Closes #978
2014-05-28 20:12:29 +01:00
Dave Syer 6fbafc3ca4 Add RUNTME scope to transitive dependencies in CLI
Fixes gh-977
2014-05-28 18:18:15 +01:00
Dave Syer e7aa192d82 Add ConfigurationProperties to autoconfigs 2014-05-28 17:36:55 +01:00
Dave Syer 8436627598 Allow tests to System.exit() by default
Otherwise the ApplicationContext stays alive and if it's a
server app the JVM does not exit at the end of "spring test".
User can override with "spring test foo.groovy --nohup"
(which we have to do in our unit tests).
2014-05-28 17:36:55 +01:00
Phillip Webb 7fd26a556d Fix social property binding
Update Spring Social auto-configurations to read properties using
the `dashed` notation and with the appropriate prefixes. This allows
properties to be specified in any of the relaxed forms.

Also minor refactor to extract common logic to a new
SocialAutoConfigurerAdapter base class.

See gh-941
2014-05-28 17:36:07 +01:00
Phillip Webb 5df52d3e94 Polish 2014-05-28 17:36:07 +01:00
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