BATCHEE-111 upgrade to tomee 7 our bundle
diff --git a/tools/cli/pom.xml b/tools/cli/pom.xml
index 1b8f576..6caeb3c 100644
--- a/tools/cli/pom.xml
+++ b/tools/cli/pom.xml
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.1</version>
+ <version>3.4</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
@@ -61,21 +61,21 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
</dependency>
<!-- for lifecycles -->
<dependency>
- <groupId>org.apache.openejb</groupId>
+ <groupId>org.apache.tomee</groupId>
<artifactId>openejb-core</artifactId>
- <version>4.7.1</version>
+ <version>7.0.1</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.deltaspike.cdictrl</groupId>
<artifactId>deltaspike-cdictrl-api</artifactId>
- <version>0.6</version>
+ <version>1.7.1</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
diff --git a/tools/cli/src/main/assembly/bin-openejb.xml b/tools/cli/src/main/assembly/bin-openejb.xml
index e6daf87..f90b11b 100644
--- a/tools/cli/src/main/assembly/bin-openejb.xml
+++ b/tools/cli/src/main/assembly/bin-openejb.xml
@@ -77,27 +77,30 @@
<outputDirectory>lib</outputDirectory>
<scope>provided</scope>
<includes>
- <include>org.apache.openejb:javaee-api</include>
- <include>org.apache.openejb:openejb-api</include>
- <include>org.apache.openejb:openejb-javaagent</include>
- <include>org.apache.openejb:openejb-jee</include>
- <include>org.apache.openejb:openejb-jee-accessors</include>
- <include>org.apache.openejb:openejb-core</include>
- <include>org.apache.openejb:openejb-loader</include>
- <include>org.apache.openejb:openejb-jpa-integration</include>
- <include>org.apache.openejb:mbean-annotation-api</include>
- <include>org.apache.openejb.shade:quartz-openejb-shade</include>
+ <include>org.apache.tomee:javaee-api</include>
+ <include>org.apache.tomee:openejb-api</include>
+ <include>org.apache.tomee:openejb-javaagent</include>
+ <include>org.apache.tomee:openejb-jee</include>
+ <include>org.apache.tomee:openejb-jee-accessors</include>
+ <include>org.apache.tomee:openejb-core</include>
+ <include>org.apache.tomee:openejb-loader</include>
+ <include>org.apache.tomee:openejb-jpa-integration</include>
+ <include>org.apache.tomee:mbean-annotation-api</include>
+ <include>org.apache.tomee.shade:quartz-openejb-shade</include>
<include>org.metatype.sxc:sxc-runtime</include>
<include>org.metatype.sxc:sxc-jaxb-core</include>
<include>org.apache.geronimo.components:geronimo-transaction</include>
+ <include>org.objectweb.howl:howl</include>
<include>org.apache.geronimo.javamail:geronimo-javamail_1.4_mail</include>
<include>org.apache.xbean:xbean-asm5-shaded</include>
<include>org.apache.xbean:xbean-finder-shaded</include>
<!--<include>org.apache.xbean:xbean-reflect</include>--> <!-- already used by batchee -->
<include>org.apache.xbean:xbean-naming</include>
+ <include>org.apache.xbean:xbean-bundleutils</include>
<include>org.hsqldb:hsqldb</include>
- <include>commons-pool:commons-pool</include>
- <include>commons-dbcp:commons-dbcp</include>
+ <include>org.apache.commons:commons-pool2</include>
+ <include>org.apache.commons:commons-dbcp2</include>
+ <include>org.apache.commons:commons-lang3</include>
<include>org.slf4j:slf4j-api</include>
<include>org.slf4j:slf4j-jdk14</include>
<include>org.apache.openwebbeans:openwebbeans-impl</include>
@@ -107,15 +110,15 @@
<include>org.apache.openwebbeans:openwebbeans-ejb</include>
<include>org.apache.openwebbeans:openwebbeans-web</include>
<include>org.apache.openwebbeans:openwebbeans-el22</include>
- <include>org.apache.openjpa:openjpa</include> <!-- openejb >= 4.6.0 -->
- <include>org.apache.openejb.patch:openjpa</include>
+ <include>org.apache.openjpa:openjpa</include>
<include>org.apache.bval:bval-core</include>
- <include>org.apache.bval:bval-jsr303</include>
+ <include>org.apache.bval:bval-jsr</include>
<include>commons-beanutils:commons-beanutils-core</include>
<include>commons-lang:commons-lang</include>
<include>commons-collections:commons-collections</include>
- <include>net.sourceforge.serp:serp</include>
+ <include>commons-logging:commons-logging</include>
<include>commons-cli:commons-cli</include>
+ <include>net.sourceforge.serp:serp</include>
</includes>
</dependencySet>
</dependencySets>
