Update CI

.gitlab-ci.yml

@@ -21,6 +21,6 @@ test:
 deploy:
   image: maven:3.6-jdk-8
   script:
-    - 'mvn deploy -s ci_settings.xml'
+    - 'mvn deploy -s ci-settings.xml'
   only:
     - master

ci-settings.xml

+<settings xmlns="http://maven.apache.org/SETTINGS/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.1.0 http://maven.apache.org/xsd/settings-1.1.0.xsd">
+    <servers>
+        <server>
+            <id>gitlab-maven</id>
+            <configuration>
+                <httpHeaders>
+                    <property>
+                        <name>Job-Token</name>
+                        <value>${env.CI_JOB_TOKEN}</value>
+                    </property>
+                </httpHeaders>
+            </configuration>
+        </server>
+    </servers>
+</settings>

conflictresolver/pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>conflictresolver</artifactId>
-	<version>1.0.0</version>
+	<version>1.0.1</version>
 	<packaging>jar</packaging>
 
 	<name>Role-Model-Sync Conflict-Resolver</name>
@@ -43,7 +43,7 @@
 		<!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-simple -->
 		<dependency>
 			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-nop</artifactId>
+			<artifactId>slf4j-simple</artifactId>
 			<version>1.7.30</version>
 		</dependency>
 	</dependencies>

crm-example/pom.xml

@@ -11,7 +11,7 @@
 	</parent>
 
     <artifactId>crm-example</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.2</version>
     <packaging>jar</packaging>
     <name>CRM EXAMPLE</name>
 
@@ -43,7 +43,7 @@
         <!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-simple -->
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-nop</artifactId>
+            <artifactId>slf4j-simple</artifactId>
             <version>1.7.30</version>
         </dependency>
         <!-- THE CONFLICT RESOLVER INCLUDING RSYNC -->
@@ -51,8 +51,6 @@
             <groupId>de.tudresden.inf.st.rmsc</groupId>
             <artifactId>conflictresolver</artifactId>
             <version>1.0.0</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/src/main/resources/libs/conflictresolver-1.0.0.jar</systemPath>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>

crm-example/src/main/resources/application.properties

-# Needs to be disabled until https://jira.spring.io/browse/SPR-12542 is fixed
-spring.mvc.ignore-default-model-on-redirect=false
-
-spring.jpa.hibernate.ddl-auto=update
-spring.datasource.url=jdbc:h2:~/test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
-spring.datasource.driverClassName=org.h2.Driver
-#spring.datasource.username=sa
-#spring.datasource.password=sa
-spring.jpa.database-platform=org.hibernate.dialect.H2Dialect
-
-# Logging
-logging.file=crm.log
-
-logging.level.root=ERROR

pom.xml

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0               http://maven.apache.org/maven-v4_0_0.xsd">
+     
+  <modelVersion>4.0.0</modelVersion>
+      
+  <artifactId>parent</artifactId>
+      
+  <groupId>de.tudresden.inf.st.rmsc</groupId>
+      
+  <version>1.0.0</version>
+      
+  <packaging>pom</packaging>
+      
+  <modules>
+        
+    <module>conflictresolver</module>
+        
+    <module>crm-example</module>
+      
+  </modules>
+      
+  <repositories>
+            
+    <repository>
+                  
+      <id>gitlab-maven</id>
+                  
+      <url>https://git-st.inf.tu-dresden.de/api/v4/projects/959/packages/maven</url>
+              
+    </repository>
+        
+  </repositories>
+      
+  <distributionManagement>
+            
+    <repository>
+                  
+      <id>gitlab-maven</id>
+                  
+      <url>https://git-st.inf.tu-dresden.de/api/v4/projects/959/packages/maven</url>
+              
+    </repository>
+            
+    <snapshotRepository>
+                  
+      <id>gitlab-maven</id>
+                  
+      <url>https://git-st.inf.tu-dresden.de/api/v4/projects/959/packages/maven</url>
+              
+    </snapshotRepository>
+        
+  </distributionManagement>
+  
+</project>