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

Merge remote-tracking branch 'origin/csv-import' into feature-orga-csv

Browse Source 
# Conflicts:
#	src/main/java/mops/gruppen2/controller/APIController.java
#	src/main/resources/templates/create.html
This commit is contained in:
XXNitram
2020-03-18 03:23:22 +01:00
parent 179062eed9 2c3531657d
commit 4b1627a993
5 changed files with 40 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build.gradle
View File

@ -68,6 +68,7 @@ dependencies {
implementation 'io.springfox:springfox-swagger2:2.9.2'
implementation 'io.springfox:springfox-swagger-ui:2.9.2'
implementation 'com.github.javafaker:javafaker:1.0.2'
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.10.2'
compileOnly 'org.projectlombok:lombok'
annotationProcessor 'org.projectlombok:lombok'