Commit Graph

2833 Commits (a9681ea032d5c2507534fa5f3aec9eb87ce521d3)
 

Author SHA1 Message Date
Andy Wilkinson 6a0eb90007 Upgrade to Spring Batch 3.0.1
Due to a mistake in Spring Batch 3.0.0 it has been necessary to
introduce a breaking API change (the addition of
BatchConfigurer.getJobExplorer()) in the 3.0.1 release. This commit
updates Boot to use 3.0.1 and modifies the Batch auto-configuration
and associated tests to implement the new method.
11 years ago
Phillip Webb f7b7b1c8cb Polish embedded tomcat classes
Extract some methods to aid readability.
11 years ago
Phillip Webb aed243fb88 Only add Tomcat connectors in start() method
Update TomcatEmbeddedServletContainer so that Connectors are removed
during initialization and re-added when the start() method is called.

This prevent protocol handlers from being bound then immediately
unbound. It also ensure that any additional connectors that may have
been added don't accidentally start to accept traffic (which could cause
potential deadlock issues).

Fixes gh-1212
11 years ago
Phillip Webb 7455e4e86f Restore support for `files` gradle dependencies
Allow `compile files("$rootDir/vendor/foo.jar")` style declarations
with the jars repackaged from the gradle plugin.

Fixes gh-1215
11 years ago
Dave Syer aa38d33404 Support for setting credentials and vhost in rabbit addresses
User can now add credentials, vhost and protocol prefix (amqp://)
to any or all of the addresses, extending the format beyond that accepted
bu the rabbitmq client, but making it cloud friendly. Only one of
the addresses needs those properties and all are optional. Port
also defaults to 5672 in an address.
11 years ago
Andy Wilkinson 148e32d09a Document need to use @ContextConfiguration with Spock
Closes #1167
11 years ago
Dave Syer 3978700b4a More specific pointcut to be safe 11 years ago
Andy Wilkinson 1ffdc90f04 Further enhancements to Gradle repackaging logic
This commit refines the changes made under 4be688aa. 4be688aa made the
default jar task a special case which broke repackaging of the archive
produced by the default war task.

This commit refines RepackageTask’s logic so that, when it’s enabled,
it will repackage a jar task’s archive if:

- The jar task is equal to RepackageTask.withJarTask
- The name of the jar task is equal to RepackageTask.withJarTask
- RepackageTask.withJarTask is null, the jar task is not referenced
  by another RepackageTask’s withJarTask, and the jar task has an
  empty classifier

The last of these three is the default case and ensures the, when the
Spring Boot plugin is applied, default jar and war artifacts are
repackaged. The classifier check is required to prevent default source
and javadoc artifacts from being repackaged.

Fixes #1204
11 years ago
Andy Wilkinson fdc3d70cd5 Ensure that spring-boot-starter-ws pulls in the right version of Spring
Prior to this commit, when used with Gradle, spring-boot-starter-ws was
pulling in the versions of spring-jms, spring-oxm, and spring-tx that
Spring WS depends upon, rather than using the Boot’s Spring version.
It’s ok at the moment as both Boot and Spring WS depend on Spring 4.0.5
but will cause problems if we upgrade to 4.0.6 before Spring WS does.

This commit adds explicit dependencies on spring-jms and spring-oxm so
that Gradle pulls in the correct version (as long as a transitive
dependency doesn’t pull in a version that’s greater than the version
Boot’s using).
11 years ago
Andy Wilkinson 4be688aa78 Fix Gradle repackaging so it is only performed on the desired jars
The logic that determined whether or not the repackaging action should
be applied to a particular jar task was broken and caused problems
when a custom RepackageTask was used in a project's build.

This commit updates the logic so that repackaging will be applied:

 - To the default jar task if RepackageTask.withJarTask is null
 - To a jar task if it is equal to RepackageTask.withJarTask
 - To a jar task if its name is equal to RepackageTask.withJarTask

Repackaging is not applied if:

 - RepackageTask.enabled is false

Numerous integration tests have been added to verify the repackaging
behaviour.

Fixes #1204
11 years ago
Phillip Webb 60e60227ad Polish doc formatting 11 years ago
Phillip Webb 55650bd618 Remove m2e maveneclipse site zip from repo
Remove org.eclipse.m2e.maveneclipse.site-0.0.1-SNAPSHOT-site.zip and
instead point people to the release on github which now works with
eclipse luna.
11 years ago
Phillip Webb 8054426803 Format source code 11 years ago
Phillip Webb fa88c481a5 Remote trailing whitespace 11 years ago
Phillip Webb 20766078d0 Update eclipse code formatter settings for Luna 11 years ago
Phillip Webb 6fd244c28b Move m2e ignore configuration to parent POM 11 years ago
Phillip Webb 6634322c13 Upgrade groovy-eclipse-batch version 11 years ago
Christian Dupuis 133304c4f7 Resolve placeholders in banner through Enviornment
see #1191
11 years ago
Andy Wilkinson e9c69aa46f Honour existing java.awt.headless configuration
Previously, SpringApplication would set the java.awt.headless system
property even if it had already been set. This commit updates
SpringApplication to honour any existing configuration when setting
the property.

Fixes #1189
11 years ago
Andy Wilkinson 53be0f8db7 Fix Gradle plugin logic for removing provided artifacts
The new ResolvedArtifact-based minus implementation was checking the
wrong Set when deciding whether or not a ResolvedArtifact should
be included in the result. This was leading to provided dependencies,
that should have only been packaging in WEB-INF/lib-provided also
being packaged in WEB-INF/lib.

The WarPackaging tests have been updated. In addition to checking that
WEB-INF/lib-provided does not contain anything that’s unexpected, they
also verify the contents of WEB-INF/lib

Fixes #1187
11 years ago
Toshiaki Maki e306cff4ff Fix typo in FlywayAutoConfiguration's javadoc
Closes #1183
11 years ago
Radesh Rao ef89ad019d Correct typo in section on using Maven without Boot as the parent
Closes #1188
11 years ago
Oliver Gierke 075eb9f30c Upgrade to Spring Data Dijkstra SR1
Upgraded to Dijkstra SR1 BOM as well as Spring HATEOAS 0.14.0.RELEASE
(required by Dijkstra SR1).

Closes #1197
Fixes #1190
11 years ago
Andy Wilkinson 54849f83c4 Upgrade to Spring AMQP 1.3.5
Closes #1193
11 years ago
Dave Syer 2a1ccfeade Allow /mappings to be disabled (fixes gh-1185) 11 years ago
Dave Syer 54a23f9920 Make -q and -v do something more sensible
-q switches off all logging and the banner, -v switches logging to debug,
running with neither will be info.

Fixes gh-1108
11 years ago
Dave Syer 93c0f6fbc7 Fix typo in beans{} example 11 years ago
Dave Syer fd757cb371 Add logging.level to application.properties
E.g.

logging.level.org.springframework: DEBUG
logging.level.org.hibernate: WARN

Fixed gh-788
11 years ago
Phillip Webb cc61d92b88 Fixup build following release 11 years ago
Toshiaki Maki 9febd4a4cb Support sqlScriptEncoding in schema.sql
Fixes gh-1165, fixes gh-1164
11 years ago
Dave Syer 7e24c8499a Add test for IO dependencies in gradle
See gh-1180
11 years ago
Stephane Nicoll 87fbc29895 Merge pull request #1181 from lmivan/master
* pull1181:
  Fix typo in documentation
11 years ago
Iván López 009ae8822b Fix typo in documentation 11 years ago
Dave Syer 179ac6022a Remove @GrabResolvers before packaging jar in CLI
Since all dependencies are local in a jar there is no need for
a GrabResolver (and it breaks the app because the default ivy
GrapeEngine is used instead of the smart, pretty Boot one).

Fixes gh-1179
11 years ago
Spring Buildmaster 981669b7c0 Next development version 11 years ago
Phillip Webb 35b26b52f2 Add caching to JarFile.getUrl()
Fixes gh-1178
11 years ago
Phillip Webb 200cd535c2 Revert "Next development version"
This reverts commit 67189477fe.
11 years ago
Spring Buildmaster 67189477fe Next development version 11 years ago
Phillip Webb 9632abf825 Formatting and cleanup 11 years ago
Phillip Webb cd77bae3b2 Remove version from ant-run plugin
No need as picked up from the parent.
11 years ago
Dave Syer 123ffd736c Exclude @ManagedResources from Endpoint MBeans
If an Endpoint is already @ManagedResource then it doesn't need
an additional (probably wrong) MBEan registration based on the invoke()
method.
11 years ago
Dave Syer c0305ecbbb Take care registering DataSourceInitializer
The DataSourceInitializer is instantiated early by the
DataSourceInitializerPostProcessor, so it has to live in
isolation (in its own @Configuration) to prevent early
instantiation of the DataSourceAutoConfiguration.

Fixes gh-1166
11 years ago
Dave Syer 24c0fce0f0 Add antrun plugin version 11 years ago
Phillip Webb e220f0806a Attempt to fix Windows CI 11 years ago
Phillip Webb 8be3f33cfb Be defensive detecting when Mono not running 11 years ago
Phillip Webb b01c1d36ae Attempt to fix Windows CI 11 years ago
Phillip Webb e383d13ad9 Attempt to fix Windows CI 11 years ago
Phillip Webb 6311ae191f Throw exception on stop failure
Trying to fix the Windows CI build
11 years ago
Phillip Webb 03b281278a Trying to break windows build 11 years ago
Phillip Webb d4ad67af44 Relax expected exception when connection fails
Exception appears to be different on Windows JVMs
11 years ago