Commit Graph

4501 Commits

Author SHA1 Message Date
Andy Wilkinson
af067ae28b Add files that were accidentally omitted from 5e743fb2
See gh-3274
2015-06-18 13:30:20 +01:00
Andy Wilkinson
5e743fb299 Fully honour local repository location configured in settings.xml
Previously, DefaultRepositorySystemSessionAutoConfiguration would
read the local repository configuration from settings.xml, but did
not perform any property interpolation. This would leave placeholders
such as ${user.home} as-is and result in the use of the wrong
location. To address this, the code that reads settings.xml has been
updated to provide the current System properties as a property
interpolation source.

RepositoryConfigurationFactory configures the local repository as a
"remote" repository when the local repository location has been
overridden. This allows spring grab to copy dependencies from the
local repository into the grab output location (configured via the
grape.root system property) rather than having to download them again.
This logic did not consider the customization of the local repository
location via settings.xml so the dependencies would be downloaded again.
To address this, RepositoryConfigurationFactory has been updated to
attempt to use the location configured in settings.xml, before falling
back to the default location.

The logic that reads settings.xml has deliberately been duplicated. It
could have been extracted into a separate class, but this is only a
temporary measure until gh-3275 is tackled. Duplication was deemed
preferable to adding a new public class in 1.2.x that we’d then want to
remove in 1.3.

Closes gh-3274
2015-06-18 12:37:19 +01:00
Stephane Nicoll
bbb0b7a80b Allow equal or colon in property value
Closes gh-3273
2015-06-18 12:54:53 +02:00
Phillip Webb
cca0b76ac8 Support Velocity toolbox configurations from jar
Create an EmbeddedVelocityToolboxView which supports loading toolbox.xml
files from the application classpath as well as the ServletContext. The
VelocityAutoConfiguration class has been updated to use the new view.

This change allows the `spring.velocity.toolbox-config-location`
property to work with embedded servlet containers.

Fixes gh-2912
2015-06-15 18:08:17 -07:00
Oliver Gierke
1cfc6f64f6 Allow multiple @EntityScan annotations to be used
Update EntityScanRegistrar so that multiple @EntityScan annotations can
be used with a single application. Previously, when an application used
multiple annotations only the first one found would get applied. This
changes alters that to augment the packages that will be scanned.

Fixes gh-2757
2015-06-15 12:21:22 -07:00
Artur Mkrtchyan
d6e24a15de Update logging.path documentation sample
Update appendix example to use the more common `/var/log` folder rather
than `/var/logs`.

Fixes gh-3225
2015-06-15 11:36:03 -07:00
Phillip Webb
20d39f7af2 Polish 2015-06-15 11:31:33 -07:00
Ben Hale
818d3bd230 VcapApplicationListener Boolean Credentials
Previously, the VcapApplicationListener would discard any service
credential value that wasn't a String, Number, Map, Collection, or
null.  This was particularly a problem for services that exposed a
value as a JSON boolean.  This change takes booleans in the credential
payload into account, converting them to Strings so that they will
pass through the properties system properly.  There's no real downside
to this as Spring will coerce them back into Booleans if needed, by
the application.

Fixes gh-3237
2015-06-15 11:24:13 -07:00
Phillip Webb
75ffd1b017 Polish 2015-06-15 11:19:47 -07:00
Phillip Webb
a83d999f27 Add missing MultipartProperties.enabled property
Fixes gh-3209
2015-06-15 11:18:01 -07:00
Phillip Webb
135e9d10a6 Polish 2015-06-15 10:52:02 -07:00
Andy Wilkinson
0253f21f2f Update the link to Bitronix's documentation
Closes gh-3207
2015-06-15 14:25:24 +01:00
Stephane Nicoll
321a149297 Only associate JTA transaction manager
This is related to 38cca9c but for the Rabbit support. Update
RabbitAnnotationDrivenConfiguration to only associate a JTA transaction
manager, if any.

