Merge branch '33-one-line-correction' into 'dev'
Resolve "One line correction" Closes #33 See merge request sa4-2020/the-sanmarinoes/backend!44
This commit is contained in:
commit
60927fff3b
2 changed files with 2 additions and 11 deletions
|
@ -53,6 +53,7 @@ test:
|
||||||
#Runs a quality check on the code and creates a report on the codes
|
#Runs a quality check on the code and creates a report on the codes
|
||||||
code_quality:
|
code_quality:
|
||||||
stage: code_quality
|
stage: code_quality
|
||||||
|
allow_failure: true
|
||||||
script:
|
script:
|
||||||
- gradle cpdCheck
|
- gradle cpdCheck
|
||||||
artifacts:
|
artifacts:
|
||||||
|
|
10
build.gradle
10
build.gradle
|
@ -4,21 +4,16 @@ plugins {
|
||||||
id "de.aaschmid.cpd" version "3.1"
|
id "de.aaschmid.cpd" version "3.1"
|
||||||
id 'java'
|
id 'java'
|
||||||
}
|
}
|
||||||
|
|
||||||
group = 'ch.usi.inf.sa4.sanmarinoes'
|
group = 'ch.usi.inf.sa4.sanmarinoes'
|
||||||
version = '0.0.1-SNAPSHOT'
|
version = '0.0.1-SNAPSHOT'
|
||||||
sourceCompatibility = '11'
|
sourceCompatibility = '11'
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile 'org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.0.Final'
|
compile 'org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.0.Final'
|
||||||
compile "org.springframework.boot:spring-boot-starter-websocket"
|
compile "org.springframework.boot:spring-boot-starter-websocket"
|
||||||
|
|
||||||
implementation 'org.springframework.boot:spring-boot-starter'
|
implementation 'org.springframework.boot:spring-boot-starter'
|
||||||
|
|
||||||
implementation 'com.sun.mail:javax.mail:1.6.2'
|
implementation 'com.sun.mail:javax.mail:1.6.2'
|
||||||
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
|
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
|
||||||
implementation 'org.springframework.boot:spring-boot-starter-security'
|
implementation 'org.springframework.boot:spring-boot-starter-security'
|
||||||
|
@ -33,22 +28,17 @@ dependencies {
|
||||||
compile 'io.springfox:springfox-swagger-ui:2.9.2'
|
compile 'io.springfox:springfox-swagger-ui:2.9.2'
|
||||||
compile 'org.springframework.boot:spring-boot-configuration-processor'
|
compile 'org.springframework.boot:spring-boot-configuration-processor'
|
||||||
testCompile 'org.springframework.boot:spring-boot-starter-webflux'
|
testCompile 'org.springframework.boot:spring-boot-starter-webflux'
|
||||||
|
|
||||||
implementation('org.springframework.boot:spring-boot-starter-web') {
|
implementation('org.springframework.boot:spring-boot-starter-web') {
|
||||||
exclude group: 'org.springframework.boot', module: 'spring-boot-starter-json'
|
exclude group: 'org.springframework.boot', module: 'spring-boot-starter-json'
|
||||||
}
|
}
|
||||||
|
|
||||||
testImplementation('org.springframework.boot:spring-boot-starter-test') {
|
testImplementation('org.springframework.boot:spring-boot-starter-test') {
|
||||||
exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
|
exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
|
||||||
}
|
}
|
||||||
|
|
||||||
testImplementation 'org.springframework.security:spring-security-test'
|
testImplementation 'org.springframework.security:spring-security-test'
|
||||||
testImplementation 'com.h2database:h2:1.4.200'
|
testImplementation 'com.h2database:h2:1.4.200'
|
||||||
|
|
||||||
// Fixes https://stackoverflow.com/a/60455550
|
// Fixes https://stackoverflow.com/a/60455550
|
||||||
testImplementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.11'
|
testImplementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.11'
|
||||||
}
|
}
|
||||||
|
|
||||||
test {
|
test {
|
||||||
useJUnitPlatform()
|
useJUnitPlatform()
|
||||||
}
|
}
|
Loading…
Reference in a new issue