From 886ad70bedaf6a6e6b3b436400b20434a47c1533 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 24 May 2015 19:20:57 -0400 Subject: [PATCH 1/4] Add jdk8 to travis build --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 9745d47e92..9e1054ad90 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ language: java jdk: + - oraclejdk8 - oraclejdk7 - openjdk7 - openjdk6 From 3e7a5c8aa370d89dc0f6a51003a6dc43d16d5f9f Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 24 May 2015 19:38:39 -0400 Subject: [PATCH 2/4] Add comment about mac setting, it appears invalid --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index a1c7f2a138..070c65defa 100644 --- a/pom.xml +++ b/pom.xml @@ -310,6 +310,7 @@ + From cb94331c9f148dc2799a1d69438281291a63838b Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 24 May 2015 19:38:51 -0400 Subject: [PATCH 3/4] Remove unnecessary exclusion --- pom.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pom.xml b/pom.xml index 070c65defa..802a81f085 100644 --- a/pom.xml +++ b/pom.xml @@ -222,10 +222,6 @@ nekohtml nekohtml - - xerces - xercesImpl - From bcdc763516088fdd12303bf0e9f13edefd968901 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 24 May 2015 19:39:21 -0400 Subject: [PATCH 4/4] Update dependencies spring-batch-infrastructure to 3.0.4.RELEASE ognl to 3.0.11 byteman to 3.0.0 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 802a81f085..4db368ad9c 100644 --- a/pom.xml +++ b/pom.xml @@ -130,7 +130,7 @@ org.springframework.batch spring-batch-infrastructure - 3.0.3.RELEASE + 3.0.4.RELEASE provided @@ -153,7 +153,7 @@ ognl ognl - 3.0.8 + 3.0.11 test @@ -174,7 +174,7 @@ org.jboss.byteman byteman-bmunit - 2.2.1 + 3.0.0 test