Update 3rd party dependencies.

This commit is contained in:
Mark Nellemann 2021-12-11 20:19:01 +01:00
parent 82b403d2f9
commit 0bf99fab54
4 changed files with 14 additions and 16 deletions

View File

@ -1,6 +1,5 @@
apply plugin: "java-library" apply plugin: "java-library"
apply plugin: "groovy" apply plugin: "groovy"
apply plugin: 'maven'
apply plugin: 'jacoco' apply plugin: 'jacoco'
apply plugin: 'maven-publish' apply plugin: 'maven-publish'
@ -14,16 +13,16 @@ repositories {
dependencies { dependencies {
implementation("org.slf4j:slf4j-api:${slf4jVersion}") implementation("org.slf4j:slf4j-api:${slf4jVersion}")
api('com.google.code.gson:gson:2.8.7') api('com.google.code.gson:gson:2.8.9')
api('com.squareup.okhttp3:okhttp:4.9.1') api('com.squareup.okhttp3:okhttp:4.9.3')
testImplementation("org.slf4j:slf4j-simple:${slf4jVersion}") testImplementation("org.slf4j:slf4j-simple:${slf4jVersion}")
testImplementation('com.squareup.okhttp3:mockwebserver:4.9.1') testImplementation('com.squareup.okhttp3:mockwebserver:4.9.3')
testCompile("org.codehaus.groovy:groovy-all:${groovyVersion}") testImplementation("org.codehaus.groovy:groovy-all:${groovyVersion}")
testCompile("org.spockframework:spock-core:${spockVersion}") { testImplementation("org.spockframework:spock-core:${spockVersion}") {
exclude group: "org.codehaus.groovy" 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 transitive = false // this avoids affecting your version of Groovy/Spock
} }
@ -41,14 +40,14 @@ publishing {
} }
jacoco { jacoco {
toolVersion = "0.8.6" toolVersion = "0.8.7"
} }
jacocoTestReport { jacocoTestReport {
group = "verification" group = "verification"
reports { reports {
xml.enabled false xml.required = false
csv.enabled false csv.required = false
html.destination file("${buildDir}/reports/coverage") html.destination file("${buildDir}/reports/coverage")
} }
afterEvaluate { afterEvaluate {

View File

@ -1,8 +1,8 @@
id = libpaqle id = libpaqle
group = biz.nellemann.libs group = biz.nellemann.libs
version = 1.0.2 version = 1.0.3
licenses = ['APACHE-2.0'] // or something else licenses = ['APACHE-2.0'] // or something else
groovyVersion = 3.0.8 groovyVersion = 3.0.9
slf4jVersion = 1.7.32 slf4jVersion = 1.7.32
spockVersion = 2.0-groovy-3.0 spockVersion = 2.0-groovy-3.0
siteUrl = https://bitbucket.org/mnellemann/libpaqle siteUrl = https://bitbucket.org/mnellemann/libpaqle

View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists 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 zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

View File

@ -20,7 +20,6 @@
package biz.nellemann.libpaqle; package biz.nellemann.libpaqle;
import biz.nellemann.libpaqle.pojo.PaqleResponse; import biz.nellemann.libpaqle.pojo.PaqleResponse;
import java.io.IOException;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;
import com.google.gson.JsonSyntaxException; 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); String credential = Credentials.basic(basicUsername, basicPassword);
@ -77,7 +76,7 @@ public class Paqle {
protected String getJson(String vatNumber) throws Exception { protected String getJson(String vatNumber) throws Exception {
//String cvrIds = String.join(",", vatNumbers); //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); log.debug("getJson() response: " + jsonText);
return jsonText; return jsonText;
} }