Merge pull request #23 from rwth-acis/las2peer-1.1.0

las2peer 1.1.0

.classpath

@@ -3,8 +3,8 @@
 	<classpathentry kind="src" path="src/main"/>
 	<classpathentry kind="src" path="src/test"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="lib/junit-4.12.jar"/>
+	<classpathentry kind="lib" path="lib/junit-4.13.1.jar"/>
 	<classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/>
-	<classpathentry kind="lib" path="lib/las2peer-bundle-0.8.3.jar"/>
+	<classpathentry kind="lib" path="lib/las2peer-bundle-1.1.0.jar"/>
 	<classpathentry kind="output" path="output"/>
 </classpath>

.travis.yml

@@ -1,6 +1,10 @@
 language: java
 jdk:
-  - openjdk8
+  - openjdk14
+before_install:
+  - wget http://archive.apache.org/dist/ant/binaries/apache-ant-1.10.7-bin.tar.gz
+  - tar xvfvz apache-ant-1.10.7-bin.tar.gz
+  - export PATH=`pwd`/apache-ant-1.10.7/bin:$PATH
 install:
   - sudo apt-get install -y ant ant-optional
 sudo: false

README.md

@@ -23,11 +23,7 @@ Please follow the instructions of this ReadMe to setup your basic service develo
 
 ### Java
 
-las2peer uses **Java 8**.
-
-If you use an Oracle Java version, please make sure you have **Java 8u162** or later installed, so that the Java Cryptography Extension (JCE) is enabled.
-Otherwise, you have to enable it manually.
-Each las2peer node performs an encryption self-test on startup.
+las2peer uses **Java 14**.
 
 ### Build Dependencies
 

build.xml

@@ -52,10 +52,10 @@
 	   <echo>Java/JVM version: ${ant.java.version}</echo> 
 	   <echo>Java/JVM detail version: ${java.version}</echo> 
 		<fail message="Unsupported Java version: ${ant.java.version}. 
-		  Make sure that the Java version is 1.8.">
+		  Make sure that the Java version is 14.">
 		  <condition>
 		  	<not>
-				<equals arg1="${ant.java.version}" arg2="1.8"/>
+				<equals arg1="${ant.java.version}" arg2="14"/>
 			</not>
 		  </condition>
 		</fail>

etc/ant_configuration/service.properties

@@ -2,4 +2,4 @@ service.version=1.0.0
 service.name=i5.las2peer.services.templateService
 service.path=i5/las2peer/services/templateService
 service.class=TemplateService
-core.version=0.8.3
+core.version=1.1.0

etc/ivy/ivy.xml

@@ -12,9 +12,9 @@
         <!-- las2peer core -->
         <dependency org="i5" name="las2peer-bundle" rev="${core.version}" changing="true" conf="platform->*" />
         <!-- JUnit -->
-        <dependency org="junit" name="junit" rev="4.12" conf="platform->*" />
+        <dependency org="junit" name="junit" rev="4.13.1" conf="platform->*" />
         <!-- Jacoco -->
-        <dependency org="org.jacoco" name="org.jacoco.ant" rev="0.8.5" conf="platform->default" />
+        <dependency org="org.jacoco" name="org.jacoco.ant" rev="0.8.6" conf="platform->default" />
 
         <!-- service dependencies -->
         <!-- Add service dependencies here -->