Merge branch 'ors_3.0-upgrade' into ors_4.0

Author: takb

.gitignore

@@ -27,6 +27,8 @@ android/libs/graphhopper-*-android.jar
 !/core/src/test/resources/com/graphhopper/reader/osm/*.pbf
 *.dem
 *.log
+core/TODO*.txt
+core/files/dem*
 /logs
 srtmprovider/
 cgiarprovider/

PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,4 @@
+- [ ] I have clearly marked my changes with comments '// ORS-GH MOD START' and '// ORS-GH MOD END'
+- [ ] I have written a short in-line comment for code changes explaining why the change is required
+- [ ] I have tested the latest version of **openrouteservice** `development` branch against the .jar build of this PR
+- [ ] I have adjusted failing tests in **openrouteservice** API tests

core/pom.xml

@@ -70,6 +70,19 @@
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-xml</artifactId>
         </dependency>
+        <dependency>
+            <groupId>ch.poole</groupId>
+            <artifactId>ConditionalRestrictionParser</artifactId>
+            <!-- TODO ORS: where is this defined? <version>${crparser.version}</version> -->
+            <version>0.3.1</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.poole</groupId>
+            <artifactId>OpeningHoursParser</artifactId>
+            <!-- TODO ORS: where is this defined? <version>${ohparser.version}</version> -->
+            <version>0.25.0</version>
+        </dependency>
+
         <!-- for using CGIAR: elevation data importing via tif files-->
         <dependency>
             <groupId>org.apache.xmlgraphics</groupId>
@@ -101,6 +114,18 @@
             <artifactId>log4j</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.graphhopper</groupId>
+            <artifactId>graphhopper-api</artifactId>
+            <version>${project.parent.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>us.dustinj.timezonemap</groupId>
+            <artifactId>timezonemap</artifactId>
+            <version>3.2</version>
+        </dependency>
+
     </dependencies>
 
     <build>
@@ -146,6 +171,14 @@
                     <failOnUnableToExtractRepoInfo>false</failOnUnableToExtractRepoInfo>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
         </plugins>
 
         <!-- make version available at runtime via version file -->
@@ -170,4 +203,4 @@
             </resource>
         </resources>
     </build>
-</project>
+</project>