Created
August 26, 2013 19:09
-
-
Save deftdawg/6345319 to your computer and use it in GitHub Desktop.
Fixes issue with hsqldb conflict by updating dependencies
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/src/main/resources/com/rcaloras/roo/addon/timestamp/configuration.xml b/src/main/resources/com/rcaloras/roo/addon/timestamp/configuration.xml | |
| index f13deeb..9b276cf 100644 | |
| --- a/src/main/resources/com/rcaloras/roo/addon/timestamp/configuration.xml | |
| +++ b/src/main/resources/com/rcaloras/roo/addon/timestamp/configuration.xml | |
| @@ -3,14 +3,27 @@ | |
| <batch> | |
| <dependencies> | |
| <!-- Ivy-style dependency definition --> | |
| - <dependency org="org.springframework.batch" name="spring-batch-core" rev="2.1.1.RELEASE" /> | |
| + <dependency org="org.springframework.batch" name="spring-batch-core" rev="2.2.1.RELEASE" /> | |
| <!-- Maven-style dependency definition (should be used if exclusions need to be defined) --> | |
| <dependency> | |
| <groupId>org.springframework.batch</groupId> | |
| <artifactId>spring-batch-admin-manager</artifactId> | |
| - <version>1.0.0.RELEASE</version> | |
| + <version>1.2.1.RELEASE</version> | |
| +<!-- | |
| + <exclusions> | |
| + <exclusion> | |
| + <groupId>commons-logging</groupId> | |
| + <artifactId>commons-logging</artifactId> | |
| + </exclusion> | |
| + </exclusions> | |
| +--> | |
| + </dependency> | |
| + <dependency> | |
| + <groupId>org.springframework</groupId> | |
| + <artifactId>spring-tx</artifactId> | |
| + <version>3.2.3.RELEASE</version> | |
| </dependency> | |
| </dependencies> | |
| </batch> | |
| -</configuration> | |
| \ No newline at end of file | |
| +</configuration> |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment