Commit Graph

54161 Commits

Author SHA1 Message Date
Phillip Webb c861f24ba3 Switch mergeDependencies to use a set. 2014-06-11 10:04:06 -07:00
Dave Syer d36f9ce8e0 Add tests for switching message sources in tests
See gh-1075
2014-06-11 17:21:05 +01:00
Dave Syer 8d6f003e9a Defensive null check in case Hibernate autoconfig is off
If the Hibernate autoconfig is not used to create an EntityManager
then I suppose it's possible that the JpaProperties might be null
when everything else is ready for the event to be published.

There's no test case because I think it's a corner case.

Fxies gh-1075
2014-06-11 16:54:11 +01:00
Dave Syer 32a220da8f Test for message properties 2014-06-11 16:39:56 +01:00
Andy Wilkinson f5f3903538 Resolve versionManagement configuration lazily and preserve exclusions
Previously, the versionManagement configuration was resolved as part of
the Boot Gradle plugin being applied. This meant that no dependencies
could be added to it and attempting to do so would result in a failure:
“You can't change a configuration which is not in unresolved state”.
This commit updates ApplyExcludeRules to wrap its processing in a
before resolve action. This defers the resolution of the
versionManagement configuration until one of the project’s other
configurations is being resolved. Fixes #1077

In addition to the above, the transitive exclusions that the Gradle
plugin provides were being lost if custom version management provided
a version for the same dependency. This commit updates
AbstractDependencies to preserve the exclusions from an existing
dependency declaration while using the version from the newer
dependency. This ensures that the exclusions remain while allowing
versions to be overridden. Fixes #1079
2014-06-11 15:51:39 +01:00
Phillip Webb 9e93719922 Fixup version numbers following release 2014-06-10 14:20:41 -07:00
Spring Buildmaster 05ed7b3bcd Next development version 2014-06-10 12:40:35 -07:00
Andy Wilkinson 5a4ac124ba Remove superfluous starter dependencies
Remove superfluous dependencies from spring-boot-starter-tomcat and
spring-boot-starter-jetty which caused gradle based builds to put
too many libraries in `/lib-provided` when building a war.

Fixes gh-1064
2014-06-10 10:51:19 -07:00
Phillip Webb 3341a5db2b Deprecate @ConditionalOnMissingClass.value
Fixes gh-1069
2014-06-10 10:20:50 -07:00
Dave Syer e8fcb0c875 Use classname instead of value in @ConditionalOnMissingClass
See gh-1065
2014-06-10 17:38:15 +01:00
Phillip Webb 3007a777d0 Roll back to 1.1.0.BUILD-SNAPSHOT 2014-06-10 09:00:08 -07:00
Dave Syer 36130b27e1 Support for Jmx (and Integration) autoconfig in parent contexts
When there are parent contexts we already had a strategy for registering
the actuator endpoints, but not the regular JMX or Integration MBeans.
This chnage makes the autoconfigs for JMX aware of the parent context.

Also adds a sample with a parent context.

See gh-847
2014-06-10 15:12:30 +01:00
Phillip Webb 5adbf32c18 Fixup version numbers following release 2014-06-09 22:13:54 -07:00
Spring Buildmaster c650f2391e Next development version 2014-06-09 21:55:19 -07:00
Phillip Webb cede104702 Add spring-boot-dependencies to prepare phase 2014-06-09 21:32:44 -07:00
Phillip Webb 6a55c7af2e Add additional modules to prepare profile
Require for the initial build of a new version.
2014-06-09 20:50:56 -07:00
Phillip Webb 25a2b8e388 Improve formatting of generated doc tables 2014-06-09 20:03:17 -07:00
Phillip Webb aaa7e7d37e Update CONTRIBUTING full build instructions 2014-06-09 20:01:53 -07:00
Phillip Webb ef395638fc Document gradle plugin exclude rules
Fixes gh-1053
2014-06-09 18:07:47 -07:00
Phillip Webb 75a202e389 Add Spring Loaded, Gradle, IntelliJ "How-To"
Fixes gh-823
2014-06-09 17:27:33 -07:00
Phillip Webb c2c31cdb3c Add upgrade instructions to the reference docs
Add a section with a link to the project wiki.

