From 2d2727bf2b7f0b67ace01779a04200c77ab4fca4 Mon Sep 17 00:00:00 2001 From: Markus Frohme Date: Thu, 31 Jul 2025 11:16:26 +0200 Subject: [PATCH 1/3] bump add-lib version --- .github/workflows/ci.yml | 2 +- CHANGELOG.md | 5 +++++ distribution/src/it/jlink/pom.xml | 4 ---- .../m3c/solver/SolverHistoryADDTest.java | 7 ------ pom.xml | 22 ++++++++++++++++++- 5 files changed, 27 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4b617aab7..067e03d47 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,7 +46,7 @@ jobs: strategy: matrix: jdk: [ 11, 17, 21 ] - os: [ ubuntu-latest, windows-latest, macos-13 ] + os: [ ubuntu-latest, windows-latest, macos-13, macos-latest ] runs-on: ${{ matrix.os }} steps: - name: Checkout diff --git a/CHANGELOG.md b/CHANGELOG.md index 60113d6af..728c88e41 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). [Full changelog](https://github.com/LearnLib/automatalib/compare/automatalib-0.12.1...HEAD) +### Added + +* `automata-modelchecking-m3c` now supports ARM-based macOS systems. +* `automata-modelchecking-m3c` can now be included in jlink images. + ### Changed * AutomataLib now requires Java 11 at runtime. diff --git a/distribution/src/it/jlink/pom.xml b/distribution/src/it/jlink/pom.xml index e863a8cf9..012910343 100644 --- a/distribution/src/it/jlink/pom.xml +++ b/distribution/src/it/jlink/pom.xml @@ -39,10 +39,6 @@ limitations under the License. net.automatalib automata-brics - - net.automatalib - automata-modelchecking-m3c - net.automatalib automata-jung-visualizer diff --git a/modelchecking/m3c/src/test/java/net/automatalib/modelchecker/m3c/solver/SolverHistoryADDTest.java b/modelchecking/m3c/src/test/java/net/automatalib/modelchecker/m3c/solver/SolverHistoryADDTest.java index 76e8e62af..1dad4ea7a 100644 --- a/modelchecking/m3c/src/test/java/net/automatalib/modelchecker/m3c/solver/SolverHistoryADDTest.java +++ b/modelchecking/m3c/src/test/java/net/automatalib/modelchecker/m3c/solver/SolverHistoryADDTest.java @@ -27,7 +27,6 @@ import net.automatalib.modelchecker.m3c.transformer.ADDTransformer; import net.automatalib.modelchecker.m3c.transformer.ADDTransformerSerializer; import org.testng.Assert; -import org.testng.SkipException; public class SolverHistoryADDTest extends AbstractSolverHistoryTest> { @@ -50,12 +49,6 @@ public AbstractDDSolver, String, String> getSolve return new ADDSolver<>(cfmps); } - @Override - public void testSolverHistory() { - // TODO this test may fail due to a bug in ADDLib. Remove this method once we bump the dependency - throw new SkipException(""); - } - @Override public void testInitialPropertyTransformers(SolverData, String, String> data, N s1, diff --git a/pom.xml b/pom.xml index 1b0b40ada..1c3e3db88 100644 --- a/pom.xml +++ b/pom.xml @@ -221,7 +221,7 @@ limitations under the License. 1.3.0 - 3.1.0 + 4.0.0-SNAPSHOT 3.17.1 1.12-4 0.1.1 @@ -574,6 +574,26 @@ limitations under the License. + + + + maven-central + Maven Central Repository + https://repo.maven.apache.org/maven2/ + + + Central Portal Snapshots + central-portal-snapshots + https://central.sonatype.com/repository/maven-snapshots/ + + false + + + true + + + + From ffabcbeb69f29f8a1b8781f3b5e23b19d5e442eb Mon Sep 17 00:00:00 2001 From: Markus Frohme Date: Thu, 31 Jul 2025 16:42:14 +0200 Subject: [PATCH 2/3] disable addlib documentation for now --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1c3e3db88..acebde4a3 100644 --- a/pom.xml +++ b/pom.xml @@ -726,7 +726,7 @@ limitations under the License. true false - ${addlib.apidocs} + ${brics-automaton.apidocs} ${checkerframework.apidocs} ${guava.apidocs} From f58e1efaf2472b7ca19d270b1cbdd61bf4e5be1b Mon Sep 17 00:00:00 2001 From: Markus Frohme Date: Thu, 7 Aug 2025 16:43:06 +0200 Subject: [PATCH 3/3] switch to stable release --- pom.xml | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/pom.xml b/pom.xml index 60c0d416b..339a94462 100644 --- a/pom.xml +++ b/pom.xml @@ -222,7 +222,7 @@ limitations under the License. 1.3.0 - 4.0.0-SNAPSHOT + 4.0.0 3.17.1 1.12-4 0.1.1 @@ -575,26 +575,6 @@ limitations under the License. - - - - maven-central - Maven Central Repository - https://repo.maven.apache.org/maven2/ - - - Central Portal Snapshots - central-portal-snapshots - https://central.sonatype.com/repository/maven-snapshots/ - - false - - - true - - - - @@ -732,7 +712,7 @@ limitations under the License. true false - + ${addlib.apidocs} ${brics-automaton.apidocs} ${checkerframework.apidocs} ${guava.apidocs}