From 2f27e66fd39fa32fc04331a00737db07f045c045 Mon Sep 17 00:00:00 2001 From: Jan Ouwens Date: Thu, 16 Jan 2025 18:55:26 +0000 Subject: [PATCH] Adds custom module-info for nodep assembly --- equalsverifier-core/src/main/java/module-info.java | 2 ++ equalsverifier-release-nodep/pom.xml | 3 ++- .../src/main/assembly/assembly.xml | 8 ++++++++ .../src/main/java/module-info.java | 13 +++++++++++++ .../java/nl/jqno/equalsverifier/Placeholder.java | 4 ++++ .../nl/jqno/equalsverifier/api/Placeholder.java | 4 ++++ 6 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 equalsverifier-release-nodep/src/main/java/module-info.java create mode 100644 equalsverifier-release-nodep/src/main/java/nl/jqno/equalsverifier/Placeholder.java create mode 100644 equalsverifier-release-nodep/src/main/java/nl/jqno/equalsverifier/api/Placeholder.java diff --git a/equalsverifier-core/src/main/java/module-info.java b/equalsverifier-core/src/main/java/module-info.java index 58fe2e10d..f4a355b2e 100644 --- a/equalsverifier-core/src/main/java/module-info.java +++ b/equalsverifier-core/src/main/java/module-info.java @@ -1,3 +1,5 @@ +// When making changes to this file, make sure they are +// reflected in equalsverifier-release-nodep/../module-info.java! module nl.jqno.equalsverifier { exports nl.jqno.equalsverifier; exports nl.jqno.equalsverifier.api; diff --git a/equalsverifier-release-nodep/pom.xml b/equalsverifier-release-nodep/pom.xml index c77576aee..1804e663f 100644 --- a/equalsverifier-release-nodep/pom.xml +++ b/equalsverifier-release-nodep/pom.xml @@ -7,7 +7,7 @@ equalsverifier-parent 3.18.2-SNAPSHOT - pom + jar equalsverifier-nodep EqualsVerifier | release fat jar @@ -22,6 +22,7 @@ + 9 false false diff --git a/equalsverifier-release-nodep/src/main/assembly/assembly.xml b/equalsverifier-release-nodep/src/main/assembly/assembly.xml index 3f325ffb1..3436f58ea 100644 --- a/equalsverifier-release-nodep/src/main/assembly/assembly.xml +++ b/equalsverifier-release-nodep/src/main/assembly/assembly.xml @@ -12,6 +12,14 @@ assemblies/assembly.xml + + + + ${project.build.outputDirectory}/module-info.class + . + module-info.class + + true diff --git a/equalsverifier-release-nodep/src/main/java/module-info.java b/equalsverifier-release-nodep/src/main/java/module-info.java new file mode 100644 index 000000000..36509c575 --- /dev/null +++ b/equalsverifier-release-nodep/src/main/java/module-info.java @@ -0,0 +1,13 @@ +module nl.jqno.equalsverifier { + exports nl.jqno.equalsverifier; + exports nl.jqno.equalsverifier.api; + + // Built-in prefab values + requires static com.google.common; + requires static java.desktop; + requires static java.naming; + requires static java.rmi; + requires static java.sql; + requires static javafx.base; + requires static org.joda.time; +} diff --git a/equalsverifier-release-nodep/src/main/java/nl/jqno/equalsverifier/Placeholder.java b/equalsverifier-release-nodep/src/main/java/nl/jqno/equalsverifier/Placeholder.java new file mode 100644 index 000000000..9ebd365fd --- /dev/null +++ b/equalsverifier-release-nodep/src/main/java/nl/jqno/equalsverifier/Placeholder.java @@ -0,0 +1,4 @@ +package nl.jqno.equalsverifier; + +// A file needs to exist in this package in order to be able to compile the module-info.java +public class Placeholder {} diff --git a/equalsverifier-release-nodep/src/main/java/nl/jqno/equalsverifier/api/Placeholder.java b/equalsverifier-release-nodep/src/main/java/nl/jqno/equalsverifier/api/Placeholder.java new file mode 100644 index 000000000..d8b7b18a5 --- /dev/null +++ b/equalsverifier-release-nodep/src/main/java/nl/jqno/equalsverifier/api/Placeholder.java @@ -0,0 +1,4 @@ +package nl.jqno.equalsverifier.api; + +// A file needs to exist in this package in order to be able to compile the module-info.java +public class Placeholder {}