Skip to content
Permalink
Browse files
BATCHEE-148 upgrade to EE8
  • Loading branch information
struberg committed Apr 28, 2021
1 parent f4ae25c commit bf45a5dcacede044e09a331fbb70bb1059055295
Showing 12 changed files with 46 additions and 38 deletions.
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -44,15 +44,15 @@
</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>
<artifactId>geronimo-ejb_3.1_spec</artifactId>
</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>

@@ -21,6 +21,7 @@
public class BatchletMock extends AbstractBatchlet {
@Override
public String process() throws Exception {
System.out.println(" BatchletMock started");
return "mock";
}
}
33 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-atinject_1.0_spec</artifactId>
<version>1.0</version>
<artifactId>geronimo-jpa_2.2_spec</artifactId>
<version>1.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jcdi_1.0_spec</artifactId>
<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.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>
@@ -181,6 +182,12 @@
<version>${johnzon.version}</version>
</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>
@@ -39,15 +39,15 @@
</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>
<artifactId>geronimo-ejb_3.1_spec</artifactId>
</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>

0 comments on commit bf45a5d

Please sign in to comment.