Folds equalsverifier-11 into equalsverifier-core

jqno · Dec 15, 2024 · 9d37b51 · 9d37b51
1 parent a424636
commit 9d37b51
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 119 deletions.
diff --git a/equalsverifier-11/pom.xml b/equalsverifier-11/pom.xml
diff --git a/equalsverifier-11/src/test/java/nl/jqno/equalsverifier/testhelpers/types/Point.java b/equalsverifier-11/src/test/java/nl/jqno/equalsverifier/testhelpers/types/Point.java
diff --git a/equalsverifier-aggregator/pom.xml b/equalsverifier-aggregator/pom.xml
@@ -19,13 +19,6 @@
             <type>pom</type>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>nl.jqno.equalsverifier</groupId>
-            <artifactId>equalsverifier-11</artifactId>
-            <version>${project.version}</version>
-            <type>pom</type>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>nl.jqno.equalsverifier</groupId>
             <artifactId>equalsverifier-16</artifactId>
@@ -95,6 +88,8 @@
                                             <structure name="EqualsVerifier: internal coverage">
                                                 <classfiles>
                                                     <fileset dir="${project.basedir}/../equalsverifier-core/target/classes">
+                                                        <!--<exclude name="META-INF/**" />-->
+                                                        <exclude name="nl/jqno/equalsverifier/internal/versionspecific/*.class"/>
                                                         <include name="**/*.class" />
                                                     </fileset>
                                                 </classfiles>

diff --git a/equalsverifier-aggregator/src/main/resources/assemblies/assembly.xml b/equalsverifier-aggregator/src/main/resources/assemblies/assembly.xml
@@ -12,27 +12,6 @@
             <binaries>
                 <unpack>true</unpack>
                 <includeDependencies>false</includeDependencies>
-                <unpackOptions>
-                    <excludes>
-                        <exclude>/META-INF/**</exclude>
-                    </excludes>
-                </unpackOptions>
-            </binaries>
-        </moduleSet>
-        <moduleSet>
-            <useAllReactorProjects>true</useAllReactorProjects>
-            <includes>
-                <include>nl.jqno.equalsverifier:equalsverifier-11</include>
-            </includes>
-            <binaries>
-                <outputDirectory>META-INF/versions/11</outputDirectory>
-                <unpack>true</unpack>
-                <includeDependencies>false</includeDependencies>
-                <unpackOptions>
-                    <excludes>
-                        <exclude>/META-INF/**</exclude>
-                    </excludes>
-                </unpackOptions>
             </binaries>
         </moduleSet>
         <moduleSet>

diff --git a/equalsverifier-core/pom.xml b/equalsverifier-core/pom.xml
@@ -111,6 +111,12 @@
             <version>${version.spotbugs}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.openjfx</groupId>
+            <artifactId>javafx-base</artifactId>
+            <version>${version.openjfx}</version>
+            <scope>test</scope>
+        </dependency>
 
         <!-- Third party dependencies that should be supported -->
         <dependency>

diff --git a/...nternal/versionspecific/ModuleHelper.java → ...nternal/versionspecific/ModuleHelper.java b/...nternal/versionspecific/ModuleHelper.java → ...nternal/versionspecific/ModuleHelper.java
diff --git a/.../extended_contract/JavaFxClassesTest.java → .../extended_contract/JavaFxClassesTest.java b/.../extended_contract/JavaFxClassesTest.java → .../extended_contract/JavaFxClassesTest.java
diff --git a/equalsverifier-release-main/pom.xml b/equalsverifier-release-main/pom.xml
@@ -167,13 +167,6 @@
             <scope>provided</scope>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>nl.jqno.equalsverifier</groupId>
-            <artifactId>equalsverifier-11</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>nl.jqno.equalsverifier</groupId>
             <artifactId>equalsverifier-16</artifactId>

diff --git a/equalsverifier-release-nodep/pom.xml b/equalsverifier-release-nodep/pom.xml
@@ -166,12 +166,6 @@
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>nl.jqno.equalsverifier</groupId>
-            <artifactId>equalsverifier-11</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>nl.jqno.equalsverifier</groupId>
             <artifactId>equalsverifier-16</artifactId>

diff --git a/...r-release-verify/src/test/java/nl/jqno/equalsverifier/verify_release/pom/MainPomTest.java b/...r-release-verify/src/test/java/nl/jqno/equalsverifier/verify_release/pom/MainPomTest.java
@@ -31,12 +31,11 @@ public void artifactId() {
     @Test
     public void dependencies() {
         assertAll(
-            () -> pom.assertNumberOfDependencies(6),
+            () -> pom.assertNumberOfDependencies(5),
             () -> pom.assertDependencyIsOptional(1),
             () -> pom.assertDependencyIsOptional(2),
             () -> pom.assertDependencyIsOptional(3),
-            () -> pom.assertDependencyIsOptional(4),
-            () -> pom.assertDependency(5, "org.objenesis", "objenesis"),
-            () -> pom.assertDependency(6, "net.bytebuddy", "byte-buddy"));
+            () -> pom.assertDependency(4, "org.objenesis", "objenesis"),
+            () -> pom.assertDependency(5, "net.bytebuddy", "byte-buddy"));
     }
 }
diff --git a/pom.xml b/pom.xml
@@ -231,6 +231,37 @@
     </dependencies>
 
     <profiles>
+        <profile>
+            <id>full-multirelease-build</id>
+            <activation>
+                <jdk>[21,)</jdk>
+            </activation>
+
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>java-11</id>
+                                <phase>compile</phase>
+                                <goals>
+                                    <goal>compile</goal>
+                                </goals>
+                                <configuration>
+                                    <release>11</release>
+                                    <compileSourceRoots>
+                                        <compileSourceRoot>${project.basedir}/src/main/java-11</compileSourceRoot>
+                                    </compileSourceRoots>
+                                    <multiReleaseOutput>true</multiReleaseOutput>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
         <profile>
             <id>static-analysis</id>
             <activation>
@@ -521,7 +552,6 @@
 
             <modules>
                 <module>equalsverifier-core</module>
-                <module>equalsverifier-11</module>
             </modules>
         </profile>
 
@@ -533,7 +563,6 @@
 
             <modules>
                 <module>equalsverifier-core</module>
-                <module>equalsverifier-11</module>
                 <module>equalsverifier-16</module>
             </modules>
         </profile>
@@ -546,7 +575,6 @@
 
             <modules>
                 <module>equalsverifier-core</module>
-                <module>equalsverifier-11</module>
                 <module>equalsverifier-16</module>
                 <module>equalsverifier-17</module>
             </modules>
@@ -560,7 +588,6 @@
 
             <modules>
                 <module>equalsverifier-core</module>
-                <module>equalsverifier-11</module>
                 <module>equalsverifier-16</module>
                 <module>equalsverifier-17</module>
                 <module>equalsverifier-21</module>