Closes gh-3222
2015-06-15 11:20:03 +02:00
Stephane Nicoll
dc94fafaaa Fix dependency of AmqpAdmin
AmqpAdmin does not require a CachingConnectionFactory. Using the more
general CachingConnectionFactory provides more flexibility.

Closes gh-3220
2015-06-14 10:04:06 +02:00
Stephane Nicoll
01ba732a73 Consistent use of "=" for property key
Closes gh-3218
2015-06-14 09:36:10 +02:00
Andy Wilkinson
defceec90c Reinstate support for spring.groovy.template.configuration.*
Previously, spring.groovy.template.configuration.* was mapped onto both
GroovyTemplateProperties.configuration and GroovyMarkupConfigurer. The
former being a Map and the latter being specific type with getters and
setters. This clash caused problems with the IDE support.

GroovyTemplateProperties.configuration appeared to be dead code so it
was removed in 326bdf2. Unfortunately this broke the use of
spring.groovy.template.configuration.* properties as
GroovyTemplateProperties uses a prefix of spring.groovy.template and it
no longer had a configuration property.

This commit addresses the problem by updating GroovyTemplateProperties
to ignore unknown fields. This allows
spring.groovy.template.configuration.* properties to be used and bound
to GroovyMarkupConfigurer without reintroducing the clash which prompted
the initial change.

Closes gh-3198
2015-06-10 17:53:45 +01:00
Andy Wilkinson
ad7a1d9a69 Upgrade to Spring Integration 4.1.5.RELEASE
Closes gh-3176
2015-06-10 11:36:49 +01:00
Andy Wilkinson
4b02896b1d Upgrade to Jetty 9.2.11.v20150529
Closes gh-3191
2015-06-10 11:35:37 +01:00
Andy Wilkinson
0ad93c77d3 Update to AspectJ 1.8.6
Closes gh-3190
2015-06-10 11:34:34 +01:00
Lugi Cardito
a37e983296 Create output directory if necessary
If the `repackage` goal defines an output directory that does not exist,
the maven plugin now creates it.

Closes gh-3136
2015-06-10 10:27:53 +02:00
Andy Wilkinson
4a36c2e041 Increase the timeout period for container startup in deployment tests
The build currently fails intermittently when an external container,
usually TomEE or Wildfly, fails to start within the default timeout
period of two minutes. This commit updates the timeout to 5 minutes for
all containers (Tomcat, TomEE and Wildfly) in the hope that it will
help to stabilise the CI build.
2015-06-09 15:33:38 +01:00
Andy Wilkinson
b95a7cbdc4 Polishing: use tabs, not spaces 2015-06-09 14:18:45 +01:00
Eddú Meléndez
827c84169b Upgrade to Liquibase 3.3.5
Closes gh-3122
2015-06-09 11:27:18 +01:00
Stephane Nicoll
5a57913732 Tune spring-boot-actuator logging config
Closes gh-3060
2015-06-08 15:43:30 +02:00
Stephane Nicoll
7fc9c2afdf Fix indent 2015-06-08 15:17:05 +02:00
Stephane Nicoll
e16f5d03ab Add reference to Mustache to documentation
Closes gh-3121
2015-06-08 15:16:01 +02:00
Stephane Nicoll
38cca9c1f3 Only associate JTA transaction manager to JMS factory
The JMS MessageListenerContainer supports the PlatformTransactionManager
abstraction with either a `JmsTransactionManager` for local transactions
or `JtaTransactionManager` for distributed transactions. The former is
kind of deprecated (`setTransacted` should be used instead). In any case,
any other `PlatformTransactionManager` implementation is not supported.

Update JmsAnnotationDrivenConfiguration to only associated a JTA
transaction manager, if any.

Closes gh-3150
2015-06-08 15:07:03 +02:00
Dave Syer
1c0bcc13cf Set UserDetailsService in default AuthenticationManagerBuilder
Only affects the default AuthenticationManagerBuilder (so when users
are not overriding the default global user details). Makes the
UserDetailsService effectively available as it would be if we used
AuthenticationManagerBuilder.inMemoryAuthentication() as a
shared object in the HttpSecurity.

