Commit Graph

5742 Commits

Author SHA1 Message Date
Phillip Webb
5b9d45b231 Inject any existing JMS DestinationResolver bean
Update JmsAutoConfiguration to inject any existing DestinationResolver
bean into JmsTemplate and DefaultJmsListenerContainerFactory.

Fixes gh-1443
2014-08-26 11:44:19 -07:00
Phillip Webb
7a5248e38c Polish 2014-08-26 09:43:27 -07:00
Phillip Webb
da9e496818 Merge branch '1.1.x' 2014-08-26 09:43:27 -07:00
Phillip Webb
fdd79907e9 Polish 2014-08-26 09:43:27 -07:00
Phillip Webb
1381fe172e Polish 2014-08-26 09:40:33 -07:00
Andy Wilkinson
2b47d608f3 Merge branch '1.1.x' 2014-08-26 17:06:53 +01:00
Andy Wilkinson
28f7cf4487 Convert URL to File using a URI so that URL-encoding is removed
Fixes #1429
2014-08-26 17:04:50 +01:00
Dave Syer
ef2898a2f9 Fix version in new sample 2014-08-26 14:38:03 +01:00
Dave Syer
3404850b2e Merge branch '1.1.x' 2014-08-26 09:19:38 +01:00
Dave Syer
95d65c2ff5 Add indirection to avoid runtime dependency on MVC in templates
Velocity and Freemarker share some common properties so the base class for
configuring their properties makes some sense. Unfortunately the implementation
pulls in Spring MVC at runtime because of the signature of one method (that
would never be called). We can fix that in a number of ways, but the least
disruptive is probably to change the signature of that method and only refer
to the concrete template view resolver type if the method is called.

Fixes gh-1437
2014-08-26 09:19:07 +01:00
Phillip Webb
fcebf9d360 Merge branch '1.1.x' 2014-08-25 10:08:56 -07:00
Phillip Webb
f4dc090bae Add a little more context to ErrorPageFilter log
Add the servlet and context path along with the exception message to
the error logged in ErrorPageFilter.

See gh-1427
2014-08-25 10:06:22 -07:00
Dave Syer
bb13ebc0a3 Merge branch '1.1.x' 2014-08-25 17:28:12 +01:00
Dave Syer
2d67452128 Log exceptions in ErrorPageFilter
For some reason I thought that the DispatcherServlet default handler
would log all exceptions, so if we did it in the ErrorPageFilter it
would lead to duplicates. That appears not to be the case.

Fixes gh-1427
2014-08-25 17:26:57 +01:00
Dave Syer
43de5f3df8 Bump version in new sample 2014-08-25 17:21:17 +01:00
Dave Syer
5fd9af23d6 Merge branch '1.1.x' 2014-08-25 17:18:36 +01:00
Dave Syer
607f78a779 Add secure sample with JDBC and data.sql
We can't easily solve the problem by not allowing Spring Security to
eagerly instantiate everything, but we can be defensive about data.sql
and make sure it is executed even if the listener isn't yet registered.

Fixes gh-1386
2014-08-25 17:16:32 +01:00
Dave Syer
9da556d5e9 Merge branch '1.1.x' 2014-08-25 16:59:46 +01:00
Dave Syer
00ef26599e Add clarification of logging.file (fixes gh-1416) 2014-08-25 16:59:12 +01:00
Stephane Nicoll
d1f4fd0ecb Add skip parameter to repackage goal
This commit adds a 'skip' parameter to the 'repackage' goal that is
false by default. When this parameter is enabled, the repackage goal
does not run at all.

This can be used when repackaging should occur conditionally or
when a particular module in a hierarchy should not use this feature.

Fixes gh-1424
2014-08-23 10:02:08 +02:00
Phillip Webb
8c030795c2 Merge branch '1.1.x'
Conflicts:
	spring-boot-dependencies/pom.xml
2014-08-22 11:18:36 -07:00
Phillip Webb
939af5e931 Revert "Add activemq-jms-pool managed dependency"
This reverts commit bbdfcd4faa.
2014-08-22 11:16:46 -07:00
Phillip Webb
d6fdc47724 Restore repositories section
Restore repositories section accidentally removed during the merge
2014-08-22 09:49:07 -07:00
Phillip Webb
8f883febd1 Merge branch '1.1.x'
Conflicts:
	spring-boot-dependencies/pom.xml
