[ALIEN-3553] upgrade to JDK 15 & ES 6.8.13

Author: EmmanuelDuru

elasticsearch-annotations/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.alien4cloud</groupId>
         <artifactId>elasticsearch-mapping-parent</artifactId>
-        <version>6.6.2-2-SNAPSHOT</version>
+        <version>6.8.13-1-SNAPSHOT</version>
     </parent>
 
     <artifactId>elasticsearch-annotations</artifactId>

elasticsearch-mapping/pom.xml

@@ -4,14 +4,22 @@
     <parent>
         <groupId>org.alien4cloud</groupId>
         <artifactId>elasticsearch-mapping-parent</artifactId>
-        <version>6.6.2-2-SNAPSHOT</version>
+        <version>6.8.13-1-SNAPSHOT</version>
     </parent>
 
     <artifactId>elasticsearch-mapping</artifactId>
     <name>Elastic search mapping.</name>
     <description>Object mapping for elastic search.</description>
 
+    <properties>
+       <elasticsearch.analysis-common.version>6.8.12</elasticsearch.analysis-common.version>
+    </properties>
+
     <dependencies>
+      <dependency>
+        <groupId>javax.annotation</groupId>
+        <artifactId>javax.annotation-api</artifactId>
+      </dependency>
         <dependency>
             <groupId>org.elasticsearch</groupId>
             <artifactId>elasticsearch</artifactId>
@@ -24,11 +32,11 @@
                 <groupId>org.elasticsearch.plugin</groupId>
                 <artifactId>transport-netty4-client</artifactId>
             </dependency>
-<dependency>
-    <groupId>org.codelibs.elasticsearch.module</groupId>
-    <artifactId>analysis-common</artifactId>
-    <version>${elasticsearch.version}</version>
-</dependency>
+            <dependency>
+                <groupId>org.codelibs.elasticsearch.module</groupId>
+                <artifactId>analysis-common</artifactId>
+                <version>${elasticsearch.analysis-common.version}</version>
+        </dependency>
         <dependency>
             <groupId>com.floragunn</groupId>
             <artifactId>search-guard-ssl</artifactId>

pom.xml

@@ -3,29 +3,31 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.alien4cloud</groupId>
     <artifactId>elasticsearch-mapping-parent</artifactId>
-    <version>6.6.2-2-SNAPSHOT</version>
+    <version>6.8.13-1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Elastic search mapping parent</name>
     <description>An object mapping framework for Elastic Search.</description>
 
     <properties>
-        <elasticsearch.version>6.6.2</elasticsearch.version>
-        <search-guard.version>6.6.2-25.6</search-guard.version>
+        <elasticsearch.version>6.8.13</elasticsearch.version>
+        <search-guard.version>6.8.6-25.7</search-guard.version>
 
         <jackson.version>2.9.3</jackson.version>
         <spring.version>4.3.2.RELEASE</spring.version>
     	<commons-lang.version>3.5</commons-lang.version>
     	<commons-beanutils.version>1.9.3</commons-beanutils.version>
         <junit.version>4.12</junit.version>
         <guava.version>19.0</guava.version>
-        <lombok.version>1.16.18</lombok.version>
-    <!-- Logging -->
-    <log4j.version>2.8.2</log4j.version>
-    <slf4j.version>1.7.24</slf4j.version>
+        <lombok.version>1.18.16</lombok.version>
+        <!-- Logging -->
+        <log4j.version>2.8.2</log4j.version>
+        <slf4j.version>1.7.24</slf4j.version>
 
-        <java.version>1.8</java.version>
-        <maven.compiler.version>2.3.2</maven.compiler.version>
+        <java.version>15</java.version>
+        <javax.annotation.version>1.3.2</javax.annotation.version>
+
+        <maven.compiler.version>3.8.1</maven.compiler.version>
     </properties>
 
     <modules>
@@ -147,7 +149,15 @@
         <artifactId>slf4j-ext</artifactId>
         <version>${slf4j.version}</version>
       </dependency>
-		</dependencies>
+
+      <dependency>
+        <groupId>javax.annotation</groupId>
+        <artifactId>javax.annotation-api</artifactId>
+        <version>${javax.annotation.version}</version>
+      </dependency>
+
+
+      </dependencies>
     </dependencyManagement>
 
     <developers>
@@ -157,14 +167,14 @@
     </developers>
 
     <distributionManagement>
-        <repository>
-            <id>repo.opensource.fastconnect.org</id>
-            <url>https://fastconnect.org/maven/content/repositories/opensource</url>
-        </repository>
-        <snapshotRepository>
-            <id>repo.opensource.snapshot.fastconnect.org</id>
-            <url>https://fastconnect.org/maven/content/repositories/opensource-snapshot</url>
-        </snapshotRepository>
+       <repository>
+         <id>pdl-releases</id>
+         <url>https://www.portaildulibre.fr/nexus/repository/opensource-releases</url>
+       </repository>
+       <snapshotRepository>
+         <id>pdl-snapshots</id>
+         <url>https://www.portaildulibre.fr/nexus/repository/opensource-snapshots</url>
+       </snapshotRepository>
     </distributionManagement>
 
     <build>
@@ -181,7 +191,7 @@
 <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.20.1</version>
+        <version>2.22.1</version>
         <!-- -Dtests.security.manager=false is needed otherwise the ESTestCase fails to initialize -->
         <configuration>
           <argLine>-Xms128m -Xmx512m -Dtests.security.manager=false</argLine>