christoph/lecture-professional-software-development
1
Fork 0
Code Activity

fix conflicts

Browse Source
This commit is contained in:
killerber4t
2020-03-04 13:44:27 +01:00
parent ffabc5ce53
commit 89196b738a
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
build.gradle
View File

@ -13,12 +13,9 @@ spotbugs{
reportLevel = "high" reportLevel = "high"
toolVersion = '4.0.0-RC1' toolVersion = '4.0.0-RC1'
} }
<<<<<<< Updated upstream
tasks.withType(com.github.spotbugs.SpotBugsTask) {
=======
tasks.withType(SpotBugsTask) { tasks.withType(SpotBugsTask) {
>>>>>>> Stashed changes
reports { reports {
html { html {
enabled = true enabled = true
@ -59,14 +56,9 @@ dependencies {
implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.boot:spring-boot-starter-security'
implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-web'
<<<<<<< Updated upstream
implementation 'org.keycloak:keycloak-spring-boot-starter:9.0.0'
implementation 'org.keycloak.bom:keycloak-adapter-bom:3.3.0.Final'
=======
implementation 'mops:styleguide:2.0.0' implementation 'mops:styleguide:2.0.0'
compile group: 'io.springfox', name: 'springfox-swagger2', version: '2.7.0' compile group: 'io.springfox', name: 'springfox-swagger2', version: '2.7.0'
compile group: 'io.springfox', name: 'springfox-swagger-ui', version: '2.7.0' compile group: 'io.springfox', name: 'springfox-swagger-ui', version: '2.7.0'
>>>>>>> Stashed changes
compileOnly 'org.projectlombok:lombok' compileOnly 'org.projectlombok:lombok'
developmentOnly 'org.springframework.boot:spring-boot-devtools' developmentOnly 'org.springframework.boot:spring-boot-devtools'
runtimeOnly 'com.h2database:h2' runtimeOnly 'com.h2database:h2'