From ac92344b5382b9be2642cf05b3e9f87e16dc9cb5 Mon Sep 17 00:00:00 2001 From: Jacob Salvi Date: Mon, 16 Mar 2020 14:28:35 +0100 Subject: [PATCH 1/3] added tags: dind --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 948be0a..1b4f442 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,6 +11,8 @@ stages: smarthut_deploy: stage: deploy image: docker:latest + tags: + - dind services: - docker:dind variables: From e8f90c832d9bd298bc0b725e3f579b6aaf4eca29 Mon Sep 17 00:00:00 2001 From: Jacob Salvi Date: Tue, 17 Mar 2020 13:52:30 +0100 Subject: [PATCH 2/3] added tags: dind, also I am an idiot --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1b4f442..b618db2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -53,6 +53,7 @@ test: #Runs a quality check on the code and creates a report on the codes code_quality: stage: code_quality + allow_failure: true script: - gradle cpdCheck artifacts: From 21bf76027fb399317bea1d2e1c12320ddd3cff35 Mon Sep 17 00:00:00 2001 From: Jacob Salvi Date: Tue, 17 Mar 2020 14:13:34 +0100 Subject: [PATCH 3/3] idk --- build.gradle | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/build.gradle b/build.gradle index 8ef658c..3116923 100644 --- a/build.gradle +++ b/build.gradle @@ -1,20 +1,18 @@ plugins { id 'org.springframework.boot' version '2.2.4.RELEASE' id 'io.spring.dependency-management' version '1.0.9.RELEASE' + id "de.aaschmid.cpd" version "3.1" id 'java' } - -group = 'ch.usi.inf.sa4.sanmarinoes.' +group = 'ch.usi.inf.sa4.sanmarinoes' version = '0.0.1-SNAPSHOT' -sourceCompatibility = "11" - +sourceCompatibility = '11' repositories { mavenCentral() - jcenter() } - dependencies { compile 'org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.0.Final' + compile "org.springframework.boot:spring-boot-starter-websocket" implementation 'org.springframework.boot:spring-boot-starter' implementation 'com.sun.mail:javax.mail:1.6.2' implementation 'org.springframework.boot:spring-boot-starter-data-jpa' @@ -30,22 +28,17 @@ dependencies { compile 'io.springfox:springfox-swagger-ui:2.9.2' compile 'org.springframework.boot:spring-boot-configuration-processor' testCompile 'org.springframework.boot:spring-boot-starter-webflux' - implementation('org.springframework.boot:spring-boot-starter-web') { exclude group: 'org.springframework.boot', module: 'spring-boot-starter-json' } - testImplementation('org.springframework.boot:spring-boot-starter-test') { exclude group: 'org.junit.vintage', module: 'junit-vintage-engine' } - testImplementation 'org.springframework.security:spring-security-test' testImplementation 'com.h2database:h2:1.4.200' - // Fixes https://stackoverflow.com/a/60455550 testImplementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.11' } - test { useJUnitPlatform() -} +} \ No newline at end of file