BATCHEE-119 upgrade various dependencies
* OpenEBJ from 7.0.1 -> 7.0.3
* Johnzon from 0.9.5 -> 1.0.0
* DeltaSpike from 1.5.1 to 1.8.0
* OpenWebBeans from 1.6.2 to 1.7.2
diff --git a/extensions/cdi/pom.xml b/extensions/cdi/pom.xml
index 28937ca..9c3eefd 100644
--- a/extensions/cdi/pom.xml
+++ b/extensions/cdi/pom.xml
@@ -28,10 +28,6 @@
<name>BatchEE :: Extensions :: CDI</name>
<description>This module implements some CDI scopes batch oriented.</description>
- <properties>
- <deltaspike.version>1.5.1</deltaspike.version>
- </properties>
-
<dependencies>
<!-- optional since we are protable and can be used with other jbatch implementations as well -->
<dependency>
@@ -94,10 +90,6 @@
<profile>
<id>cdi-1.1</id>
- <properties>
- <owb.version>1.6.2</owb.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
diff --git a/gui/jaxrs/jaxrs-server/pom.xml b/gui/jaxrs/jaxrs-server/pom.xml
index 3159377..f9f0b49 100644
--- a/gui/jaxrs/jaxrs-server/pom.xml
+++ b/gui/jaxrs/jaxrs-server/pom.xml
@@ -115,9 +115,9 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.openejb.maven</groupId>
+ <groupId>org.apache.tomee.maven</groupId>
<artifactId>tomee-maven-plugin</artifactId>
- <version>1.6.0</version>
+ <version>${tomee.version}</version>
<configuration>
<tomeeClassifier>jaxrs</tomeeClassifier>
<simpleLog>true</simpleLog>
diff --git a/gui/jaxrs/webapp/pom.xml b/gui/jaxrs/webapp/pom.xml
index f58d461..ea9e55c 100644
--- a/gui/jaxrs/webapp/pom.xml
+++ b/gui/jaxrs/webapp/pom.xml
@@ -90,9 +90,9 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.openejb.maven</groupId>
+ <groupId>org.apache.tomee.maven</groupId>
<artifactId>tomee-maven-plugin</artifactId>
- <version>1.6.0</version>
+ <version>${tomee.version}</version>
<configuration>
<tomeeClassifier>jaxrs</tomeeClassifier>
<simpleLog>true</simpleLog>
diff --git a/pom.xml b/pom.xml
index d2c7ccf..e6ef791 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,9 @@
<batch-api.version>1.0</batch-api.version>
<jackson.version>2.2.2</jackson.version>
<jodatime.version>2.9.1</jodatime.version>
- <johnzon.version>0.9.5</johnzon.version>
+ <johnzon.version>1.0.0</johnzon.version>
+ <tomee.version>7.0.3</tomee.version>
+ <deltaspike.version>1.8.0</deltaspike.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<batchee.scmPubUrl>https://svn.apache.org/repos/asf/incubator/batchee/site</batchee.scmPubUrl>
<batchee.scmPubCheckoutDirectory>${basedir}/.site-content</batchee.scmPubCheckoutDirectory>
diff --git a/tools/cli/pom.xml b/tools/cli/pom.xml
index 6a5a3c8..5d68afd 100644
--- a/tools/cli/pom.xml
+++ b/tools/cli/pom.xml
@@ -68,14 +68,14 @@
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>openejb-core</artifactId>
- <version>7.0.1</version>
+ <version>${tomee.version}</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.deltaspike.cdictrl</groupId>
<artifactId>deltaspike-cdictrl-api</artifactId>
- <version>1.7.1</version>
+ <version>${deltaspike.version}</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
