If tag is of format (v)#.#.# then it is used as artifact version

Pazus · Pazus · commit bffc0cbd9703 · 2019-03-30T15:56:16.000+03:00
update gradle and junit
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,14 +1,19 @@
 import de.undercouch.gradle.tasks.download.Download
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 
-val deployerJars by configurations.creating
+val tag = System.getenv("TRAVIS_TAG")?.replaceFirst("^v".toRegex(), "")
 
 group = "org.utplsql"
 val mavenArtifactId = "java-api"
-version = "3.1.7-SNAPSHOT"
+val baseVersion = "3.1.7-SNAPSHOT"
+// if build is on tag like 3.1.7 or v3.1.7 then use tag as version replacing leading "v"
+version = if (tag != null && "^[0-9.]+$".toRegex().matches(tag)) tag else baseVersion
 
 val coverageResourcesVersion = "1.0.1"
 val ojdbcVersion = "12.2.0.1"
+val junitVersion = "5.4.1"
+
+val deployerJars by configurations.creating
 
 plugins {
     `java-library`
@@ -28,8 +33,8 @@ repositories {
         url = uri("https://www.oracle.com/content/secure/maven/content")
         credentials {
             // you may set this properties using gradle.properties file in the root of the project or in your GRADLE_HOME
-            username = if (project.hasProperty("ORACLE_OTN_USER")) project.property("ORACLE_OTN_USER") as String? else System.getenv("ORACLE_OTN_USER")
-            password = if (project.hasProperty("ORACLE_OTN_PASSWORD")) project.property("ORACLE_OTN_PASSWORD") as String? else System.getenv("ORACLE_OTN_PASSWORD")
+            username = (project.findProperty("ORACLE_OTN_USER") as String?) ?: System.getenv("ORACLE_OTN_USER")
+            password = (project.findProperty("ORACLE_OTN_PASSWORD") as String?) ?: System.getenv("ORACLE_OTN_PASSWORD")
         }
     }
     mavenCentral()
@@ -47,8 +52,10 @@ dependencies {
     implementation("com.oracle.jdbc:orai18n:$ojdbcVersion")
 
     // Use Jupiter test framework
-    testImplementation("org.junit.jupiter:junit-jupiter:5.4.0")
+    testImplementation("org.junit.jupiter:junit-jupiter:$junitVersion")
     testImplementation("org.hamcrest:hamcrest:2.1")
+
+    // deployer for packagecloud
     deployerJars("io.packagecloud.maven.wagon:maven-packagecloud-wagon:0.0.6")
 }
 
@@ -66,9 +73,10 @@ tasks {
     val intTest = create<Test>("intTest") {
         dependsOn(test)
         doFirst {
-            environment("DB_URL", System.getenv("DB_URL") ?: "localhost:1521/XE")
-            environment("DB_USER", System.getenv("DB_USER") ?: "app")
-            environment("DB_PASS", System.getenv("DB_PASS") ?: "app")
+            environment("DB_URL", (project.findProperty("DB_URL") as String?) ?: System.getenv("DB_URL")
+            ?: "localhost:1521/XE")
+            environment("DB_USER", (project.findProperty("DB_USER") as String?) ?: System.getenv("DB_USER") ?: "app")
+            environment("DB_PASS", (project.findProperty("DB_PASS") as String?) ?: System.getenv("DB_PASS") ?: "app")
         }
         useJUnitPlatform()
         include("**/*IT.class")
diff --git 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.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
