Merge pull request #29 from rwth-acis/1.2.0

1.2.0

.gitattributes

@@ -0,0 +1,6 @@
+#
+# https://help.github.com/articles/dealing-with-line-endings/
+#
+# These are explicitly windows files and should use crlf
+*.bat           text eol=crlf
+

.github/workflows/docker-CI.yml

@@ -5,7 +5,26 @@ on:
     branches: [ master, develop ]
 
 jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 17
+      uses: actions/setup-java@v1
+      with:
+        java-version: 17
+    - name: Set up MySQL
+      run: |
+        sudo /etc/init.d/mysql start
+        mysql -e 'CREATE DATABASE LAS2PEERMON;' -uroot -proot
+    - name: Create db tables
+      run: mysql -u root -proot LAS2PEERMON < etc/create_database.sql
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+    - name: Run tests with Gradle
+      run: ./gradlew test
   build:
+    needs: test
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2

.gitignore

@@ -1,12 +1,23 @@
 /tmp
 /node-storage
 /log
-/export
+/mobsos-data-processing/export
 /output
 /lib
 /etc/ivy/ivy.jar
 /service
-/bin
-/bin/*
 .DS_Store
-.DS_Store*
+.DS_Store*
+etc/launcher-configuration.ini
+/.idea/
+*.iml
+# Ignore Gradle project-specific cache directory
+.gradle
+
+# Ignore Gradle build output directory
+build
+
+export
+mobsos-data-processing/output
+etc/launcher-configuration.ini
+app/output/*

.project

@@ -6,7 +6,7 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
@@ -18,7 +18,7 @@
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
 	<filteredResources>
 		<filter>

Dockerfile

@@ -1,17 +1,19 @@
-FROM openjdk:14-jdk-alpine
+FROM openjdk:17-jdk-alpine
 
 ENV LAS2PEER_PORT=9011
 
-RUN apk add --update bash mysql-client apache-ant curl && rm -f /var/cache/apk/*
+RUN apk add --update bash mysql-client curl && rm -f /var/cache/apk/*
 RUN addgroup -g 1000 -S las2peer && \
     adduser -u 1000 -S las2peer -G las2peer
 
 COPY --chown=las2peer:las2peer . /src
 WORKDIR /src
 
+RUN dos2unix docker-entrypoint.sh
+
 # run the rest as unprivileged user
 USER las2peer
-RUN ant jar
+RUN chmod +x gradlew && ./gradlew build --exclude-task test
 
 EXPOSE $LAS2PEER_PORT
 ENTRYPOINT ["/src/docker-entrypoint.sh"]

README.md

@@ -1,6 +1,6 @@
 # MobSOS Data Processing
 
-[![Build Status](https://travis-ci.org/rwth-acis/mobsos-data-processing.svg?branch=master)](https://travis-ci.org/rwth-acis/mobsos-data-processing) [![codecov](https://codecov.io/gh/rwth-acis/mobsos-data-processing/branch/master/graph/badge.svg)](https://codecov.io/gh/rwth-acis/mobsos-data-processing) [![Join the chat at https://gitter.im/rwth-acis/mobsos](https://badges.gitter.im/rwth-acis/mobsos.svg)](https://gitter.im/rwth-acis/mobsos?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Build Status](https://github.com/rwth-acis/mobsos-data-processing/workflows/Java%20CI%20with%20Gradle/badge.svg?branch=master)](https://github.com/rwth-acis/mobsos-data-processing/actions?query=workflow%3A%22Java+CI+with+Gradle%22+branch%3Amaster) [![codecov](https://codecov.io/gh/rwth-acis/mobsos-data-processing/branch/master/graph/badge.svg)](https://codecov.io/gh/rwth-acis/mobsos-data-processing) [![Join the chat at https://gitter.im/rwth-acis/mobsos](https://badges.gitter.im/rwth-acis/mobsos.svg)](https://gitter.im/rwth-acis/mobsos?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 This service is part of the MobSOS monitoring concept and processes incoming monitoring data.
 
@@ -17,7 +17,7 @@ After that, configure the [property](etc/i5.las2peer.services.mobsos.dataProcess
 Execute the following command on your shell:
 
 ```shell
-ant all
+./gradlew build
 ```
 
 ### Start