Merge pull request #4 from hsu-aut/develop

Fixed dependency chaos
CaSkade-Automation · Dec 4, 2021 · 08b26cc · 08b26cc
2 parents 3498b6e + 9ab3438
commit 08b26cc
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 9 deletions.
diff --git a/cli/pom.xml b/cli/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>de.hsu-hh.aut.mtp2skill</groupId>
 		<artifactId>mtp2skill-parent</artifactId>
-		<version>1.0.0</version>
+		<version>1.0.1</version>
 	</parent>
 
 	<artifactId>mtp2skill-cli</artifactId>
@@ -19,8 +19,8 @@
 			<version>1.4</version>
 		</dependency>
 		<dependency>
-			<groupId>de.hsu-hh.ifa.mtp-mapping</groupId>
-			<artifactId>lib</artifactId>
+			<groupId>de.hsu-hh.aut.mtp2skill</groupId>
+			<artifactId>mtp2skill-lib</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 	</dependencies>

diff --git a/lib/pom.xml b/lib/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>de.hsu-hh.aut.mtp2skill</groupId>
 		<artifactId>mtp2skill-parent</artifactId>
-		<version>1.0.0</version>
+		<version>1.0.1</version>
 	</parent>
 
 	<artifactId>mtp2skill-lib</artifactId>

diff --git a/lib/src/main/java/mapping/MtpToSkillMapper.java b/lib/src/main/java/mapping/MtpToSkillMapper.java
@@ -32,7 +32,10 @@ public class MtpToSkillMapper {
 	 * @return Skill ontology in turtle syntax
 	 */
 	public String executeMapping(String mtpFilePath) {
-
+
+		System.out.println("Started mapping of " + mtpFilePath);
+		long start = System.currentTimeMillis();
+
 		// 1. Execute RML mapping
 		RmlMapper rmlMapper = new RmlMapper();
 		String rmlMappingResult = rmlMapper.executeRmlMapping(mtpFilePath);
@@ -42,6 +45,10 @@ public String executeMapping(String mtpFilePath) {
 
 		// 3. Combine rml mapping result with state machines
 		String mappingResult = rmlMappingResult + "\n" + stateMachines;
+
+		long end = System.currentTimeMillis();
+		long mappingDuration = (end - start) / 1000;
+		System.out.println("Finished mapping in " + mappingDuration + " seconds.");
 		return mappingResult;
 	}
 

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>de.hsu-hh.aut.mtp2skill</groupId>
 	<artifactId>mtp2skill-parent</artifactId>
-	<version>1.0.0</version>
+	<version>1.0.1</version>
 
 	<packaging>pom</packaging>
 

diff --git a/rest-api/pom.xml b/rest-api/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>de.hsu-hh.aut.mtp2skill</groupId>
 		<artifactId>mtp2skill-parent</artifactId>
-		<version>1.0.0</version>
+		<version>1.0.1</version>
 	</parent>
 
 	<artifactId>mtp2skill-rest-api</artifactId>
@@ -19,8 +19,8 @@
 			<version>2.9.3</version>
 		</dependency>
 		<dependency>
-			<groupId>de.hsu-hh.ifa.mtp-mapping</groupId>
-			<artifactId>lib</artifactId>
+			<groupId>de.hsu-hh.aut.mtp2skill</groupId>
+			<artifactId>mtp2skill-lib</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 	</dependencies>