add jlink integration test

LearnLib · Feb 25, 2024 · dac9734 · dac9734
1 parent 0e22986
commit dac9734
Show file tree

Hide file tree

Showing 42 changed files with 260 additions and 38 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -227,6 +227,30 @@ limitations under the License.
     </dependencies>
 
     <profiles>
+        <profile>
+            <id>jlink</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-invoker-plugin</artifactId>
+                        <configuration>
+                            <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+                            <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+                            <settingsFile>${project.basedir}/src/it/settings.xml</settingsFile>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>integration-test</goal>
+                                    <goal>verify</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
         <profile>
             <id>code-coverage</id>
             <build>

diff --git a/distribution/src/it/jlink/pom.xml b/distribution/src/it/jlink/pom.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+Copyright (C) 2013-2024 TU Dortmund University
+This file is part of LearnLib, http://www.learnlib.de/.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>de.learnlib</groupId>
+        <artifactId>learnlib-parent</artifactId>
+        <version>@project.version@</version>
+        <relativePath>../../../../pom.xml</relativePath>
+    </parent>
+
+    <groupId>de.learnlib.it</groupId>
+    <artifactId>learnlib-jlink</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>de.learnlib.distribution</groupId>
+            <artifactId>learnlib-distribution</artifactId>
+            <type>pom</type>
+            <!-- skip non-modular dependencies -->
+            <exclusions>
+                <exclusion>
+                    <groupId>net.automatalib</groupId>
+                    <artifactId>automata-brics</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>net.automatalib</groupId>
+                    <artifactId>automata-modelchecking-m3c</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>net.automatalib</groupId>
+                    <artifactId>automata-jung-visualizer</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jlink-plugin</artifactId>
+                <version>3.1.0</version>
+                <configuration>
+                    <classifier>distribution</classifier>
+                    <noHeaderFiles>true</noHeaderFiles>
+                    <noManPages>true</noManPages>
+                    <stripDebug>true</stripDebug>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>jlink</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>