Skip to content

Commit d0d73e3

Browse files
committed
Fix compatibility with JRE>8 && update CI
1 parent 6d98c5c commit d0d73e3

File tree

3 files changed

+58
-26
lines changed

3 files changed

+58
-26
lines changed

.travis.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ addons:
88

99
jdk:
1010
- openjdk8
11+
- openjdk11
1112

1213
script:
1314
- mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent install sonar:sonar
@@ -32,4 +33,4 @@ deploy:
3233
name: "i-Code CNES"
3334
draft: true
3435
on:
35-
branch: master
36+
tags: true

icode-app/pom.xml

+18
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,24 @@
4444
<artifactId>ant</artifactId>
4545
<version>1.10.4</version>
4646
</dependency>
47+
<!-- https://mvnrepository.com/artifact/javax.xml.bind/jaxb-api -->
48+
<dependency>
49+
<groupId>javax.xml.bind</groupId>
50+
<artifactId>jaxb-api</artifactId>
51+
<version>2.3.1</version>
52+
</dependency>
53+
<!-- https://mvnrepository.com/artifact/javax.activation/activation -->
54+
<dependency>
55+
<groupId>javax.activation</groupId>
56+
<artifactId>activation</artifactId>
57+
<version>1.1.1</version>
58+
</dependency>
59+
<!-- https://mvnrepository.com/artifact/org.glassfish.jaxb/jaxb-runtime -->
60+
<dependency>
61+
<groupId>org.glassfish.jaxb</groupId>
62+
<artifactId>jaxb-runtime</artifactId>
63+
<version>2.3.2</version>
64+
</dependency>
4765
</dependencies>
4866

4967
<build>

icode-core/pom.xml

+38-25
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,52 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
4-
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
5-
<modelVersion>4.0.0</modelVersion>
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
4+
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
5+
<modelVersion>4.0.0</modelVersion>
66

7-
<parent>
8-
<groupId>fr.cnes.icode</groupId>
9-
<artifactId>parent</artifactId>
10-
<version>dev</version>
11-
</parent>
7+
<parent>
8+
<groupId>fr.cnes.icode</groupId>
9+
<artifactId>parent</artifactId>
10+
<version>dev</version>
11+
</parent>
1212

13-
<artifactId>icode-core</artifactId>
14-
<version>${icode.version}</version>
15-
<packaging>jar</packaging>
13+
<artifactId>icode-core</artifactId>
14+
<version>${icode.version}</version>
15+
<packaging>jar</packaging>
1616

17-
<name>i-Code Core</name>
17+
<name>i-Code Core</name>
1818

19-
<dependencies>
20-
<dependency>
21-
<groupId>org.reflections</groupId>
22-
<artifactId>reflections</artifactId>
23-
<version>0.9.11</version>
19+
<dependencies>
20+
<dependency>
21+
<groupId>org.reflections</groupId>
22+
<artifactId>reflections</artifactId>
23+
<version>0.9.11</version>
2424
<scope>compile</scope>
25-
</dependency>
25+
</dependency>
2626
<dependency>
2727
<groupId>de.jflex</groupId>
2828
<artifactId>jflex</artifactId>
2929
<version>1.7.0</version>
3030
<scope>compile</scope>
31-
<optional>true</optional>
31+
<optional>true</optional>
32+
</dependency>
33+
<!-- https://mvnrepository.com/artifact/javax.xml.bind/jaxb-api -->
34+
<dependency>
35+
<groupId>javax.xml.bind</groupId>
36+
<artifactId>jaxb-api</artifactId>
37+
<version>2.3.1</version>
38+
</dependency>
39+
<!-- https://mvnrepository.com/artifact/javax.activation/activation -->
40+
<dependency>
41+
<groupId>javax.activation</groupId>
42+
<artifactId>activation</artifactId>
43+
<version>1.1.1</version>
44+
</dependency>
45+
<!-- https://mvnrepository.com/artifact/org.glassfish.jaxb/jaxb-runtime -->
46+
<dependency>
47+
<groupId>org.glassfish.jaxb</groupId>
48+
<artifactId>jaxb-runtime</artifactId>
49+
<version>2.3.2</version>
3250
</dependency>
33-
<dependency>
34-
<groupId>javax.xml.bind</groupId>
35-
<artifactId>jaxb-api</artifactId>
36-
<version>2.3.0</version>
37-
</dependency>
38-
</dependencies>
51+
</dependencies>
3952
</project>

0 commit comments

Comments
 (0)