changeset 952:203c4cc8d94d

Remove all references to JDBC_VER_SUFFIX
author Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
date Thu, 16 Jan 2025 12:50:19 +0100 (2 months ago)
parents 1c4a12a89282
children a2033b220db0
files build.properties build.xml src/main/java/org/monetdb/jdbc/MonetVersion.java.in
diffstat 3 files changed, 2 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/build.properties
+++ b/build.properties
@@ -10,8 +10,6 @@
 JDBC_MAJOR=3
 # minor release number
 JDBC_MINOR=3
-# an additional identifying string
-JDBC_VER_SUFFIX=Liberica
 
 
 ##
--- a/build.xml
+++ b/build.xml
@@ -237,11 +237,9 @@ Copyright 1997 - July 2008 CWI.
     <!-- Some defaults -->
     <filter token="JDBC_MAJOR" value="${JDBC_MAJOR}" />
     <filter token="JDBC_MINOR" value="${JDBC_MINOR}" />
-    <filter token="JDBC_VER_SUFFIX" value="${JDBC_VER_SUFFIX} ${TODAY}" />
 
     <fail unless="JDBC_MAJOR" message="'JDBC_MAJOR' undefined. Please follow the directions in build.properties."/>
     <fail unless="JDBC_MINOR" message="'JDBC_MINOR' undefined. Please follow the directions in build.properties."/>
-    <fail unless="JDBC_VER_SUFFIX" message="'JDBC_VER_SUFFIX' undefined. Please follow the directions in build.properties."/>
 
     <!-- now copy and filter the file -->
   	<copy file="${srcdir}/${jdbc-package}/MonetVersion.java.in"
@@ -249,7 +247,7 @@ Copyright 1997 - July 2008 CWI.
   	  tofile="${srcdir}/${jdbc-package}/MonetVersion.java"
   	  filtering="yes" />
 
-    <echo message="Configured build for the ${JDBC_MAJOR}.${JDBC_MINOR} (${JDBC_VER_SUFFIX}) edition driver" />
+    <echo message="Configured build for the ${JDBC_MAJOR}.${JDBC_MINOR} edition driver" />
   </target>
 
   <!-- Prepares the build directory and sets some variables -->
--- a/src/main/java/org/monetdb/jdbc/MonetVersion.java.in
+++ b/src/main/java/org/monetdb/jdbc/MonetVersion.java.in
@@ -27,5 +27,5 @@ final class MonetVersion {
 	/**
 	 * Full version string of MonetDB JDBC driver.
 	 */
-	public static String driverVersion = "@JDBC_MAJOR@.@JDBC_MINOR@ (@JDBC_VER_SUFFIX@)";
+	public static String driverVersion = "@JDBC_MAJOR@.@JDBC_MINOR@";
 }