Skip to content

Commit 5a84cb8

Browse files
committed
Merge pull request #69 from hazendaz/master
Update dependencies and allow travis-ci jdk8 build
2 parents 3268991 + bcdc763 commit 5a84cb8

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
language: java
22
jdk:
3+
- oraclejdk8
34
- oraclejdk7
45
- openjdk7
56
- openjdk6

pom.xml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
<dependency>
131131
<groupId>org.springframework.batch</groupId>
132132
<artifactId>spring-batch-infrastructure</artifactId>
133-
<version>3.0.3.RELEASE</version>
133+
<version>3.0.4.RELEASE</version>
134134
<scope>provided</scope>
135135
</dependency>
136136

@@ -153,7 +153,7 @@
153153
<dependency>
154154
<groupId>ognl</groupId>
155155
<artifactId>ognl</artifactId>
156-
<version>3.0.8</version>
156+
<version>3.0.11</version>
157157
<scope>test</scope>
158158
</dependency>
159159

@@ -174,7 +174,7 @@
174174
<dependency>
175175
<groupId>org.jboss.byteman</groupId>
176176
<artifactId>byteman-bmunit</artifactId>
177-
<version>2.2.1</version>
177+
<version>3.0.0</version>
178178
<scope>test</scope>
179179
</dependency>
180180

@@ -222,10 +222,6 @@
222222
<groupId>nekohtml</groupId>
223223
<artifactId>nekohtml</artifactId>
224224
</exclusion>
225-
<exclusion>
226-
<groupId>xerces</groupId>
227-
<artifactId>xercesImpl</artifactId>
228-
</exclusion>
229225
</exclusions>
230226
</dependency>
231227
<dependency>
@@ -310,6 +306,7 @@
310306
</testResources>
311307
</build>
312308

309+
<!-- TODO: Why is this necessary, the dependency is alreayd present at this scope? -->
313310
<!-- this is just a turnaround to Mac compilers -->
314311
<profiles>
315312
<profile>

0 commit comments

Comments
 (0)