See gh-731
2014-06-09 16:53:17 -07:00
Phillip Webb 9a5d828f52 Polish docbook formatting 2014-06-09 16:34:54 -07:00
Phillip Webb f619102cd9 Fix broken links in reference docs 2014-06-09 16:20:12 -07:00
Phillip Webb 30f57bab23 Fix broken links in reference docs 2014-06-09 15:35:53 -07:00
Phillip Webb f0c0f00089 Polish 2014-06-09 15:20:37 -07:00
Andy Wilkinson 3975f8c931 Remove extra close table markup 2014-06-09 21:49:56 +01:00
Andy Wilkinson 02de6e3531 Remove signal handling race condition from RunProcess
Fixes #1061
2014-06-09 21:29:33 +01:00
Andy Wilkinson 0b7836b447 Merge in starter and sample for Spring Web Services
Closes #1055
2014-06-09 21:17:32 +01:00
Andy Wilkinson b585afe537 Polishing 2014-06-09 21:17:19 +01:00
Maciej Walkowiak e40320a8ed Added integration test for Spring Web Services Sample project 2014-06-09 21:17:19 +01:00
Maciej Walkowiak 95a6ce9e48 Spring Web Services Starter
- upgraded Spring WS to 2.2.0.RELEASE
- replaced default MVC DispatcherServlet with MessageDispatcherServlet
- migrated XML based config with nww Spring WS Java config

Fixes: gh-412
2014-06-09 21:17:19 +01:00
Marten Deinum e2a449da97 Spring Web Services Starter and Sample Project
Fixes gh-412
2014-06-09 21:17:19 +01:00
Phillip Webb b5d267ca89 Polish 2014-06-09 12:33:49 -07:00
Phillip Webb 80b7e60c01 Merge pull request #1060 from akhikhl/master
* pull1060:
  Improve Jetty third-party integration support
2014-06-09 11:47:28 -07:00
Andrey Hihlovskiy 216e93fc5c Improve Jetty third-party integration support
Make JettyEmbeddedServletContainerFactory more useful for third-parties
by providing protected configureWebAppContext, addDefaultServlet and
addJspServlet methods that sub-classes can call.

Fixes gh-1056
2014-06-09 11:42:28 -07:00
Phillip Webb 2ad4c47d18 Polish 2014-06-09 11:33:17 -07:00
Phillip Webb 21029d2323 Polish disable repository documentation 2014-06-09 11:31:38 -07:00
Dave Syer dcb17a7cb5 Enhance @Conditionals for JMX autconfig
Fixes gh-1059
2014-06-09 17:47:24 +01:00
Dave Syer bc85f388aa Add test for gh-1058 2014-06-09 17:05:12 +01:00
Andy Wilkinson f47b40f683 Use spring-boot-version for dependency versions in Gradle Jetty example 2014-06-09 16:45:40 +01:00
Andy Wilkinson db8a9ec597 Polish documentation of @GrabMetadata 2014-06-09 16:42:57 +01:00
Christian Dupuis 5d25588d7b Make properties to sanitize configurable in EnvironmentEndpoint.
Add "key" to default keys that will be sanitized. fixes #1027
2014-06-09 15:07:36 +02:00
Roy Clarkson 1a32a6a06b Fix issues with DeviceDelegatingViewResolverAutoConfiguration
- Log to the correct class
- Set Auto-configure after Thymeleaf hint on main class instead of
  internal static class
- Use 'thymeleafViewResolver' bean name instead of class for
  conditional bean checks
- Fix class name in properties documentation

Fixes gh-1052
2014-06-09 14:05:46 +01:00
Javier Gayoso b7d94d1364 Optimized login form - delegated CSRF token creation to thymeleaf
Also added additional test to verify behaviour.

Fixes gh-1039
2014-06-09 10:56:01 +01:00
Dave Syer aa30fdba18 Add MBeanServer @Bean in case it is needed
Anywhere that an MBeanServer is needed it should be
created @Conditionally, so that user can exclude the
JmxAutoConfiguration and still get the other JMX
behaviours automatically.
2014-06-09 10:21:49 +01:00
Dave Syer 1a5c4f88b4 Fix compilation error 2014-06-09 10:10:34 +01:00
Dave Syer 39a94428d3 Add @Conditionals to permit JPA/Mongo mixed usage
I decided to go with both approaches (make the autoconfig for
repositories @ConditionalOnMissingBean(RepositoryFactoryBeanSupport),
so the first one wins; and also make them conditional on
spring.data.*.repositories.enabled=true. The ordering problem
is still there really (it's not defined which repositories will
be created by the autoconfig), so if a user is going to have
2 repository implementations on the classpath, he is going to
have to either choose one to disable, or manualy @Enable* the
other one.

Fixes gh-1042
2014-06-09 09:48:40 +01:00
Phillip Webb 83694a09b3 Add missing settings.xml file
See gh-1047
2014-06-09 01:08:50 -07:00
Phillip Webb c07dd17f93 Add starters to prepare build 2014-06-09 01:00:25 -07:00
Phillip Webb 639f0e12a6 Merge branch 'gh-1047' 2014-06-09 00:53:21 -07:00