diff --git a/CHANGELOG.md b/CHANGELOG.md
index 508b3ac..ff50b7b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,8 @@ All notable changes are documented here, following [Keep a Changelog](https://ke
### Fixed
+- QBit metadata reports the Maven artifact version from a filtered resource, including release versions.
+
- Timeline audit summaries read "Edited by Alice Morgan: Title, Total" or "Created by Alice Morgan" instead of "Record was Edited"; detail rows are unchanged.
- The demo server chooses its user per browser session (`?user=bob`, remembered in a cookie) instead of once per JVM, and sends the person's name to the frontend so it no longer shows Anonymous.
- The share recipient search and mention candidates no longer offer the caller to themself.
diff --git a/pom.xml b/pom.xml
index 7fa52b4..4797772 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,6 +120,7 @@
true
help/*.yaml
+ qbit-collaboration.properties
@@ -127,6 +128,7 @@
false
help/*.yaml
+ qbit-collaboration.properties
diff --git a/src/main/java/com/kingsrook/qbits/collaboration/CollaborationQBitProducer.java b/src/main/java/com/kingsrook/qbits/collaboration/CollaborationQBitProducer.java
index ca2790c..d78ac37 100644
--- a/src/main/java/com/kingsrook/qbits/collaboration/CollaborationQBitProducer.java
+++ b/src/main/java/com/kingsrook/qbits/collaboration/CollaborationQBitProducer.java
@@ -22,6 +22,9 @@
package com.kingsrook.qbits.collaboration;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
import com.kingsrook.qbits.collaboration.app.CollaborationHome;
import com.kingsrook.qbits.collaboration.attachments.DeleteAttachmentsProcess;
import com.kingsrook.qbits.collaboration.model.CollaborationTables;
@@ -44,13 +47,41 @@ public class CollaborationQBitProducer implements QBitMetaDataProducer
{
assertThat(bundle.getId()).isEqualTo("qbit-collaboration");
- assertThat(bundle.getVersion()).as("the help bundle carries the artifact version").isEqualTo(System.getProperty("qbit.artifactVersion"));
+ assertThat(bundle.getVersion()).as("the help bundle carries the artifact version").isEqualTo(System.getProperty("qbit.artifactVersion")).isEqualTo(CollaborationQBitProducer.VERSION);
assertThat(bundle.getEntries()).anyMatch(entry -> entry.getKey().equals("app:collaboration;slot:help"));
});
}
diff --git a/src/test/java/com/kingsrook/qbits/collaboration/CollaborationTest.java b/src/test/java/com/kingsrook/qbits/collaboration/CollaborationTest.java
index a029f6b..466cf3c 100644
--- a/src/test/java/com/kingsrook/qbits/collaboration/CollaborationTest.java
+++ b/src/test/java/com/kingsrook/qbits/collaboration/CollaborationTest.java
@@ -146,7 +146,7 @@ class CollaborationTest
assertThat(producer.isEnabled()).isTrue();
assertThat(producer.getQBitConfig()).isSameAs(config);
assertThat(producer.getNamespace()).isEqualTo("collaboration");
- assertThat(producer.getQBitMetaData().getVersion()).isEqualTo("0.1.0");
+ assertThat(producer.getQBitMetaData().getVersion()).isEqualTo(System.getProperty("qbit.artifactVersion")).isEqualTo(CollaborationQBitProducer.VERSION);
assertThat(producer.getQBitMetaData().getArtifactId()).isEqualTo("qbit-collaboration");
assertThat(config.getDefaultBackendNameForTables()).isEqualTo("memory");
assertThat(config.getAdminApp()).isTrue();