Merge pull request #768 from GIScience/fix/upgrade-to-java11

Fix/upgrade to java11

Author: takb

.travis.yml

@@ -1,5 +1,5 @@
 language: java
-jdk: openjdk8
+jdk: openjdk11
 
 sudo: required
 dist: trusty

CHANGELOG.md

@@ -23,6 +23,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 ### Changed
 - Improve recommended weighting for cycling and walking profiles ([#665](https://github.com/GIScience/openrouteservice/issues/665))
 - Restructure AdditionWeighting
+- Upgrade to Java 11
 ### Deprecated
 - Use recommended weighting instead of fastest ([#763](https://github.com/GIScience/openrouteservice/issues/763))
 

openrouteservice-api-tests/pom.xml

@@ -12,29 +12,47 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.target>1.8</maven.compiler.target>
     </properties>
 
     <build>
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.3</version>
+                <version>3.8.0</version>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
+                    <!--compilerArgs>
+                      <arg>add-modules=java.xml.bind</arg>
+                   </compilerArgs-->
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.20.1</version>
+                <version>2.21.0</version>
                 <configuration>
                     <excludes>
                         <exclude>**/locations/ParametersValidationTest.java</exclude>
                         <exclude>**/locations/ResultsValidationTest.java</exclude>
                     </excludes>
+                    <dependencies><dependency>
+                      <groupId>org.ow2.asm</groupId>
+                      <artifactId>asm</artifactId>
+                      <version>6.2</version>
+                    </dependency></dependencies>
                 </configuration>
             </plugin>
+            <plugin>
+              <groupId>org.codehaus.mojo</groupId>
+              <artifactId>versions-maven-plugin</artifactId>
+              <version>2.5</version>
+              <configuration>
+                <generateBackupPoms>false</generateBackupPoms>
+             </configuration>
+            </plugin>
+
         </plugins>
     </build>
 
@@ -86,5 +104,15 @@
             <version>1.13</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+           <groupId>org.ow2.asm</groupId>
+           <artifactId>asm</artifactId>
+            <version>6.2</version>
+       </dependency>
+       <dependency>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+          <version>2.4.0-b180725.0427</version>
+       </dependency>
     </dependencies>
 </project>

openrouteservice/pom.xml

@@ -27,6 +27,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
+    <prerequisites>
+      <!-- Java 11 upgrade -->
+      <maven>3.0</maven>
+    </prerequisites>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.heigit.ors</groupId>
     <artifactId>openrouteservice</artifactId>
@@ -44,6 +48,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <project.timestamp>${maven.build.timestamp}</project.timestamp>
         <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ss'Z'</maven.build.timestamp.format>
+        <maven.compiler.target>1.8</maven.compiler.target>
     </properties>
     <scm>
         <url>[email protected]:GIScience/openrouteservice.git</url>
@@ -85,6 +90,14 @@
         </testResources>
 
         <plugins>
+            <plugin>
+              <!-- Java 11 upgrade -->
+              <groupId>org.codehaus.mojo</groupId>
+              <artifactId>versions-maven-plugin</artifactId>
+              <configuration>
+                <generateBackupPoms>false</generateBackupPoms>
+              </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
@@ -106,15 +119,15 @@
             </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.3</version>
+                <version>3.8.1</version>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
                 </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>2.6</version>
+                <version>3.2.3</version>
                 <configuration>
                     <warSourceDirectory>WebContent</warSourceDirectory>
                     <webXml>WebContent/WEB-INF/web.xml</webXml>
@@ -155,26 +168,27 @@
             </plugin>
             <plugin><!-- clean up from war:inplace  -->
                 <artifactId>maven-clean-plugin</artifactId>
-                <version>2.5</version>
+                <version>3.1.0</version>
                 <configuration>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>
-                <version>2.8.2</version>
+                <version>3.0.0-M1</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>2.6</version>
+                <version>3.2.0</version>
             </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.22.0</version>
                 <configuration>
-                    <argLine>-Duser.language=en -Duser.region=US</argLine>
+                    <argLine>-Duser.language=en -Duser.region=US -Dillegal-access=permit</argLine>
                 </configuration>
             </plugin>
         </plugins>
@@ -190,6 +204,25 @@
     </repositories>
 
     <dependencies>
+        <dependency>
+            <!-- Java 11 upgrade -->
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>1.3.2</version>
+        </dependency>
+        <dependency>
+            <!-- Java 11 upgrade -->
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.3.1</version>
+        </dependency>
+        <dependency>
+            <!-- Java 11 upgrade -->
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-compress</artifactId>