Skip to content
Permalink
Browse files
BATCHEE-153 enable to build the project on java 11 and add spring-boo…
…t and embedded servlet jakarta relocations
  • Loading branch information
rmannibucau committed Oct 25, 2021
1 parent 0dc978b commit a654329c658a1ab92021c8294f3c8c76d92a7cfe
Showing 45 changed files with 391 additions and 372 deletions.
@@ -21,7 +21,7 @@
<parent>
<artifactId>batchee-extensions</artifactId>
<groupId>org.apache.batchee</groupId>
<version>1.0.0-SNAPSHOT</version>
<version>1.0.1-SNAPSHOT</version>
</parent>

<artifactId>batchee-beanio</artifactId>
@@ -21,7 +21,7 @@
<parent>
<artifactId>batchee-extensions</artifactId>
<groupId>org.apache.batchee</groupId>
<version>1.0.0-SNAPSHOT</version>
<version>1.0.1-SNAPSHOT</version>
</parent>

<artifactId>batchee-camel</artifactId>
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<version>1.7.5</version>
<version>1.7.32</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -21,15 +21,15 @@
<parent>
<artifactId>batchee-extensions</artifactId>
<groupId>org.apache.batchee</groupId>
<version>1.0.0-SNAPSHOT</version>
<version>1.0.1-SNAPSHOT</version>
</parent>

<artifactId>batchee-cdi</artifactId>
<name>BatchEE :: Extensions :: CDI</name>
<description>This module implements some CDI scopes batch oriented.</description>

<properties>
<owb.version>2.0.22</owb.version>
<owb.version>2.0.23</owb.version>
</properties>

<dependencies>
@@ -21,7 +21,7 @@
<parent>
<artifactId>batchee-extensions</artifactId>
<groupId>org.apache.batchee</groupId>
<version>1.0.0-SNAPSHOT</version>
<version>1.0.1-SNAPSHOT</version>
</parent>

<artifactId>batchee-commons-csv</artifactId>
@@ -19,7 +19,7 @@
<parent>
<artifactId>batchee-extensions</artifactId>
<groupId>org.apache.batchee</groupId>
<version>1.0.0-SNAPSHOT</version>
<version>1.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

@@ -21,7 +21,7 @@
<parent>
<artifactId>batchee-extensions</artifactId>
<groupId>org.apache.batchee</groupId>
<version>1.0.0-SNAPSHOT</version>
<version>1.0.1-SNAPSHOT</version>
</parent>

<artifactId>batchee-extras</artifactId>
@@ -42,22 +42,38 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-validation_1.0_spec</artifactId>
<artifactId>geronimo-validation_2.0_spec</artifactId>
<version>1.1</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.bval</groupId>
<artifactId>bval-jsr303</artifactId>
<version>0.5</version>
<artifactId>bval-jsr</artifactId>
<version>2.0.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
<version>2.2.2</version>
<version>3.2.0</version>
<scope>test</scope>
</dependency>
</dependencies>

<profiles>
<profile>
<id>jdk11</id>
<activation>
<jdk>[11,)</jdk>
</activation>
<dependencies>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>${jaxb.version}</version>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
@@ -21,7 +21,7 @@
<parent>
<artifactId>batchee-extensions</artifactId>
<groupId>org.apache.batchee</groupId>
<version>1.0.0-SNAPSHOT</version>
<version>1.0.1-SNAPSHOT</version>
</parent>

<artifactId>batchee-groovy</artifactId>
@@ -21,7 +21,7 @@
<parent>
<artifactId>batchee-extensions</artifactId>
<groupId>org.apache.batchee</groupId>
<version>1.0.0-SNAPSHOT</version>
<version>1.0.1-SNAPSHOT</version>
</parent>

<artifactId>batchee-hazelcast</artifactId>
@@ -21,7 +21,7 @@
<parent>
<artifactId>batchee-extensions</artifactId>
<groupId>org.apache.batchee</groupId>
<version>1.0.0-SNAPSHOT</version>
<version>1.0.1-SNAPSHOT</version>
</parent>

<artifactId>batchee-jackson</artifactId>
@@ -21,7 +21,7 @@
<parent>
<artifactId>batchee-extensions</artifactId>
<groupId>org.apache.batchee</groupId>
<version>1.0.0-SNAPSHOT</version>
<version>1.0.1-SNAPSHOT</version>
</parent>

<artifactId>batchee-jsefa</artifactId>
@@ -21,7 +21,7 @@
<parent>
<artifactId>batchee-extensions</artifactId>
<groupId>org.apache.batchee</groupId>
<version>1.0.0-SNAPSHOT</version>
<version>1.0.1-SNAPSHOT</version>
</parent>

<artifactId>batchee-jsonp</artifactId>
@@ -21,7 +21,7 @@
<parent>
<artifactId>batchee-extensions</artifactId>
<groupId>org.apache.batchee</groupId>
<version>1.0.0-SNAPSHOT</version>
<version>1.0.1-SNAPSHOT</version>
</parent>

<artifactId>batchee-modelmapper</artifactId>
@@ -21,7 +21,7 @@
<parent>
<artifactId>batchee</artifactId>
<groupId>org.apache.batchee</groupId>
<version>1.0.0-SNAPSHOT</version>
<version>1.0.1-SNAPSHOT</version>
</parent>

<artifactId>batchee-extensions</artifactId>
@@ -19,7 +19,7 @@
<parent>
<artifactId>batchee-jaxrs</artifactId>
<groupId>org.apache.batchee</groupId>
<version>1.0.0-SNAPSHOT</version>
<version>1.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

@@ -29,20 +29,21 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jbatch_1.0_spec</artifactId>
<artifactId>geronimo-atinject_1.0_spec</artifactId>
</dependency>
<dependency>
<!-- Needed for JAX-RS 2.0 ClientBuilder -->
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<version>2.0</version>
<scope>provided</scope>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.3_spec</artifactId>
</dependency>

<dependency>
<!-- cxf for "jaxrs 1" servers like TomEE only -->
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
<version>2.6.16</version>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jbatch_1.0_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxrs_2.1_spec</artifactId>
<version>1.1</version>
<scope>provided</scope>
</dependency>

@@ -61,21 +62,43 @@
<artifactId>johnzon-jaxrs</artifactId>
</dependency>

<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
<version>${cxf.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
<version>${cxf.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.rmannibucau</groupId>
<artifactId>featured-mock</artifactId>
<version>0.4</version>
<scope>test</scope>
</dependency>
<dependency> <!-- cxf is not yet compatible with JAXRS 2.0 API (final) -->
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
<version>2.3.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
</dependency>
</dependencies>

<profiles>
<profile>
<id>jdk11</id>
<activation>
<jdk>[11,)</jdk>
</activation>
<dependencies>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>${jaxb.version}</version>
</dependency>
</dependencies>
</profile>
</profiles>
</project>

0 comments on commit a654329

Please sign in to comment.