Merge pull request #22 from rwth-acis/release_v1.1.0

Release v1.1.0
rwth-acis · Apr 27, 2021 · 6645a24 · 6645a24
2 parents 44edf07 + a399307
commit 6645a24
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,11 +1,14 @@
 language: java
 jdk:
-  - openjdk8
+  - openjdk14
 install:
   - sudo apt-get install -y ant ant-optional
 services:
   - mysql
-script: 'ant all'
+script: 
+  - export JAVA_HOME=~/openjdk14
+  - export JDK_HOME=~/openjdk14
+  - ant all
 sudo: required
 before_script:
   - bash .travis.install-mysql-5.7.sh

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:8-jdk-alpine
+FROM openjdk:14-jdk-alpine
 
 ENV LAS2PEER_PORT=9011
 

diff --git a/etc/ant_configuration/service.properties b/etc/ant_configuration/service.properties
@@ -1,4 +1,4 @@
-service.version=1.0.1
+service.version=1.1.0
 service.name=i5.las2peer.services.mobsos.dataProcessing
 service.path=i5/las2peer/services/mobsos/dataProcessing
 service.class=MobSOSDataProcessingService

diff --git a/etc/ivy/ivy.xml b/etc/ivy/ivy.xml
@@ -9,7 +9,7 @@
         <artifact type="jar" ext="jar" conf="*" />
     </publications>
     <dependencies>
-        <dependency org="i5" name="las2peer-bundle" rev="1.0.1" conf="platform->*" />
+        <dependency org="i5" name="las2peer-bundle" rev="1.1.1" conf="platform->*" />
         <dependency org="junit" name="junit" rev="4.12" conf="platform->*" />
         <dependency org="org.jacoco" name="org.jacoco.ant" rev="0.8.5" conf="platform->*" />
 

diff --git a/src/main/i5/las2peer/services/mobsos/dataProcessing/MobSOSDataProcessingService.java b/src/main/i5/las2peer/services/mobsos/dataProcessing/MobSOSDataProcessingService.java
@@ -249,10 +249,13 @@ else if (Math.abs(message.getEvent().getCode()) >= 7000
 				if (message.getRemarks() != null) {
 					String serviceClassName = monitoredServices.get(message.getSourceAgentId());
 					if (sendToLRS && serviceClassName != null
-							&& (serviceClassName
-									.contains("i5.las2peer.services.moodleDataProxyService.MoodleDataProxyService@1.2.0")
+							&& (serviceClassName.contains(
+									"i5.las2peer.services.moodleDataProxyService.MoodleDataProxyService@1.3.0")
 									|| serviceClassName.contains(
-											"i5.las2peer.services.onyxDataProxyService.OnyxDataProxyService@1.0.0"))) {
+											"i5.las2peer.services.onyxDataProxyService.OnyxDataProxyService@1.0.0")
+									|| serviceClassName.contains(
+											"i5.las2peer.services.AssessmentHandler.AssessmentHandlerService@1.0.0")
+									|| serviceClassName.contains("i5.las2peer.services.tmitocar"))) {
 						String statement = message.getRemarks();
 						if (statement.contains("actor") && statement.contains("verb") && statement.contains("object"))
 							xAPIstatements.add(statement);