diff --git a/CHANGELOG.md b/CHANGELOG.md index 8993a3c..5cb0c90 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ All notable changes to this project are documented here. The format follows Keep ## [0.1.0] - Unreleased ### Fixed +- Read the QBit metadata version from the Maven-filtered artifact version so release builds report their release version. - Record-view child lists (e.g. a notification's Recipients) failed with "Error in JSON Serialization": the child table's meta-data includes the qbit config, and `AlertsQBitConfig.getRuntime()` points at a runtime that points back at the config, so Jackson recursed to its 1000-level nesting limit. `getRuntime()` and `getAudienceResolver()` are now `@JsonIgnore`, as in the other qbits' configs. A regression test renders and serializes every child-list widget. ### Added diff --git a/pom.xml b/pom.xml index 1b59ae9..86e7a2c 100644 --- a/pom.xml +++ b/pom.xml @@ -160,6 +160,7 @@ true help/*.yaml + qbit-alerts.properties @@ -167,6 +168,7 @@ false help/*.yaml + qbit-alerts.properties diff --git a/src/main/java/com/kingsrook/qbits/alerts/AlertsQBitProducer.java b/src/main/java/com/kingsrook/qbits/alerts/AlertsQBitProducer.java index 9d76be0..cff8d5e 100644 --- a/src/main/java/com/kingsrook/qbits/alerts/AlertsQBitProducer.java +++ b/src/main/java/com/kingsrook/qbits/alerts/AlertsQBitProducer.java @@ -17,8 +17,11 @@ package com.kingsrook.qbits.alerts; +import java.io.IOException; +import java.io.InputStream; import java.util.ArrayList; import java.util.List; +import java.util.Properties; import com.kingsrook.qbits.alerts.delivery.DeliveryWorker; import com.kingsrook.qbits.alerts.engine.AlertsProcessListener; import com.kingsrook.qbits.alerts.engine.AlertsSinkAdapter; @@ -66,7 +69,7 @@ public class AlertsQBitProducer implements QBitMetaDataProducer { assertThat(bundle.getId()).isEqualTo("qbit-alerts"); - 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 and producer version").isEqualTo(System.getProperty("qbit.artifactVersion")).isEqualTo(AlertsQBitProducer.VERSION); }); HelpBundles.syncOnStartup(qInstance); }