2014-08-22 09:47:30 -07:00
Phillip Webb
bbdfcd4faa Add activemq-jms-pool managed dependency
Fixes gh-1423
2014-08-22 09:41:18 -07:00
Phillip Webb
658dc10722 Merge branch '1.1.x' 2014-08-21 22:11:40 -07:00
Phillip Webb
d515595ca1 Detect embedded DBs when deducing driver class
Fix DataSourceProperties getUsername() and getPassword() methods to
call getDriverClassName() rather than using `this.driverClassName` to
ensure than deduced driver classes can be used.

Fixes gh-1421
2014-08-21 22:06:01 -07:00
Phillip Webb
e6c18a00a1 Polish 2014-08-21 22:03:19 -07:00
Phillip Webb
77bf558307 Relocate configuration prefix constant
Relocate DataSourceAutoConfiguration.CONFIGURATION_PREFIX to
DataSourceProperties.PREFIX.
2014-08-21 21:44:39 -07:00
Phillip Webb
3512f56c0a Polish spaces->tabs 2014-08-21 16:22:54 -07:00
Phillip Webb
059bf3aae1 Use org.hsqldb.jdbc.JDBCDriver HSQLDB Driver
Switch driver class to the more conventionally named
`org.hsqldb.jdbc.JDBCDriver`.
2014-08-21 16:16:48 -07:00
Phillip Webb
2c6ca4d7e3 Merge branch '1.1.x' 2014-08-21 14:26:24 -07:00
Phillip Webb
5ef45c7494 Fix asciidoc incorrect link syntax 2014-08-21 14:25:02 -07:00
Phillip Webb
49805661f0 Merge branch '1.1.x' 2014-08-21 12:44:02 -07:00
Phillip Webb
d0f493cbea Fix InteliJ code formatter instructions
Update CONTRIBUTING.adoc with improved code formatter instructions.

Fixes gh-1271
2014-08-21 12:41:37 -07:00
Phillip Webb
650e326ae7 Align MessageSource path search fix with SPR-12095
Update ExtendedPathMatchingResourcePatternResolver to use similar
code as the fix for SPR-12095.

Fixes gh-1378
2014-08-21 12:09:07 -07:00
Andy Wilkinson
2ed24ddcd5 Merge branch '1.1.x' 2014-08-21 16:26:52 +01:00
Andy Wilkinson
9717b7d840 Preserve JVM args when auto-configuring a Java agent in Gradle bootRun
Fixes #1411
2014-08-21 16:26:36 +01:00
Andy Wilkinson
c75782424c Add jar that should have been added as part of 69c61d0 2014-08-21 16:25:37 +01:00
Andy Wilkinson
0e7757decd Merge branch '1.1.x' 2014-08-21 15:38:13 +01:00
Andy Wilkinson
69c61d0e8e Include transitive file dependencies during Gradle repackaging
Previously, ProjectLibraries only considered a configuration's
direct file dependencies. This meant that a transitive file
dependency that should have been pulled in via a project dependency
was not included in the repackaged jar's lib directory.

ProjectLibraries has been updated to walk down the tree of project
dependencies and create libraries for any file dependencies that
are found.

Fixes gh-1368
2014-08-21 15:27:08 +01:00
Andy Wilkinson
595c81124d Polishing 2014-08-21 09:02:16 +01:00
Phillip Webb
7d4fbacecd Fix invoker to not download remote artifacts
Updates to prevent the maven-invoker-plugin from downloading remote
snapshot jars. Possibly caused by the recent changes to the
spring-boot-dependencies POM.

See gh-1413
2014-08-21 00:52:00 -07:00
Phillip Webb
1a61ffd7d1 Update maven-invoker-plugin to 1.9 2014-08-21 00:43:12 -07:00
Phillip Webb
75578e833a Add repositories section to dependencies POM
Inadvertently missed on commit 7732135a2b

Fixes gh-1413
2014-08-20 18:35:07 -07:00
Phillip Webb
bd4eda383f Create ApplicationHome class
Extract useful logic from StartupInfoLogger to a new ApplicationHome
class.

Fixes gh-1414
2014-08-20 16:40:17 -07:00
Phillip Webb
91e493fd0a Revert "Update travis CI configuration"
This reverts commit c28026bb36.
2014-08-20 16:26:06 -07:00
Phillip Webb
c28026bb36 Update travis CI configuration 2014-08-20 16:23:08 -07:00
Phillip Webb
7732135a2b Add repositories section to dependencies POM
Add a repositories section to the spring-boot-dependencies POM but
strip it out during a CI build. This allows snapshot and milestone
BOM imports to be used but doesn't pollute published POMs and doesn't
prevent a fresh checkout from building.

Fixes gh-1413
2014-08-20 16:18:42 -07:00
Phillip Webb
e6e0cf094b Move more repositories to generated settings.xml 2014-08-20 12:08:30 -07:00