diff --git a/.github/workflows/buildMaven.yml b/.github/workflows/buildMaven.yml index 8d05a69836b..b2f43c0e2eb 100644 --- a/.github/workflows/buildMaven.yml +++ b/.github/workflows/buildMaven.yml @@ -12,7 +12,7 @@ name: Build ActiveMQ CRDR artifact on: push: branches: - - activemq-5.18.2.crdr + - 5.17.6.crdr jobs: build: diff --git a/.github/workflows/fullTestRun.yml b/.github/workflows/fullTestRun.yml index c2a4386e11d..01e6b64eab7 100644 --- a/.github/workflows/fullTestRun.yml +++ b/.github/workflows/fullTestRun.yml @@ -7,12 +7,12 @@ # CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing # permissions and limitations under the License. -name: run full test suite on 5.18.2.crdr branch +name: run full test suite on 5.17.6.crdr branch on: push: branches: - - activemq-5.18.2.crdr + - 5.17.6.crdr workflow_dispatch: jobs: diff --git a/activemq-broker/pom.xml b/activemq-broker/pom.xml index 28ac0b1ced4..6f22c661f8d 100644 --- a/activemq-broker/pom.xml +++ b/activemq-broker/pom.xml @@ -89,6 +89,17 @@ com.fasterxml.jackson.core jackson-databind + + org.assertj + assertj-core + 3.11.1 + test + + + org.mockito + mockito-core + test + diff --git a/activemq-broker/src/main/java/org/apache/activemq/replica/DummyConnection.java b/activemq-broker/src/main/java/org/apache/activemq/replica/DummyConnection.java index 2010ebe6754..fa45d0e67f9 100644 --- a/activemq-broker/src/main/java/org/apache/activemq/replica/DummyConnection.java +++ b/activemq-broker/src/main/java/org/apache/activemq/replica/DummyConnection.java @@ -123,6 +123,11 @@ public Long getOldestActiveTransactionDuration() { return null; } + @Override + public Long getConnectedTimestamp() { + return null; + } + @Override public void start() throws Exception { }