Skip to content

Commit

Permalink
Upgrade & cleanup dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Brutus5000 committed Apr 6, 2020
1 parent 2273323 commit 79d43e8
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 26 deletions.
29 changes: 10 additions & 19 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -201,12 +201,6 @@ configurations.all {

build.dependsOn inttest

dependencyManagement {
dependencies {
dependency("org.mockito:mockito-core:${mockitoVersion}")
}
}

test {
useJUnitPlatform()
testLogging {
Expand All @@ -215,9 +209,9 @@ test {
}

dependencies {
implementation("org.projectlombok:lombok:${lombokVersion}")
annotationProcessor("org.projectlombok:lombok:${lombokVersion}")
testAnnotationProcessor("org.projectlombok:lombok:${lombokVersion}")
implementation("org.projectlombok:lombok")
annotationProcessor("org.projectlombok:lombok")
testAnnotationProcessor("org.projectlombok:lombok")
annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
testAnnotationProcessor("org.springframework.boot:spring-boot-configuration-processor")

Expand All @@ -243,16 +237,14 @@ dependencies {
implementation("com.google.guava:guava:${guavaVersion}")
implementation("io.springfox:springfox-swagger-ui:${swaggerVersion}")
implementation("io.springfox:springfox-swagger2:${swaggerVersion}")
implementation("io.swagger:swagger-core:${swaggerCoreVersion}")
implementation("io.swagger.core.v3:swagger-core:${swaggerCoreVersion}")
implementation("javax.inject:javax.inject:${javaxInjectVersion}")
implementation("com.yahoo.elide:elide-core:${elideVersion}")
implementation("com.yahoo.elide:elide-swagger:${elideVersion}")
implementation("com.yahoo.elide:elide-datastore-hibernate5:${elideVersion}")

implementation("org.luaj:luaj-jse:${luajVersion}")
implementation("com.github.micheljung:nocatch:${nocatchVersion}")
implementation("junit-addons:junit-addons:${junitAddonsVersion}")
implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${jacksonDatatypeJsr310Version}")
implementation("org.apache.commons:commons-compress:${commonsCompressVersion}")
implementation("org.json:json:${jsonVersion}")

Expand All @@ -264,17 +256,16 @@ dependencies {
testImplementation("org.springframework.boot:spring-boot-starter-test")
testImplementation("org.springframework.restdocs:spring-restdocs-mockmvc")
testImplementation("org.springframework.security:spring-security-test")
testImplementation("org.junit.jupiter:junit-jupiter:${jUnit5Version}")
testImplementation("org.junit.jupiter:junit-jupiter-params:${jUnit5Version}")
testImplementation("org.mockito:mockito-junit-jupiter:${mockitoVersion}")
testImplementation("org.junit.jupiter:junit-jupiter-migrationsupport:${jUnit5Version}")
testRuntimeOnly("org.junit.vintage:junit-vintage-engine:${jUnit5Version}")
testImplementation("org.junit.jupiter:junit-jupiter")
testImplementation("org.junit.jupiter:junit-jupiter-params")
testImplementation("junit-addons:junit-addons:${junitAddonsVersion}")
testImplementation("org.mockito:mockito-junit-jupiter")
testImplementation("org.junit.jupiter:junit-jupiter-migrationsupport")
testRuntimeOnly("org.junit.vintage:junit-vintage-engine")
testImplementation("com.h2database:h2:${h2Version}")
testImplementation("com.jayway.jsonpath:json-path:${jsonPath}")
testImplementation("com.jayway.jsonpath:json-path-assert:${jsonPathAssert}")

codacy("com.github.codacy:codacy-coverage-reporter:${codacyCoverageReporterVersion}")
}

ext["mockito.version"] = "${mockitoVersion}"
ext["junit-jupiter.version"] = "${jUnit5Version}"
11 changes: 4 additions & 7 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,27 +1,25 @@
profile=dev
springBootVersion=2.2.6.RELEASE
javaxInjectVersion=1
elideVersion=4.5.14
elideVersion=4.5.16
mysqlConnectorVersion=8.0.18
propdepsVersion=0.0.7
swaggerVersion=2.9.2
swaggerCoreVersion=1.5.21
swaggerCoreVersion=2.1.2
coverallsGradlePluginVersion=2.8.3
springSecurityJwtVersion=1.0.11.RELEASE
springSecurityOauth2AutoConfigureVersion=2.2.3.RELEASE
springSecurityOauth2AutoConfigureVersion=2.2.6.RELEASE
springSecurityOauth2Version=2.3.6.RELEASE
guavaVersion=28.2-jre
jetbrainsAnnotationsVersion=13.0
springBootAdminClientVersion=2.2.1
springBootAdminClientVersion=2.2.2
luajVersion=3.0.1
nocatchVersion=1.1
junitAddonsVersion=1.4
githubApiVersion=1.84
jgitVersionn=4.5.0.201609210915-r
fafCommonsVersion=4ca1f756
h2Version=1.4.193
jacksonDatatypeJsr310Version=2.9.7
mockitoVersion=2.23.4
lutungVersion=0.0.7
commonsCompressVersion=1.19
jsonPath=2.2.0
Expand All @@ -30,5 +28,4 @@ jsonapiConverterVersion=0.10
codacyCoverageReporterVersion=6.2.0
jsonVersion=20180813
javaxInterceptorApiVersion=1.2
lombokVersion=1.18.10
jUnit5Version=5.5.2

0 comments on commit 79d43e8

Please sign in to comment.