diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ed689045d6b058502c709730d081065301a201a2..5e439f52bae4759c1988760bd143b30d622ba5fd 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 0000000000000000000000000000000000000000..85bc9353c5864e50facdef6fd04691aa20c832a4 --- /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 bcd945afef2e19595153422a537fbca5abb985c1..8a9f1d4084191cfd245ec06e9e50ffd1bb5088e3 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/crm-example/pom.xml b/crm-example/pom.xml index 9f978e06e4704796084fad9c4719075311f2144e..1a2835f5171efc65c897b87cccaa042b582eb835 100644 --- a/crm-example/pom.xml +++ b/crm-example/pom.xml @@ -11,7 +11,7 @@ </parent> <artifactId>crm-example</artifactId> - <version>1.0.0</version> + <version>1.0.1</version> <packaging>jar</packaging> <name>CRM EXAMPLE</name> @@ -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> @@ -63,24 +61,24 @@ </dependencies> <build> - <plugins> - <plugin> - <groupId>net.alchim31.maven</groupId> - <artifactId>scala-maven-plugin</artifactId> - <version>3.1.3</version> - <executions> - <execution> - <goals> - <goal>compile</goal> - <goal>testCompile</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> + <plugins> + <plugin> + <groupId>net.alchim31.maven</groupId> + <artifactId>scala-maven-plugin</artifactId> + <version>3.1.3</version> + <executions> + <execution> + <goals> + <goal>compile</goal> + <goal>testCompile</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> <pluginManagement> <plugins> - <!-- JUNIT --> + <!-- JUNIT --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> diff --git a/crm-example/src/main/resources/application.properties b/crm-example/src/main/resources/application.properties deleted file mode 100644 index c915bcfe24c7549723325d052925af4372e6bb3a..0000000000000000000000000000000000000000 --- a/crm-example/src/main/resources/application.properties +++ /dev/null @@ -1,14 +0,0 @@ -# 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 diff --git a/crm-example/src/main/resources/libs/conflictresolver-1.0.0.jar b/crm-example/src/main/resources/libs/conflictresolver-1.0.0.jar deleted file mode 100644 index 83ffb2dad102794a6663ba11f1df2d7d1e6a256e..0000000000000000000000000000000000000000 Binary files a/crm-example/src/main/resources/libs/conflictresolver-1.0.0.jar and /dev/null differ diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..d2804f4731eda38d315540dc84acaec6c3ffdfba --- /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>