Change version number handling

polypheny · Feb 22, 2022 · 2da20e1 · 2da20e1
1 parent 71993cd
commit 2da20e1
Show file tree

Hide file tree

Showing 28 changed files with 8 additions and 61 deletions.
diff --git a/avatica-interface/build.gradle b/avatica-interface/build.gradle
@@ -1,7 +1,5 @@
 group "org.polypheny"
 
-version = versionMajor + "." + versionMinor + versionQualifier
-
 
 configurations {
     tests {

diff --git a/build.gradle b/build.gradle
@@ -22,6 +22,11 @@ plugins {
 
 allprojects {
 
+    version = versionMajor + "." + versionMinor + "." + versionMicro
+    if (!isRelease) {
+        version = version + "-SNAPSHOT"
+    }
+
     buildscript {
         repositories {
             mavenCentral()

diff --git a/cassandra-adapter/build.gradle b/cassandra-adapter/build.gradle
@@ -1,7 +1,5 @@
 group "org.polypheny"
 
-version = versionMajor + "." + versionMinor + versionQualifier
-
 
 dependencies {
     implementation project(":core")

diff --git a/catalog/build.gradle b/catalog/build.gradle
@@ -1,10 +1,6 @@
-
 group "org.polypheny"
 
 
-version = versionMajor + "." + versionMinor + versionQualifier
-
-
 dependencies {
     implementation project(":core")
     implementation project(":sql-language")

diff --git a/config/build.gradle b/config/build.gradle
@@ -1,7 +1,5 @@
 group "org.polypheny"
 
-version = versionMajor + "." + versionMinor + versionQualifier
-
 
 dependencies {
     implementation group: "io.javalin", name: "javalin", version: javalin_version // Apache 2.0

diff --git a/core/build.gradle b/core/build.gradle
@@ -2,8 +2,6 @@ import ca.coglinc.gradle.plugins.javacc.CompileJavaccTask
 
 group "org.polypheny"
 
-version = versionMajor + "." + versionMinor + versionQualifier
-
 
 configurations {
     javacc

diff --git a/cottontail-adapter/build.gradle b/cottontail-adapter/build.gradle
@@ -1,10 +1,7 @@
-
 group "org.polypheny"
 
 apply plugin: "kotlin"
 
-version = versionMajor + "." + versionMinor + versionQualifier
-
 dependencies {
     implementation project(":core")
     implementation project(":sql-language")

diff --git a/csv-adapter/build.gradle b/csv-adapter/build.gradle
@@ -1,10 +1,6 @@
-
 group "org.polypheny"
 
 
-version = versionMajor + "." + versionMinor + versionQualifier
-
-
 dependencies {
     implementation project(":core")
     implementation project(":sql-language")

diff --git a/dbms/build.gradle b/dbms/build.gradle
@@ -23,8 +23,6 @@ apply plugin: "com.jaredsburrows.license"
 
 group "org.polypheny"
 
-version = versionMajor + "." + versionMinor + versionQualifier
-
 
 dependencies {
     implementation project(":core")

diff --git a/druid-adapter/build.gradle b/druid-adapter/build.gradle
@@ -1,7 +1,5 @@
 group "org.polypheny"
 
-version = versionMajor + "." + versionMinor + versionQualifier
-
 
 dependencies {
     implementation project(":core")

diff --git a/elasticsearch-adapter/build.gradle b/elasticsearch-adapter/build.gradle
@@ -1,7 +1,5 @@
 group "org.polypheny"
 
-version = versionMajor + "." + versionMinor + versionQualifier
-
 
 dependencies {
     implementation project(":core")

diff --git a/ethereum-adapter/build.gradle b/ethereum-adapter/build.gradle
@@ -1,10 +1,6 @@
-
 group "org.polypheny"
 
 
-version = versionMajor + "." + versionMinor + versionQualifier
-
-
 dependencies {
     implementation project(":core")
 

diff --git a/explore-by-example/build.gradle b/explore-by-example/build.gradle
@@ -1,7 +1,5 @@
 group "org.polypheny"
 
-version = versionMajor + "." + versionMinor + versionQualifier
-
 
 dependencies {
     implementation project(":core")

diff --git a/file-adapter/build.gradle b/file-adapter/build.gradle
@@ -1,7 +1,5 @@
 group "org.polypheny"
 
-version = versionMajor + "." + versionMinor + versionQualifier
-
 
 dependencies {
     implementation project(":core")

diff --git a/geode-adapter/build.gradle b/geode-adapter/build.gradle
@@ -1,7 +1,5 @@
 group "org.polypheny"
 
-version = versionMajor + "." + versionMinor + versionQualifier
-
 
 dependencies {
     implementation project(":core")

diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,7 @@
 versionMajor = 0
-versionMinor = 7.0
-versionQualifier = ""
+versionMinor = 7
+versionMicro = 0
+isRelease = true
 
 org.gradle.daemon = true
 org.gradle.jvmargs = -Xmx6g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8

diff --git a/html-adapter/build.gradle b/html-adapter/build.gradle
@@ -1,7 +1,5 @@
 group "org.polypheny"
 
-version = versionMajor + "." + versionMinor + versionQualifier
-
 
 dependencies {
     implementation project(":core")

diff --git a/http-interface/build.gradle b/http-interface/build.gradle
@@ -1,7 +1,5 @@
 group "org.polypheny"
 
-version = versionMajor + "." + versionMinor + versionQualifier
-
 
 dependencies {
     implementation project(":core")

diff --git a/information/build.gradle b/information/build.gradle
@@ -1,7 +1,5 @@
 group "org.polypheny"
 
-version = versionMajor + "." + versionMinor + versionQualifier
-
 
 dependencies {
     implementation group: "io.javalin", name: "javalin", version: javalin_version // Apache 2.0

diff --git a/jdbc-adapter/build.gradle b/jdbc-adapter/build.gradle
@@ -1,7 +1,5 @@
 group "org.polypheny"
 
-version = versionMajor + "." + versionMinor + versionQualifier
-
 
 dependencies {
     implementation project(":core")

diff --git a/mongodb-adapter/build.gradle b/mongodb-adapter/build.gradle
@@ -1,7 +1,5 @@
 group "org.polypheny"
 
-version = versionMajor + "." + versionMinor + versionQualifier
-
 
 dependencies {
     implementation project(":core")

diff --git a/monitoring/build.gradle b/monitoring/build.gradle
@@ -1,8 +1,6 @@
 group "org.polypheny"
 
 
-version = versionMajor + "." + versionMinor + versionQualifier
-
 apply plugin: "java-library"
 apply plugin: "idea"
 apply plugin: "io.freefair.lombok"

diff --git a/mql-language/build.gradle b/mql-language/build.gradle
@@ -2,8 +2,6 @@ import ca.coglinc.gradle.plugins.javacc.CompileJavaccTask
 
 group "org.polypheny"
 
-version = versionMajor + "." + versionMinor + versionQualifier
-
 
 configurations {
     javacc

diff --git a/pig-adapter/build.gradle b/pig-adapter/build.gradle
@@ -1,7 +1,5 @@
 group "org.polypheny"
 
-version = versionMajor + "." + versionMinor + versionQualifier
-
 
 dependencies {
     implementation project(":core")

diff --git a/pig-language/build.gradle b/pig-language/build.gradle
@@ -2,8 +2,6 @@ import ca.coglinc.gradle.plugins.javacc.CompileJavaccTask
 
 group "org.polypheny"
 
-version = versionMajor + '.' + versionMinor + versionQualifier
-
 
 configurations {
     javacc

diff --git a/rest-interface/build.gradle b/rest-interface/build.gradle
@@ -1,7 +1,5 @@
 group "org.polypheny"
 
-version = versionMajor + "." + versionMinor + versionQualifier
-
 
 dependencies {
     implementation project(":core")

diff --git a/sql-language/build.gradle b/sql-language/build.gradle
@@ -2,8 +2,6 @@ import ca.coglinc.gradle.plugins.javacc.CompileJavaccTask
 
 group "org.polypheny"
 
-version = versionMajor + "." + versionMinor + versionQualifier
-
 
 configurations {
     javacc

diff --git a/webui/build.gradle b/webui/build.gradle
@@ -1,7 +1,5 @@
 group "org.polypheny"
 
-version = versionMajor + "." + versionMinor + versionQualifier
-
 
 configurations.all {
     // check for updates every build
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,8 +2,6 @@ import ca.coglinc.gradle.plugins.javacc.CompileJavaccTask @@
     group "org.polypheny"
-    version = versionMajor + "." + versionMinor + versionQualifier
     configurations {
         javacc
@@ Expand Down @@