From 8881ce6bb3d81ff3c6a363c3bbd9b225e0e5bfca Mon Sep 17 00:00:00 2001
From: Tim Kluge <timklge@gmail.com>
Date: Mon, 26 Apr 2021 15:30:25 +0200
Subject: [PATCH] Update CI
---
.gitlab-ci.yml | 2 +-
ci-settings.xml | 16 ++++++++++++
conflictresolver/pom.xml | 2 +-
pom.xml | 54 ++++++++++++++++++++++++++++++++++++++++
4 files changed, 72 insertions(+), 2 deletions(-)
create mode 100644 ci-settings.xml
create mode 100644 pom.xml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ed68904..5e439f5 100644
--- a/.gitlab-ci.yml
+++ b/.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
diff --git a/ci-settings.xml b/ci-settings.xml
new file mode 100644
index 0000000..85bc935
--- /dev/null
+++ b/ci-settings.xml
@@ -0,0 +1,16 @@
+<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>
diff --git a/conflictresolver/pom.xml b/conflictresolver/pom.xml
index bcd945a..8a9f1d4 100644
--- a/conflictresolver/pom.xml
+++ b/conflictresolver/pom.xml
@@ -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>
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..d2804f4
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,54 @@
+<?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>
--
GitLab