Fixes gh-3152
2015-06-08 13:14:12 +01:00
izeye
c7103bf2a4 Add missing slash
`endpoints.jolokia.path` requires the path to start with a slash.

Closes gh-2864
2015-06-07 10:29:03 +02: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
Phillip Webb
df8c311280 Add OrderedHiddenHttpMethodFilter
Add OrderedHiddenHttpMethodFilter and use it in WebMvcAutoConfiguration
to ensure that it is applied before Spring Security.

Fixes gh-2773
2015-06-02 15:20:20 -07:00
Phillip Webb
df0ba5c03a Guard against metric failures in MetricsFilter
Update MetricsFilter so that failures to record metrics are logged and
ignored.

Fixes gh-2777
2015-06-02 14:30:59 -07:00
Phillip Webb
1d5a62b3df Show endpoint.isEnabled in /configprops
Update `ConfigurationPropertiesReportEndpoint` so that properties that
are set with a Boolean class but read with a boolean primitive still
appear in the report. The allows the Endpoint.isEnabled() property to
be displayed.

Fixes gh-2929
2015-06-02 12:01:47 -07:00
Phillip Webb
61bc876ae8 Upgrade to H2 v1.4.187
Fixes gh-2730
2015-06-02 11:19:31 -07:00
Phillip Webb
aaa2ff54dd Extract @ConditionalOnEnabledEndpoint
Extract @ConditionalOnEnabledEndpoint to a top level class.

See gh-2798
2015-06-02 11:17:23 -07:00
Phillip Webb
968b68c322 Polish 2015-06-02 11:17:16 -07:00
Josh Thornhill
10f7031e46 Fix typo in documentation
Closes gh-3077
2015-06-02 11:50:49 +02:00
Phil Parker
eb92dfbb3b Fix link to Groovy documentation
Closes gh-3054
2015-05-28 15:28:48 +02:00
Stephane Nicoll
4b825163a2 Upgrade to Tomcat 8.0.23
Closes gh-3058
2015-05-28 13:34:10 +02:00
Stephane Nicoll
f25ce8a381 Fix artifact extension retrieval
Do not rely on the packaging type to figure out what the extension of the
main artifact will be. So far, using `jar` and `war` packaging for `.jar`
and `.war` files worked by chance.

We know retrieve the actual extension as provided by Maven's
`ArtifactHandler`.

Fixes gh-2762
2015-05-26 16:21:00 +02:00
Stephane Nicoll
160f2d341f Fix Gzip filter properties
Fix `excludeAgentPatterns`, `excludePaths` and `excludePathPatterns`
properties. Introduce `excludedMimeTypes` property.

Fixes gh-3042
2015-05-26 15:00:54 +02:00
Stephane Nicoll
676b7d713a Refine log message
Rework c03e14b to avoid an extra empty space in log message

See gh-3033
2015-05-26 11:23:01 +02:00
Stephane Nicoll
c03e14bee4 Fix missing space in log message
Fixes gh-3033
2015-05-25 18:25:11 +02:00
Joe Kutner
dbe310b806 Update Heroku deployment documentation
Closes gh-3000
2015-05-20 10:58:42 +02:00
Andy Wilkinson
bb877ed579 Upgrade to Spring Batch 3.0.4.RELEASE
Closes gh-2950
2015-05-20 09:54:35 +01:00
Andy Wilkinson
6ad6cf0356 Upgrade to Spring Social 1.1.2.RELEASE
Closes gh-3015
2015-05-20 09:54:00 +01:00
Andy Wilkinson
c5b5932c0c Upgrade to thymeleaf-extras-springsecurity3 2.1.2.RELEASE
Closes gh-2975
2015-05-18 13:47:30 +01:00
Andy Wilkinson
615e1afe80 Upgrade to Spring Loaded 1.2.3.RELEASE
Closes gh-2974
2015-05-18 13:47:30 +01:00
Andy Wilkinson
3d68216bf7 Upgrade to Liquibase 3.3.3
Closes gh-2973
2015-05-18 13:47:30 +01:00