From b2b12a8c93f202c4ee6726948d56d2a2d4c3a3b4 Mon Sep 17 00:00:00 2001
From: Callum Stott <callum@seadowg.com>
Date: Wed, 24 Jul 2024 09:15:44 +0100
Subject: [PATCH 1/2] Tag git SHA onto the end of snapshot version

---
 .github/workflows/publish.yml | 2 +-
 pom.xml                       | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index c96a67ea9..aea781ba1 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -20,7 +20,7 @@ jobs:
         server-password: MAVEN_CENTRAL_TOKEN
         gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
         gpg-passphrase: MAVEN_GPG_PASSPHRASE
-    - run: mvn clean deploy
+    - run: mvn -Drevision=$(git rev-parse --short HEAD) clean deploy
       env:
         MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
         MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
diff --git a/pom.xml b/pom.xml
index 85ae7eae6..6cb39e9fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,9 +3,9 @@
   <groupId>org.getodk</groupId>
   <artifactId>javarosa</artifactId>
   <!-- Be sure to update version in build.gradle to match -->
-  <!-- snapshot release = x.x.x-SNAPSHOT -->
+  <!-- snapshot release = x.x.x-SNAPSHOT-${revision} -->
   <!-- production release = x.x.x -->
-  <version>5.0.0-SNAPSHOT</version>
+  <version>5.0.0-SNAPSHOT-${revision}</version>
   <packaging>jar</packaging>
   <name>javarosa</name>
   <description>A Java library for rendering forms that are compliant with ODK XForms spec</description>
@@ -41,6 +41,7 @@
   </distributionManagement>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <revision/>
   </properties>
   <dependencies>
     <!-- Be sure to update dependencies in build.gradle to match -->

From 78080e7b56add5182e06b4bf3f34be3ea2c70392 Mon Sep 17 00:00:00 2001
From: Callum Stott <callum@seadowg.com>
Date: Wed, 24 Jul 2024 09:21:57 +0100
Subject: [PATCH 2/2] Remove unused JAR config from Gradle

---
 build.gradle | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/build.gradle b/build.gradle
index 916e43b92..0898ab5ab 100644
--- a/build.gradle
+++ b/build.gradle
@@ -53,18 +53,6 @@ targetCompatibility = '1.8'
 sourceCompatibility = '1.8'
 
 if (!project.hasProperty("android")) {
-    jar {
-        // Be sure to update version in pom.xml to match
-        // snapshot release = x.x.x-SNAPSHOT
-        // production release = x.x.x
-        archiveVersion = '5.5.0-SNAPSHOT'
-        archiveBaseName = "javarosa"
-
-        manifest {
-            attributes 'Manifest-Version': "$jar.archiveVersion"
-        }
-    }
-
     // TODO: does not build UML diagrams
     javadoc {
         failOnError = false