current version property including resource filtering. SQL Exec versi…

…on command
ngageoint · Mar 11, 2024 · 374dba1 · 374dba1
1 parent d7e245f
commit 374dba1
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 0 deletions.
diff --git a/pom.xml b/pom.xml
@@ -139,6 +139,12 @@
 	</profiles>
 
 	<build>
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+				<filtering>true</filtering>
+			</resource>
+		</resources>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>

diff --git a/src/main/java/mil/nga/geopackage/io/SQLExec.java b/src/main/java/mil/nga/geopackage/io/SQLExec.java
@@ -47,6 +47,8 @@
 import mil.nga.geopackage.features.user.FeatureDao;
 import mil.nga.geopackage.features.user.FeatureRow;
 import mil.nga.geopackage.geom.GeoPackageGeometryData;
+import mil.nga.geopackage.property.GeoPackageJavaProperties;
+import mil.nga.geopackage.property.JavaPropertyConstants;
 import mil.nga.geopackage.srs.SpatialReferenceSystem;
 import mil.nga.geopackage.tiles.matrix.TileMatrix;
 import mil.nga.geopackage.tiles.reproject.TileReprojection;
@@ -131,6 +133,11 @@ public class SQLExec {
 	 */
 	public static final String COMMAND_HELP = "help";
 
+	/**
+	 * Version command
+	 */
+	public static final String COMMAND_VERSION = "version";
+
 	/**
 	 * Tables command
 	 */
@@ -571,6 +578,12 @@ private static void commandPrompt(GeoPackage database, Integer maxRows,
 
 							resetCommandPrompt(sqlBuilder);
 
+						} else if (sqlLine.equalsIgnoreCase(COMMAND_VERSION)) {
+
+							printVersion();
+
+							resetCommandPrompt(sqlBuilder);
+
 						} else if (sqlLineLower.startsWith(COMMAND_TABLES)) {
 
 							String name = sqlLine
@@ -1123,6 +1136,8 @@ private static void printHelp(GeoPackage database) {
 				+ (isGeoPackage ? "GeoPackage" : "Database") + " information");
 		System.out.println("\t" + COMMAND_HELP
 				+ "              - print this help information");
+		System.out.println("\t" + COMMAND_VERSION
+				+ "           - Show the SQLite Exec version");
 		System.out.println(
 				"\t" + COMMAND_COUNT + "             - count database tables");
 		System.out.println("\t" + COMMAND_TABLES
@@ -1293,6 +1308,15 @@ private static void printHelp(GeoPackage database) {
 
 	}
 
+	/**
+	 * Print the current software version
+	 */
+	private static void printVersion() {
+		System.out.println();
+		System.out.println(GeoPackageJavaProperties
+				.getProperty(JavaPropertyConstants.VERSION));
+	}
+
 	/**
 	 * Execute the SQL
 	 * 

diff --git a/src/main/java/mil/nga/geopackage/property/JavaPropertyConstants.java b/src/main/java/mil/nga/geopackage/property/JavaPropertyConstants.java
@@ -20,6 +20,9 @@ public class JavaPropertyConstants {
 
 	public static final String GEO_PACKAGE = "geopackage";
 
+	public static final String VERSION = GEO_PACKAGE + PROPERTY_DIVIDER
+			+ "version";
+
 	public static final String TILE_GENERATOR = GEO_PACKAGE + PROPERTY_DIVIDER
 			+ "tile_generator";
 

diff --git a/src/main/resources/geopackage-java.properties b/src/main/resources/geopackage-java.properties
@@ -1,4 +1,6 @@
 
+geopackage.version=${pom.version}
+
 geopackage.tile_generator.variable.z=\\{z\\}
 geopackage.tile_generator.variable.x=\\{x\\}
 geopackage.tile_generator.variable.y=\\{y\\}