diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml index bb287f4..804ce33 100644 --- a/bitbucket-pipelines.yml +++ b/bitbucket-pipelines.yml @@ -15,4 +15,6 @@ pipelines: - gradle name: Build and Release script: - - bash ./gradlew clean build bintrayUpload + - bash ./gradlew clean build + - shopt -s nullglob ; for file in ${BITBUCKET_CLONE_DIR}/build/libs/*.jar ; do curl -X POST --user "${BB_AUTH_STRING}" "https://api.bitbucket.org/2.0/repositories/${BITBUCKET_REPO_OWNER}/${BITBUCKET_REPO_SLUG}/downloads" --form files=@"${file}" ; done + diff --git a/build.gradle b/build.gradle index 09f3343..c4fcd20 100644 --- a/build.gradle +++ b/build.gradle @@ -1,21 +1,7 @@ -buildscript { - repositories { - jcenter() - } - dependencies { - classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4' - //classpath 'com.bmuschko:gradle-clover-plugin:2.2.3' - } -} - -apply plugin: "idea" apply plugin: "java-library" apply plugin: "groovy" -apply plugin: 'maven' apply plugin: 'jacoco' apply plugin: 'maven-publish' -apply plugin: 'com.jfrog.bintray' -//apply from: "${project.projectDir}/gradle/clover.gradle" sourceCompatibility = 1.8 targetCompatibility = 1.8 @@ -27,16 +13,16 @@ repositories { dependencies { implementation("org.slf4j:slf4j-api:${slf4jVersion}") - api('com.google.code.gson:gson:2.8.5') - api("com.squareup.okhttp3:okhttp:4.1.0") + 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.1.0') - 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:1.6.2' ) { + testImplementation('com.athaydes:spock-reports:2.1.1-groovy-3.0') { transitive = false // this avoids affecting your version of Groovy/Spock } @@ -53,31 +39,15 @@ publishing { } } -bintray { - user = System.getenv('BINTRAY_USER') - key = System.getenv('BINTRAY_KEY') - - override = true - configurations = ['archives'] - pkg { - repo = "libs" - name = "libpaqle" - websiteUrl = siteUrl - vcsUrl = gitUrl - licenses = licenses - publish = true - } -} - jacoco { - toolVersion = "0.8.4" + 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 98574f2..e2deff0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,9 @@ id = libpaqle group = biz.nellemann.libs -version = 1.0.2 +version = 1.0.3 licenses = ['APACHE-2.0'] // or something else -groovyVersion = 2.5.8 -slf4jVersion = 1.7.28 -spockVersion = 1.3-groovy-2.5 +groovyVersion = 3.0.9 +slf4jVersion = 1.7.32 +spockVersion = 2.0-groovy-3.0 siteUrl = https://bitbucket.org/mnellemann/libpaqle gitUrl = https://bitbucket.org/mnellemann/libpaqle.git 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; } diff --git a/src/test/resources/simplelogger.properties b/src/test/resources/simplelogger.properties new file mode 100644 index 0000000..d13c7ee --- /dev/null +++ b/src/test/resources/simplelogger.properties @@ -0,0 +1,6 @@ +org.slf4j.simpleLogger.logFile=System.out +org.slf4j.simpleLogger.showDateTime=true +org.slf4j.simpleLogger.showShortLogName=true +org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss.SSS +org.slf4j.simpleLogger.levelInBrackets=true +#org.slf4j.simpleLogger.defaultLogLevel=debug