From 7a40a75ff086f7f9f6d5ddb478f4246899aeccf1 Mon Sep 17 00:00:00 2001 From: Markus Frohme Date: Sun, 25 Feb 2024 18:38:26 +0100 Subject: [PATCH] Add jlink integration test (#122) * add jlink integration test * end file with proper newline [skip ci] * cleanup dependency definition [skip ci] * debug outputs * invoker-plugin: install before testing --- .github/workflows/ci.yml | 4 +- .../aaar/src/main/java/module-info.java | 4 +- .../active/adt/src/main/java/module-info.java | 3 +- .../active/dhc/src/main/java/module-info.java | 3 +- .../src/main/java/module-info.java | 3 +- .../lstar/src/main/java/module-info.java | 3 +- .../nlstar/src/main/java/module-info.java | 3 +- .../src/main/java/module-info.java | 3 +- .../src/main/java/module-info.java | 3 +- .../active/oml/src/main/java/module-info.java | 4 +- .../procedural/src/main/java/module-info.java | 4 +- .../ttt-vpa/src/main/java/module-info.java | 5 +- .../active/ttt/src/main/java/module-info.java | 3 +- .../ostia/src/main/java/module-info.java | 4 +- .../rpni/src/main/java/module-info.java | 4 +- api/src/main/java/module-info.java | 4 +- .../src/main/java/module-info.java | 4 +- .../settings/src/main/java/module-info.java | 3 +- commons/util/src/main/java/module-info.java | 4 +- .../src/main/java/module-info.java | 4 +- .../list/src/main/java/module-info.java | 3 +- .../src/main/java/module-info.java | 4 +- .../pta/src/main/java/module-info.java | 4 +- distribution/pom.xml | 24 ++++++ distribution/src/it/jlink/pom.xml | 76 +++++++++++++++++++ distribution/src/it/settings.xml | 51 +++++++++++++ drivers/basic/src/main/java/module-info.java | 4 +- drivers/mapper/pom.xml | 5 ++ drivers/mapper/src/main/java/module-info.java | 4 +- drivers/simulator/pom.xml | 5 ++ .../simulator/src/main/java/module-info.java | 4 +- examples/src/main/java/module-info.java | 4 +- filters/cache/src/main/java/module-info.java | 3 +- filters/reuse/src/main/java/module-info.java | 3 +- .../src/main/java/module-info.java | 3 +- .../src/main/java/module-info.java | 3 +- .../src/main/java/module-info.java | 3 +- .../src/main/java/module-info.java | 4 +- .../src/main/java/module-info.java | 3 +- pom.xml | 7 ++ .../src/main/java/module-info.java | 4 +- .../src/main/java/module-info.java | 4 +- 42 files changed, 259 insertions(+), 38 deletions(-) create mode 100644 distribution/src/it/jlink/pom.xml create mode 100644 distribution/src/it/settings.xml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d02bc4d2ec..bd3b699af7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,7 +49,7 @@ jobs: mvn -B install -DskipTests cd $GITHUB_WORKSPACE - name: Run Maven - run: mvn -B install site -Pintegration-tests,code-analysis,bundles + run: mvn -B install site -Pintegration-tests,code-analysis,bundles,jlink platform-integration: name: "Platform Integration (JDK: ${{ matrix.jdk }}, OS: ${{ matrix.os }})" needs: [ tests-and-analysis ] @@ -86,7 +86,7 @@ jobs: mvn -B install -DskipTests cd $GITHUB_WORKSPACE - name: Run Maven - run: mvn -B install + run: mvn -B install -Pjlink coverage: name: "Coverage" needs: [ platform-integration ] diff --git a/algorithms/active/aaar/src/main/java/module-info.java b/algorithms/active/aaar/src/main/java/module-info.java index 16b6493ff7..5daad4b9d5 100644 --- a/algorithms/active/aaar/src/main/java/module-info.java +++ b/algorithms/active/aaar/src/main/java/module-info.java @@ -34,7 +34,9 @@ requires net.automatalib.api; requires net.automatalib.common.util; requires net.automatalib.core; - requires org.checkerframework.checker.qual; + + // make non-static once https://github.com/typetools/checker-framework/issues/4559 is implemented + requires static org.checkerframework.checker.qual; exports de.learnlib.algorithm.aaar; exports de.learnlib.algorithm.aaar.abstraction; diff --git a/algorithms/active/adt/src/main/java/module-info.java b/algorithms/active/adt/src/main/java/module-info.java index 2b0b52ed0d..30517de158 100644 --- a/algorithms/active/adt/src/main/java/module-info.java +++ b/algorithms/active/adt/src/main/java/module-info.java @@ -38,10 +38,11 @@ requires net.automatalib.common.util; requires net.automatalib.core; requires net.automatalib.util; - requires org.checkerframework.checker.qual; requires org.slf4j; requires static de.learnlib.tooling.annotation; + // make non-static once https://github.com/typetools/checker-framework/issues/4559 is implemented + requires static org.checkerframework.checker.qual; exports de.learnlib.algorithm.adt.ads; exports de.learnlib.algorithm.adt.adt; diff --git a/algorithms/active/dhc/src/main/java/module-info.java b/algorithms/active/dhc/src/main/java/module-info.java index 6035bf691d..6f3deb394b 100644 --- a/algorithms/active/dhc/src/main/java/module-info.java +++ b/algorithms/active/dhc/src/main/java/module-info.java @@ -35,9 +35,10 @@ requires net.automatalib.api; requires net.automatalib.common.util; requires net.automatalib.core; - requires org.checkerframework.checker.qual; requires static de.learnlib.tooling.annotation; + // make non-static once https://github.com/typetools/checker-framework/issues/4559 is implemented + requires static org.checkerframework.checker.qual; exports de.learnlib.algorithm.dhc.mealy; } diff --git a/algorithms/active/kearns-vazirani/src/main/java/module-info.java b/algorithms/active/kearns-vazirani/src/main/java/module-info.java index f901b87422..3d9f22fa05 100644 --- a/algorithms/active/kearns-vazirani/src/main/java/module-info.java +++ b/algorithms/active/kearns-vazirani/src/main/java/module-info.java @@ -36,10 +36,11 @@ requires net.automatalib.api; requires net.automatalib.common.util; requires net.automatalib.core; - requires org.checkerframework.checker.qual; requires org.slf4j; requires static de.learnlib.tooling.annotation; + // make non-static once https://github.com/typetools/checker-framework/issues/4559 is implemented + requires static org.checkerframework.checker.qual; exports de.learnlib.algorithm.kv; exports de.learnlib.algorithm.kv.dfa; diff --git a/algorithms/active/lstar/src/main/java/module-info.java b/algorithms/active/lstar/src/main/java/module-info.java index b088dd4773..f81597e76e 100644 --- a/algorithms/active/lstar/src/main/java/module-info.java +++ b/algorithms/active/lstar/src/main/java/module-info.java @@ -40,10 +40,11 @@ requires net.automatalib.api; requires net.automatalib.common.util; requires net.automatalib.core; - requires org.checkerframework.checker.qual; requires org.slf4j; requires static de.learnlib.tooling.annotation; + // make non-static once https://github.com/typetools/checker-framework/issues/4559 is implemented + requires static org.checkerframework.checker.qual; exports de.learnlib.algorithm.lstar; exports de.learnlib.algorithm.lstar.ce; diff --git a/algorithms/active/nlstar/src/main/java/module-info.java b/algorithms/active/nlstar/src/main/java/module-info.java index eb22ac1388..a33b670779 100644 --- a/algorithms/active/nlstar/src/main/java/module-info.java +++ b/algorithms/active/nlstar/src/main/java/module-info.java @@ -35,9 +35,10 @@ requires net.automatalib.api; requires net.automatalib.core; requires net.automatalib.util; - requires org.checkerframework.checker.qual; requires static de.learnlib.tooling.annotation; + // make non-static once https://github.com/typetools/checker-framework/issues/4559 is implemented + requires static org.checkerframework.checker.qual; exports de.learnlib.algorithm.nlstar; } diff --git a/algorithms/active/observation-pack-vpa/src/main/java/module-info.java b/algorithms/active/observation-pack-vpa/src/main/java/module-info.java index c453d4dc88..5c1922781d 100644 --- a/algorithms/active/observation-pack-vpa/src/main/java/module-info.java +++ b/algorithms/active/observation-pack-vpa/src/main/java/module-info.java @@ -38,9 +38,10 @@ requires net.automatalib.common.smartcollection; requires net.automatalib.common.util; requires net.automatalib.core; - requires org.checkerframework.checker.qual; requires static de.learnlib.tooling.annotation; + // make non-static once https://github.com/typetools/checker-framework/issues/4559 is implemented + requires static org.checkerframework.checker.qual; exports de.learnlib.algorithm.observationpack.vpa; exports de.learnlib.algorithm.observationpack.vpa.hypothesis; diff --git a/algorithms/active/observation-pack/src/main/java/module-info.java b/algorithms/active/observation-pack/src/main/java/module-info.java index 30e18da50f..05b47e0a57 100644 --- a/algorithms/active/observation-pack/src/main/java/module-info.java +++ b/algorithms/active/observation-pack/src/main/java/module-info.java @@ -35,9 +35,10 @@ requires de.learnlib.datastructure.discriminationtree; requires net.automatalib.api; requires net.automatalib.common.util; - requires org.checkerframework.checker.qual; requires static de.learnlib.tooling.annotation; + // make non-static once https://github.com/typetools/checker-framework/issues/4559 is implemented + requires static org.checkerframework.checker.qual; exports de.learnlib.algorithm.observationpack; exports de.learnlib.algorithm.observationpack.dfa; diff --git a/algorithms/active/oml/src/main/java/module-info.java b/algorithms/active/oml/src/main/java/module-info.java index 7ae26c6e98..530a2f66b1 100644 --- a/algorithms/active/oml/src/main/java/module-info.java +++ b/algorithms/active/oml/src/main/java/module-info.java @@ -34,7 +34,9 @@ requires net.automatalib.api; requires net.automatalib.common.util; requires net.automatalib.core; - requires org.checkerframework.checker.qual; + + // make non-static once https://github.com/typetools/checker-framework/issues/4559 is implemented + requires static org.checkerframework.checker.qual; exports de.learnlib.algorithm.oml.lstar; exports de.learnlib.algorithm.oml.ttt; diff --git a/algorithms/active/procedural/src/main/java/module-info.java b/algorithms/active/procedural/src/main/java/module-info.java index 7dd90ea28a..9ed517c629 100644 --- a/algorithms/active/procedural/src/main/java/module-info.java +++ b/algorithms/active/procedural/src/main/java/module-info.java @@ -44,7 +44,9 @@ requires net.automatalib.common.util; requires net.automatalib.core; requires net.automatalib.util; - requires org.checkerframework.checker.qual; + + // make non-static once https://github.com/typetools/checker-framework/issues/4559 is implemented + requires static org.checkerframework.checker.qual; exports de.learnlib.algorithm.procedural; exports de.learnlib.algorithm.procedural.adapter.dfa; diff --git a/algorithms/active/ttt-vpa/src/main/java/module-info.java b/algorithms/active/ttt-vpa/src/main/java/module-info.java index 161cb3fe82..f054ae4d97 100644 --- a/algorithms/active/ttt-vpa/src/main/java/module-info.java +++ b/algorithms/active/ttt-vpa/src/main/java/module-info.java @@ -35,10 +35,11 @@ requires de.learnlib.common.counterexample; requires de.learnlib.datastructure.discriminationtree; requires net.automatalib.api; - requires org.checkerframework.checker.qual; + requires net.automatalib.common.util; requires static de.learnlib.tooling.annotation; - requires net.automatalib.common.util; + // make non-static once https://github.com/typetools/checker-framework/issues/4559 is implemented + requires static org.checkerframework.checker.qual; exports de.learnlib.algorithm.ttt.vpa; } diff --git a/algorithms/active/ttt/src/main/java/module-info.java b/algorithms/active/ttt/src/main/java/module-info.java index 179262dff6..88c431de5f 100644 --- a/algorithms/active/ttt/src/main/java/module-info.java +++ b/algorithms/active/ttt/src/main/java/module-info.java @@ -38,10 +38,11 @@ requires net.automatalib.api; requires net.automatalib.common.smartcollection; requires net.automatalib.common.util; - requires org.checkerframework.checker.qual; requires org.slf4j; requires static de.learnlib.tooling.annotation; + // make non-static once https://github.com/typetools/checker-framework/issues/4559 is implemented + requires static org.checkerframework.checker.qual; exports de.learnlib.algorithm.ttt.base; exports de.learnlib.algorithm.ttt.dfa; diff --git a/algorithms/passive/ostia/src/main/java/module-info.java b/algorithms/passive/ostia/src/main/java/module-info.java index 7b250402e7..ef2af10d02 100644 --- a/algorithms/passive/ostia/src/main/java/module-info.java +++ b/algorithms/passive/ostia/src/main/java/module-info.java @@ -35,7 +35,9 @@ requires net.automatalib.common.smartcollection; requires net.automatalib.common.util; requires net.automatalib.core; - requires org.checkerframework.checker.qual; + + // make non-static once https://github.com/typetools/checker-framework/issues/4559 is implemented + requires static org.checkerframework.checker.qual; exports de.learnlib.algorithm.ostia; } diff --git a/algorithms/passive/rpni/src/main/java/module-info.java b/algorithms/passive/rpni/src/main/java/module-info.java index dbf64f1492..52acc5f40c 100644 --- a/algorithms/passive/rpni/src/main/java/module-info.java +++ b/algorithms/passive/rpni/src/main/java/module-info.java @@ -39,7 +39,9 @@ requires net.automatalib.api; requires net.automatalib.common.smartcollection; requires net.automatalib.common.util; - requires org.checkerframework.checker.qual; + + // make non-static once https://github.com/typetools/checker-framework/issues/4559 is implemented + requires static org.checkerframework.checker.qual; exports de.learnlib.algorithm.rpni; } diff --git a/api/src/main/java/module-info.java b/api/src/main/java/module-info.java index be44554115..b118285e47 100644 --- a/api/src/main/java/module-info.java +++ b/api/src/main/java/module-info.java @@ -30,9 +30,11 @@ requires net.automatalib.api; requires net.automatalib.common.util; - requires org.checkerframework.checker.qual; requires org.slf4j; + // make non-static once https://github.com/typetools/checker-framework/issues/4559 is implemented + requires static org.checkerframework.checker.qual; + exports de.learnlib; exports de.learnlib.algorithm; exports de.learnlib.exception; diff --git a/commons/counterexamples/src/main/java/module-info.java b/commons/counterexamples/src/main/java/module-info.java index 4af9efb501..416e3018dd 100644 --- a/commons/counterexamples/src/main/java/module-info.java +++ b/commons/counterexamples/src/main/java/module-info.java @@ -31,7 +31,9 @@ requires de.learnlib.api; requires net.automatalib.api; requires net.automatalib.common.util; - requires org.checkerframework.checker.qual; + + // make non-static once https://github.com/typetools/checker-framework/issues/4559 is implemented + requires static org.checkerframework.checker.qual; exports de.learnlib.acex; exports de.learnlib.counterexample; diff --git a/commons/settings/src/main/java/module-info.java b/commons/settings/src/main/java/module-info.java index c647ee331f..2a80e83617 100644 --- a/commons/settings/src/main/java/module-info.java +++ b/commons/settings/src/main/java/module-info.java @@ -39,9 +39,10 @@ requires de.learnlib.api; requires net.automatalib.common.util; requires net.automatalib.api; - requires org.checkerframework.checker.qual; requires org.slf4j; + // make non-static once https://github.com/typetools/checker-framework/issues/4559 is implemented + requires static org.checkerframework.checker.qual; requires static org.kohsuke.metainf_services; exports de.learnlib.setting; diff --git a/commons/util/src/main/java/module-info.java b/commons/util/src/main/java/module-info.java index e48f7a5f71..70f05ea036 100644 --- a/commons/util/src/main/java/module-info.java +++ b/commons/util/src/main/java/module-info.java @@ -34,9 +34,11 @@ requires net.automatalib.common.util; requires net.automatalib.core; requires net.automatalib.util; - requires org.checkerframework.checker.qual; requires org.slf4j; + // make non-static once https://github.com/typetools/checker-framework/issues/4559 is implemented + requires static org.checkerframework.checker.qual; + exports de.learnlib.util; exports de.learnlib.util.mealy; exports de.learnlib.util.moore; diff --git a/datastructures/discrimination-tree/src/main/java/module-info.java b/datastructures/discrimination-tree/src/main/java/module-info.java index 147be354b2..d83710e94b 100644 --- a/datastructures/discrimination-tree/src/main/java/module-info.java +++ b/datastructures/discrimination-tree/src/main/java/module-info.java @@ -33,7 +33,9 @@ requires net.automatalib.api; requires net.automatalib.common.util; requires net.automatalib.util; - requires org.checkerframework.checker.qual; + + // make non-static once https://github.com/typetools/checker-framework/issues/4559 is implemented + requires static org.checkerframework.checker.qual; exports de.learnlib.datastructure.discriminationtree; exports de.learnlib.datastructure.discriminationtree.iterators; diff --git a/datastructures/list/src/main/java/module-info.java b/datastructures/list/src/main/java/module-info.java index 544f3582e9..7d1696433d 100644 --- a/datastructures/list/src/main/java/module-info.java +++ b/datastructures/list/src/main/java/module-info.java @@ -28,7 +28,8 @@ */ open module de.learnlib.datastructure.list { - requires org.checkerframework.checker.qual; + // make non-static once https://github.com/typetools/checker-framework/issues/4559 is implemented + requires static org.checkerframework.checker.qual; exports de.learnlib.datastructure.list; } diff --git a/datastructures/observation-table/src/main/java/module-info.java b/datastructures/observation-table/src/main/java/module-info.java index e65cbd9712..9a6d1fd38a 100644 --- a/datastructures/observation-table/src/main/java/module-info.java +++ b/datastructures/observation-table/src/main/java/module-info.java @@ -32,7 +32,9 @@ requires net.automatalib.api; requires net.automatalib.common.util; requires net.automatalib.core; - requires org.checkerframework.checker.qual; + + // make non-static once https://github.com/typetools/checker-framework/issues/4559 is implemented + requires static org.checkerframework.checker.qual; exports de.learnlib.datastructure.observationtable; exports de.learnlib.datastructure.observationtable.reader; diff --git a/datastructures/pta/src/main/java/module-info.java b/datastructures/pta/src/main/java/module-info.java index 0d1d581fd3..a277c9f366 100644 --- a/datastructures/pta/src/main/java/module-info.java +++ b/datastructures/pta/src/main/java/module-info.java @@ -32,7 +32,9 @@ requires net.automatalib.common.smartcollection; requires net.automatalib.common.util; requires net.automatalib.core; - requires org.checkerframework.checker.qual; + + // make non-static once https://github.com/typetools/checker-framework/issues/4559 is implemented + requires static org.checkerframework.checker.qual; exports de.learnlib.datastructure.pta; exports de.learnlib.datastructure.pta.config; diff --git a/distribution/pom.xml b/distribution/pom.xml index 86bf59ef24..391a0d5b10 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -227,6 +227,30 @@ limitations under the License. + + jlink + + + + org.apache.maven.plugins + maven-invoker-plugin + + ${project.build.directory}/it + ${project.build.directory}/local-repo + ${project.basedir}/src/it/settings.xml + + + + + install + run + + + + + + + code-coverage diff --git a/distribution/src/it/jlink/pom.xml b/distribution/src/it/jlink/pom.xml new file mode 100644 index 0000000000..c689e57101 --- /dev/null +++ b/distribution/src/it/jlink/pom.xml @@ -0,0 +1,76 @@ + + + + 4.0.0 + + + de.learnlib + learnlib-parent + @project.version@ + ../../../../pom.xml + + + de.learnlib.it + learnlib-jlink + + + + de.learnlib.distribution + learnlib-distribution + pom + + + + net.automatalib + automata-brics + + + net.automatalib + automata-modelchecking-m3c + + + net.automatalib + automata-jung-visualizer + + + + + + + + + org.apache.maven.plugins + maven-jlink-plugin + 3.1.0 + + distribution + true + true + true + + + + + jlink + + + + + + + diff --git a/distribution/src/it/settings.xml b/distribution/src/it/settings.xml new file mode 100644 index 0000000000..b958084819 --- /dev/null +++ b/distribution/src/it/settings.xml @@ -0,0 +1,51 @@ + + + + + + it-repo + + + local.central + @localRepositoryUrl@ + + true + + + true + + + + + + local.central + @localRepositoryUrl@ + + true + + + true + + + + + + + it-repo + + diff --git a/drivers/basic/src/main/java/module-info.java b/drivers/basic/src/main/java/module-info.java index 2724c0d5b6..3ead3905a1 100644 --- a/drivers/basic/src/main/java/module-info.java +++ b/drivers/basic/src/main/java/module-info.java @@ -32,7 +32,9 @@ requires net.automatalib.api; requires net.automatalib.common.util; requires net.automatalib.core; - requires org.checkerframework.checker.qual; + + // make non-static once https://github.com/typetools/checker-framework/issues/4559 is implemented + requires static org.checkerframework.checker.qual; exports de.learnlib.driver; exports de.learnlib.driver.reflect; diff --git a/drivers/mapper/pom.xml b/drivers/mapper/pom.xml index db376529d1..fd5a97c11e 100644 --- a/drivers/mapper/pom.xml +++ b/drivers/mapper/pom.xml @@ -47,6 +47,11 @@ limitations under the License. automata-core + + org.checkerframework + checker-qual + + de.learnlib diff --git a/drivers/mapper/src/main/java/module-info.java b/drivers/mapper/src/main/java/module-info.java index 1af7eabdd9..8115a39d3e 100644 --- a/drivers/mapper/src/main/java/module-info.java +++ b/drivers/mapper/src/main/java/module-info.java @@ -33,7 +33,9 @@ requires de.learnlib.api; requires net.automatalib.api; requires net.automatalib.core; - requires org.checkerframework.checker.qual; + + // make non-static once https://github.com/typetools/checker-framework/issues/4559 is implemented + requires static org.checkerframework.checker.qual; exports de.learnlib.mapper; } diff --git a/drivers/simulator/pom.xml b/drivers/simulator/pom.xml index 88b6704ecc..cb858fcf08 100644 --- a/drivers/simulator/pom.xml +++ b/drivers/simulator/pom.xml @@ -42,5 +42,10 @@ limitations under the License. net.automatalib automata-api + + + org.checkerframework + checker-qual + diff --git a/drivers/simulator/src/main/java/module-info.java b/drivers/simulator/src/main/java/module-info.java index 245fb92ff8..b0311a80dc 100644 --- a/drivers/simulator/src/main/java/module-info.java +++ b/drivers/simulator/src/main/java/module-info.java @@ -32,7 +32,9 @@ requires de.learnlib.api; requires net.automatalib.api; - requires org.checkerframework.checker.qual; + + // make non-static once https://github.com/typetools/checker-framework/issues/4559 is implemented + requires static org.checkerframework.checker.qual; exports de.learnlib.driver.simulator; } diff --git a/examples/src/main/java/module-info.java b/examples/src/main/java/module-info.java index b61f79e2fb..daf74c3ff0 100644 --- a/examples/src/main/java/module-info.java +++ b/examples/src/main/java/module-info.java @@ -49,9 +49,11 @@ requires net.automatalib.util; requires net.automatalib.serialization.dot; requires net.automatalib.visualization.dot; - requires org.checkerframework.checker.qual; requires xstream; + // make non-static once https://github.com/typetools/checker-framework/issues/4559 is implemented + requires static org.checkerframework.checker.qual; + exports de.learnlib.example; exports de.learnlib.example.aaar; exports de.learnlib.example.bbc; diff --git a/filters/cache/src/main/java/module-info.java b/filters/cache/src/main/java/module-info.java index 41e2b4c508..cafe7593cd 100644 --- a/filters/cache/src/main/java/module-info.java +++ b/filters/cache/src/main/java/module-info.java @@ -34,12 +34,13 @@ requires net.automatalib.core; requires net.automatalib.incremental; requires net.automatalib.util; - requires org.checkerframework.checker.qual; requires org.slf4j; // only required by documentation requires static de.learnlib.oracle.parallelism; requires static de.learnlib.tooling.annotation; + // make non-static once https://github.com/typetools/checker-framework/issues/4559 is implemented + requires static org.checkerframework.checker.qual; exports de.learnlib.filter.cache; exports de.learnlib.filter.cache.dfa; diff --git a/filters/reuse/src/main/java/module-info.java b/filters/reuse/src/main/java/module-info.java index 89e64311d3..7344a1083b 100644 --- a/filters/reuse/src/main/java/module-info.java +++ b/filters/reuse/src/main/java/module-info.java @@ -30,9 +30,10 @@ requires de.learnlib.api; requires net.automatalib.api; - requires org.checkerframework.checker.qual; requires static de.learnlib.tooling.annotation; + // make non-static once https://github.com/typetools/checker-framework/issues/4559 is implemented + requires static org.checkerframework.checker.qual; exports de.learnlib.filter.reuse; exports de.learnlib.filter.reuse.tree; diff --git a/oracles/emptiness-oracles/src/main/java/module-info.java b/oracles/emptiness-oracles/src/main/java/module-info.java index ec8558643d..e500d9c7fd 100644 --- a/oracles/emptiness-oracles/src/main/java/module-info.java +++ b/oracles/emptiness-oracles/src/main/java/module-info.java @@ -31,9 +31,10 @@ requires de.learnlib.api; requires de.learnlib.common.util; requires net.automatalib.api; - requires org.checkerframework.checker.qual; requires static de.learnlib.tooling.annotation; + // make non-static once https://github.com/typetools/checker-framework/issues/4559 is implemented + requires static org.checkerframework.checker.qual; exports de.learnlib.oracle.emptiness; } diff --git a/oracles/equivalence-oracles/src/main/java/module-info.java b/oracles/equivalence-oracles/src/main/java/module-info.java index aef11e04ef..107c41f911 100644 --- a/oracles/equivalence-oracles/src/main/java/module-info.java +++ b/oracles/equivalence-oracles/src/main/java/module-info.java @@ -34,10 +34,11 @@ requires net.automatalib.common.util; requires net.automatalib.core; requires net.automatalib.util; - requires org.checkerframework.checker.qual; requires org.slf4j; requires static de.learnlib.tooling.annotation; + // make non-static once https://github.com/typetools/checker-framework/issues/4559 is implemented + requires static org.checkerframework.checker.qual; exports de.learnlib.oracle.equivalence; exports de.learnlib.oracle.equivalence.mealy; diff --git a/oracles/membership-oracles/src/main/java/module-info.java b/oracles/membership-oracles/src/main/java/module-info.java index d83f017f45..f5b2f4d867 100644 --- a/oracles/membership-oracles/src/main/java/module-info.java +++ b/oracles/membership-oracles/src/main/java/module-info.java @@ -32,9 +32,10 @@ requires de.learnlib.common.util; requires net.automatalib.api; requires net.automatalib.common.util; - requires org.checkerframework.checker.qual; requires static de.learnlib.tooling.annotation; + // make non-static once https://github.com/typetools/checker-framework/issues/4559 is implemented + requires static org.checkerframework.checker.qual; exports de.learnlib.oracle.membership; } diff --git a/oracles/parallelism/src/main/java/module-info.java b/oracles/parallelism/src/main/java/module-info.java index 04216c7436..6746e2d490 100644 --- a/oracles/parallelism/src/main/java/module-info.java +++ b/oracles/parallelism/src/main/java/module-info.java @@ -33,7 +33,9 @@ requires de.learnlib.setting; requires net.automatalib.api; requires net.automatalib.common.util; - requires org.checkerframework.checker.qual; + + // make non-static once https://github.com/typetools/checker-framework/issues/4559 is implemented + requires static org.checkerframework.checker.qual; exports de.learnlib.oracle.parallelism; } diff --git a/oracles/property-oracles/src/main/java/module-info.java b/oracles/property-oracles/src/main/java/module-info.java index 1ca41237a9..1bc9048534 100644 --- a/oracles/property-oracles/src/main/java/module-info.java +++ b/oracles/property-oracles/src/main/java/module-info.java @@ -30,10 +30,11 @@ requires de.learnlib.api; requires net.automatalib.api; - requires org.checkerframework.checker.qual; requires org.slf4j; requires static de.learnlib.tooling.annotation; + // make non-static once https://github.com/typetools/checker-framework/issues/4559 is implemented + requires static org.checkerframework.checker.qual; exports de.learnlib.oracle.property; } diff --git a/pom.xml b/pom.xml index db5e03e23e..45b0e5788d 100644 --- a/pom.xml +++ b/pom.xml @@ -223,6 +223,7 @@ limitations under the License. 3.1.0 3.4.5 3.1.1 + 3.6.0 0.8.8 3.3.0 3.6.0 @@ -603,6 +604,7 @@ limitations under the License. org.checkerframework checker-qual ${checkerframework.version} + provided @@ -912,6 +914,11 @@ limitations under the License. maven-install-plugin ${install-plugin.version} + + org.apache.maven.plugins + maven-invoker-plugin + ${invoker-plugin.version} + org.codehaus.mojo tidy-maven-plugin diff --git a/test-support/learning-examples/src/main/java/module-info.java b/test-support/learning-examples/src/main/java/module-info.java index 7a4038a717..fbeeec940f 100644 --- a/test-support/learning-examples/src/main/java/module-info.java +++ b/test-support/learning-examples/src/main/java/module-info.java @@ -36,9 +36,11 @@ requires net.automatalib.core; requires net.automatalib.serialization.learnlibv2; requires net.automatalib.util; - requires org.checkerframework.checker.qual; requires org.slf4j; + // make non-static once https://github.com/typetools/checker-framework/issues/4559 is implemented + requires static org.checkerframework.checker.qual; + exports de.learnlib.testsupport.example; exports de.learnlib.testsupport.example.dfa; exports de.learnlib.testsupport.example.mealy; diff --git a/test-support/test-support/src/main/java/module-info.java b/test-support/test-support/src/main/java/module-info.java index 56107ca58e..a394fe2bc6 100644 --- a/test-support/test-support/src/main/java/module-info.java +++ b/test-support/test-support/src/main/java/module-info.java @@ -39,10 +39,12 @@ requires net.automatalib.common.util; requires net.automatalib.core; requires net.automatalib.util; - requires org.checkerframework.checker.qual; requires org.mockito; requires org.testng; requires xstream; + // make non-static once https://github.com/typetools/checker-framework/issues/4559 is implemented + requires static org.checkerframework.checker.qual; + exports de.learnlib.testsupport; }