BATCHEE-148 upgrade to EE8
diff --git a/extensions/cdi/pom.xml b/extensions/cdi/pom.xml
index ee1d5d0..69db571 100644
--- a/extensions/cdi/pom.xml
+++ b/extensions/cdi/pom.xml
@@ -74,12 +74,12 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+ <artifactId>geronimo-jcdi_2.0_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.1_spec</artifactId>
+ <artifactId>geronimo-interceptor_1.2_spec</artifactId>
<version>1.0</version>
<scope>test</scope>
</dependency>
@@ -93,7 +93,7 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_1.1_spec</artifactId>
+ <artifactId>geronimo-jcdi_2.0_spec</artifactId>
</dependency>
<dependency>
diff --git a/extensions/commons-csv/pom.xml b/extensions/commons-csv/pom.xml
index f1b35d3..41a38fd 100644
--- a/extensions/commons-csv/pom.xml
+++ b/extensions/commons-csv/pom.xml
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-reflect</artifactId>
- <version>4.18</version>
+ <version>${xbean.version}</version>
<optional>true</optional>
</dependency>
</dependencies>
diff --git a/extensions/extras/pom.xml b/extensions/extras/pom.xml
index dd7065e..be13cf9 100644
--- a/extensions/extras/pom.xml
+++ b/extensions/extras/pom.xml
@@ -38,9 +38,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_2.0_spec</artifactId>
- <version>1.1</version>
- <scope>provided</scope>
+ <artifactId>geronimo-jpa_2.2_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
diff --git a/extensions/jsonp/pom.xml b/extensions/jsonp/pom.xml
index 588622d..e90e119 100644
--- a/extensions/jsonp/pom.xml
+++ b/extensions/jsonp/pom.xml
@@ -30,8 +30,7 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-json_1.0_spec</artifactId>
- <version>1.0-alpha-1</version>
+ <artifactId>geronimo-json_1.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/extensions/pom.xml b/extensions/pom.xml
index cd172d5..ed15cb5 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -138,7 +138,7 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+ <artifactId>geronimo-jcdi_2.0_spec</artifactId>
</dependency>
</dependencies>
</profile>
@@ -149,7 +149,7 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_1.1_spec</artifactId>
+ <artifactId>geronimo-jcdi_2.0_spec</artifactId>
</dependency>
</dependencies>
</profile>
diff --git a/gui/jaxrs/jaxrs-client/pom.xml b/gui/jaxrs/jaxrs-client/pom.xml
index 6211661..8e5345f 100644
--- a/gui/jaxrs/jaxrs-client/pom.xml
+++ b/gui/jaxrs/jaxrs-client/pom.xml
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-json_1.0_spec</artifactId>
+ <artifactId>geronimo-json_1.1_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.johnzon</groupId>
diff --git a/gui/jaxrs/jaxrs-server/pom.xml b/gui/jaxrs/jaxrs-server/pom.xml
index 22098be..8c7a635 100644
--- a/gui/jaxrs/jaxrs-server/pom.xml
+++ b/gui/jaxrs/jaxrs-server/pom.xml
@@ -58,7 +58,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-json_1.0_spec</artifactId>
+ <artifactId>geronimo-json_1.1_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.johnzon</groupId>
diff --git a/gui/servlet/webapp/pom.xml b/gui/servlet/webapp/pom.xml
index 2db92f8..eea48b8 100644
--- a/gui/servlet/webapp/pom.xml
+++ b/gui/servlet/webapp/pom.xml
@@ -193,8 +193,8 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-json_1.0_spec</artifactId>
- <version>1.0-alpha-1</version>
+ <artifactId>geronimo-json_1.1_spec</artifactId>
+ <version>1.5</version>
</dependency>
<dependency>
<groupId>org.apache.johnzon</groupId>
diff --git a/jbatch/pom.xml b/jbatch/pom.xml
index 8c75c3f..4061c51 100644
--- a/jbatch/pom.xml
+++ b/jbatch/pom.xml
@@ -44,7 +44,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+ <artifactId>geronimo-jcdi_2.0_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -52,7 +52,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.1_spec</artifactId>
+ <artifactId>geronimo-interceptor_1.2_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -64,15 +64,12 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_2.0_spec</artifactId>
- <version>1.1</version>
- <scope>provided</scope>
+ <artifactId>geronimo-jpa_2.2_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-reflect</artifactId>
- <version>4.18</version>
</dependency>
<dependency>
@@ -88,9 +85,15 @@
<artifactId>joda-time</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.openejb</groupId>
+ <groupId>org.apache.tomee</groupId>
<artifactId>openejb-core</artifactId>
- <version>4.7.2</version>
+ <version>${tomee.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.fusesource.jansi</groupId>
+ <artifactId>jansi</artifactId>
+ <version>1.17.1</version>
<scope>test</scope>
</dependency>
diff --git a/jbatch/src/test/java/org/apache/batchee/test/mock/BatchletMock.java b/jbatch/src/test/java/org/apache/batchee/test/mock/BatchletMock.java
index 92e9154..e69ad09 100644
--- a/jbatch/src/test/java/org/apache/batchee/test/mock/BatchletMock.java
+++ b/jbatch/src/test/java/org/apache/batchee/test/mock/BatchletMock.java
@@ -21,6 +21,7 @@
public class BatchletMock extends AbstractBatchlet {
@Override
public String process() throws Exception {
+ System.out.println(" BatchletMock started");
return "mock";
}
}
diff --git a/pom.xml b/pom.xml
index 7521880..2a2b464 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,10 +42,11 @@
<atinject.version>1.0</atinject.version>
<batch-api.version>1.0</batch-api.version>
<jackson.version>2.2.2</jackson.version>
- <jodatime.version>2.9.1</jodatime.version>
- <johnzon.version>1.0.0</johnzon.version>
- <tomee.version>8.0.4</tomee.version>
- <deltaspike.version>1.9.4</deltaspike.version>
+ <jodatime.version>2.10.9</jodatime.version>
+ <johnzon.version>1.2.9</johnzon.version>
+ <tomee.version>8.0.6</tomee.version>
+ <xbean.version>4.19</xbean.version>
+ <deltaspike.version>1.9.5</deltaspike.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<batchee.scmPubUrl>https://svn.apache.org/repos/infra/websites/production/geronimo/content/batchee</batchee.scmPubUrl>
<batchee.scmPubCheckoutDirectory>${basedir}/.site-content</batchee.scmPubCheckoutDirectory>
@@ -127,20 +128,20 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_2.2_spec</artifactId>
+ <version>1.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-atinject_1.0_spec</artifactId>
<version>1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_1.0_spec</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_1.1_spec</artifactId>
- <version>1.0</version>
+ <artifactId>geronimo-jcdi_2.0_spec</artifactId>
+ <version>1.3</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -151,8 +152,8 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.1_spec</artifactId>
- <version>1.0</version>
+ <artifactId>geronimo-interceptor_1.2_spec</artifactId>
+ <version>1.2</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -171,8 +172,8 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-json_1.0_spec</artifactId>
- <version>1.0-alpha-1</version>
+ <artifactId>geronimo-json_1.1_spec</artifactId>
+ <version>1.5</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -182,6 +183,12 @@
</dependency>
<dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-reflect</artifactId>
+ <version>${xbean.version}</version>
+ </dependency>
+
+ <dependency>
<!-- We have optional support for joda time IF it is available on the classpath -->
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
diff --git a/tools/ee6/pom.xml b/tools/ee6/pom.xml
index 25946b0..b498e4e 100644
--- a/tools/ee6/pom.xml
+++ b/tools/ee6/pom.xml
@@ -39,7 +39,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+ <artifactId>geronimo-jcdi_2.0_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -47,7 +47,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.1_spec</artifactId>
+ <artifactId>geronimo-interceptor_1.2_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
