namespace scope properties file (#248)

needed to avoid collisions in shadow / fat JAR files

Author: devhawk

.github/workflows/test.yml

@@ -38,6 +38,8 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0 # fetch-depth 0 needed for version calculation
 
       - name: Set up JDK ${{ matrix.jdk-distro }} ${{ matrix.jdk-version }}
         uses: actions/setup-java@v4

transact/build.gradle.kts

@@ -43,6 +43,7 @@ dependencies {
     testImplementation("io.rest-assured:rest-assured:5.4.0")
     testImplementation("io.rest-assured:json-path:5.4.0")
     testImplementation("io.rest-assured:xml-path:5.4.0")
+    testImplementation("org.apache.maven:maven-artifact:3.9.11")
 }
 
 tasks.processResources {

transact/src/main/java/dev/dbos/transact/DBOS.java

@@ -47,14 +47,14 @@ private DBOS() {}
   private static final String version = loadVersionFromResources();
 
   private static String loadVersionFromResources() {
-    final String PROPERTIES_FILE = "/app.properties";
+    final String PROPERTIES_FILE = "/dev/dbos/transact/app.properties";
     final String VERSION_KEY = "app.version";
     Properties props = new Properties();
     try (InputStream input = DBOS.class.getResourceAsStream(PROPERTIES_FILE)) {
 
       if (input == null) {
         logger.warn("Could not find {} resource file", PROPERTIES_FILE);
-        return "unknown (resource missing)";
+        return "<unknown (resource missing)>";
       }
 
       // Load the properties from the file

…ansact/src/main/resources/app.properties …sources/dev/dbos/transact/app.propertiestransact/src/main/resources/app.properties renamed to transact/src/main/resources/dev/dbos/transact/app.properties transact/src/main/resources/app.properties renamed to transact/src/main/resources/dev/dbos/transact/app.properties

@@ -4,6 +4,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import dev.dbos.transact.Constants;
 import dev.dbos.transact.DBOS;
@@ -19,6 +20,7 @@
 
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
+import org.apache.maven.artifact.versioning.ComparableVersion;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import uk.org.webcompere.systemstubs.environment.EnvironmentVariables;
@@ -178,4 +180,15 @@ public void configDataSource() throws Exception {
       DBOS.shutdown();
     }
   }
+
+  @Test
+  public void dbosVersion() throws Exception {
+    assertNotNull(DBOS.version());
+    assertFalse(DBOS.version().contains("unknown"));
+    var version = assertDoesNotThrow(() -> new ComparableVersion(DBOS.version()));
+
+    // an invalid version string will be parsed as 0.0-qualifier, so make sure
+    // the value provided is later 0.6 (the initial published version)
+    assertTrue(version.compareTo(new ComparableVersion("0.6")) > 0);
+  }
 }