Merge pull request #8 from rwth-acis/java17

Java17

.github/workflows/docker-CI.yml

@@ -2,7 +2,7 @@ name: Docker Build and Push
 
 on:
   push:
-    branches: [ master, develop, gradle ]
+    branches: [ master, develop, java17 ]
 
 jobs:
   build:

Dockerfile

@@ -1,8 +1,5 @@
-FROM adoptopenjdk/openjdk14:x86_64-debian-jdk-14.0.2_12
-#FROM openjdk:8-jdk
-ENV LAS2PEER_PORT=9011
-
 # tmitocar dependencies (jq, ruby, coreutils)
+FROM openjdk:17.0.1-jdk-buster
 RUN apt-get update && apt-get install -y default-mysql-client ant jq build-essential libffi-dev ruby ruby-bundler dos2unix coreutils curl tzdata git gcc cmake libpng-dev graphviz wkhtmltopdf pandoc rsync poppler-utils
 
 RUN git clone --recursive https://github.com/kornelski/pngquant.git
@@ -33,7 +30,8 @@ RUN dos2unix tmitocar/feedback.sh
 RUN chmod +x /src/docker-entrypoint.sh
 RUN dos2unix /src/docker-entrypoint.sh
 RUN dos2unix /src/gradle.properties
+RUN dos2unix gradlew
 RUN chmod +x gradlew && ./gradlew build --exclude-task test
 
 EXPOSE $LAS2PEER_PORT
-ENTRYPOINT ["/src/docker-entrypoint.sh"]
+ENTRYPOINT ["/src/docker-entrypoint.sh"]

docker-entrypoint.sh

@@ -51,7 +51,7 @@ set_in_service_config lrsAuthTokenDresden ${LRS_AUTH_TOKEN_DRESDEN}
 
 # prevent glob expansion in lib/*
 set -f
-LAUNCH_COMMAND='java -cp lib/* i5.las2peer.tools.L2pNodeLauncher -s service -p '"${LAS2PEER_PORT} ${SERVICE_EXTRA_ARGS}"
+LAUNCH_COMMAND='java -cp lib/* --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED i5.las2peer.tools.L2pNodeLauncher -s service -p '"${LAS2PEER_PORT} ${SERVICE_EXTRA_ARGS}"
 if [[ ! -z "${BOOTSTRAP}" ]]; then
     LAUNCH_COMMAND="${LAUNCH_COMMAND} -b ${BOOTSTRAP}"
 fi

gradle.properties

@@ -1,8 +1,8 @@
-core.version=1.1.2
+core.version=1.2-SNAPSHOT
 service.name=i5.las2peer.services.tmitocar
 service.class=TmitocarService
 service.version=1.0.0
-java.version=14
+java.version=17
 
 las2peer_user1.name=alice
 las2peer_user1.password=pwalice

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

las2peer-tmitocar-service/build.gradle

@@ -6,12 +6,16 @@ plugins {
 
 repositories {
     // Use JCenter for resolving dependencies.
-    jcenter()
+    mavenCentral()
 
     // DBIS Archiva
     maven {
         url "https://archiva.dbis.rwth-aachen.de:9911/repository/internal/"
     }
+
+    maven {
+        url "https://archiva.dbis.rwth-aachen.de:9911/repository/snapshots/"
+    }
 }
 
 dependencies {
@@ -20,18 +24,18 @@ dependencies {
 
     // las2peer bundle which is not necessary in the runtime path
     // compileOnly will be moved into the lib dir afterwards
-    compileOnly "i5:las2peer-bundle:${project.property('core.version')}"
+    implementation "i5:las2peer-bundle:${project.property('core.version')}"
 
-    compileOnly "org.jacoco:org.jacoco.ant:0.8.5"
-    compileOnly "net.minidev:json-smart:1.3.1"
-	compileOnly "org.apache.pdfbox:pdfbox-ant:1.8.16"
+    implementation "org.jacoco:org.jacoco.ant:0.8.5"
+    implementation "net.minidev:json-smart:1.3.1"
+	implementation "org.apache.pdfbox:pdfbox-ant:1.8.16"
 
      //   javax.websocket-api;version="1.1", jslack;version="1.8.1", rocketchat-common;version="0.7.1, rocketchat-core;version="0.7.1, rocketchat-livechat;version="0.7.1"
 }
 
 configurations {
     // This ensures las2peer is available in the tests, but won't be bundled
-    testCompile.extendsFrom compileOnly
+    testImplementation.extendsFrom implementation
 }
 
 jar {
@@ -55,14 +59,15 @@ application {
     archivesBaseName = group
 
     version = "${project.property('service.version')}"
-    mainClassName = "i5.las2peer.tools.L2pNodeLauncher"
+    mainClass.set("i5.las2peer.tools.L2pNodeLauncher")
     sourceCompatibility = "${project.property('java.version')}"
     targetCompatibility = "${project.property('java.version')}"
 }
 
 // put all .jar files into export/jars folder
 tasks.withType(Jar) {
-    destinationDir = file("$projectDir/export/jars")
+    duplicatesStrategy = 'include'
+    destinationDirectory = file("$projectDir/export/jars")
 }
 
 javadoc {
@@ -110,20 +115,26 @@ build.dependsOn copyToLib
 
 task startscripts {
     new File("$rootDir/bin", "start_network.sh").text = """#!/bin/bash
+
 # this script is autogenerated by 'gradle startscripts'
 # it starts a las2peer node providing the service '${project.property('service.name')}.${project.property('service.class')}' of this project
 # pls execute it from the root folder of your deployment, e. g. ./bin/start_network.sh
-java -cp "lib/*" i5.las2peer.tools.L2pNodeLauncher --port 9011 --service-directory service uploadStartupDirectory startService\\(\\'${project.property('service.name')}.${project.property('service.class')}@${project.property('service.version')}\\'\\) startWebConnector interactive
+
+java -cp "lib/*" --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED i5.las2peer.tools.L2pNodeLauncher --port 9011 --service-directory service uploadStartupDirectory startService\\(\\'${project.property('service.name')}.${project.property('service.class')}@${project.property('service.version')}\\'\\) startWebConnector interactive
 """ 
     new File("$rootDir/bin", "start_network.bat").text = """:: this script is autogenerated by 'gradle startscripts'
 :: it starts a las2peer node providing the service '${project.property('service.name')}.${project.property('service.class')}' of this project
 :: pls execute it from the bin folder of your deployment by double-clicking on it
+
 %~d0
 cd %~p0
 cd ..
 set BASE=%CD%
 set CLASSPATH="%BASE%/lib/*;"
-java -cp %CLASSPATH% i5.las2peer.tools.L2pNodeLauncher --port 9011 --service-directory service uploadStartupDirectory startService('${project.property('service.name')}.${project.property('service.class')}@${project.property('service.version')}') startWebConnector interactive
+set ADD_OPENS=--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED
+
+java -cp %CLASSPATH% %ADD_OPENS% i5.las2peer.tools.L2pNodeLauncher --port 9011 --service-directory service uploadStartupDirectory startService('${project.property('service.name')}.${project.property('service.class')}@${project.property('service.version')}') startWebConnector interactive
+
 pause
 """
 }