diff --git a/build.gradle b/build.gradle index 6be90f7..c4fcd20 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,5 @@ apply plugin: "java-library" apply plugin: "groovy" -apply plugin: 'maven' apply plugin: 'jacoco' apply plugin: 'maven-publish' @@ -14,16 +13,16 @@ repositories { dependencies { implementation("org.slf4j:slf4j-api:${slf4jVersion}") - api('com.google.code.gson:gson:2.8.7') - api('com.squareup.okhttp3:okhttp:4.9.1') + api('com.google.code.gson:gson:2.8.9') + api('com.squareup.okhttp3:okhttp:4.9.3') testImplementation("org.slf4j:slf4j-simple:${slf4jVersion}") - testImplementation('com.squareup.okhttp3:mockwebserver:4.9.1') - testCompile("org.codehaus.groovy:groovy-all:${groovyVersion}") - testCompile("org.spockframework:spock-core:${spockVersion}") { + testImplementation('com.squareup.okhttp3:mockwebserver:4.9.3') + testImplementation("org.codehaus.groovy:groovy-all:${groovyVersion}") + testImplementation("org.spockframework:spock-core:${spockVersion}") { exclude group: "org.codehaus.groovy" } - testCompile('com.athaydes:spock-reports:2.0-groovy-3.0') { + testImplementation('com.athaydes:spock-reports:2.1.1-groovy-3.0') { transitive = false // this avoids affecting your version of Groovy/Spock } @@ -41,14 +40,14 @@ publishing { } jacoco { - toolVersion = "0.8.6" + toolVersion = "0.8.7" } jacocoTestReport { group = "verification" reports { - xml.enabled false - csv.enabled false + xml.required = false + csv.required = false html.destination file("${buildDir}/reports/coverage") } afterEvaluate { diff --git a/gradle.properties b/gradle.properties index c769276..e2deff0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,8 @@ id = libpaqle group = biz.nellemann.libs -version = 1.0.2 +version = 1.0.3 licenses = ['APACHE-2.0'] // or something else -groovyVersion = 3.0.8 +groovyVersion = 3.0.9 slf4jVersion = 1.7.32 spockVersion = 2.0-groovy-3.0 siteUrl = https://bitbucket.org/mnellemann/libpaqle diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ef9a9e0..84d1f85 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/biz/nellemann/libpaqle/Paqle.java b/src/main/java/biz/nellemann/libpaqle/Paqle.java index 81f91f4..3728153 100644 --- a/src/main/java/biz/nellemann/libpaqle/Paqle.java +++ b/src/main/java/biz/nellemann/libpaqle/Paqle.java @@ -20,7 +20,6 @@ package biz.nellemann.libpaqle; import biz.nellemann.libpaqle.pojo.PaqleResponse; -import java.io.IOException; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonSyntaxException; @@ -51,7 +50,7 @@ public class Paqle { } - protected String get(String url) throws IOException, Exception { + protected String get(String url) throws Exception { String credential = Credentials.basic(basicUsername, basicPassword); @@ -77,7 +76,7 @@ public class Paqle { protected String getJson(String vatNumber) throws Exception { //String cvrIds = String.join(",", vatNumbers); - String jsonText = get(baseUrl + "/entities?customer=" + company + "&news&vatNumbers=" + "DK"+vatNumber); + String jsonText = get(baseUrl + "/entities?customer=" + company + "&news&vatNumbers=" + "DK" + vatNumber); log.debug("getJson() response: " + jsonText); return jsonText; }