From d69d830d31949914897a61727c1a79430f89c0ff Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Sat, 11 Jan 2025 15:09:29 -0800
Subject: [PATCH] Fix #274: add proper `module-info.java` handling (#275)

---
 pom.xml                        | 8 +-------
 release-notes/VERSION          | 1 +
 src/main/java/module-info.java | 5 +++++
 src/moditect/module-info.java  | 7 -------
 4 files changed, 7 insertions(+), 14 deletions(-)
 create mode 100644 src/main/java/module-info.java
 delete mode 100644 src/moditect/module-info.java

diff --git a/pom.xml b/pom.xml
index dadbb6a7..3292184a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,6 @@ https://stackoverflow.com/questions/16302247/maven-property-project-artifact-sel
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter</artifactId>
-      <version>${version.junit5}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -99,18 +98,13 @@ https://stackoverflow.com/questions/16302247/maven-property-project-artifact-sel
 
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.moditect</groupId>
-        <artifactId>moditect-maven-plugin</artifactId>
-      </plugin>
-
       <!-- 08-Nov-2019, tatu: Copied from
            https://github.com/stephenc/git-timestamp-maven-plugin/blob/master/pom.xml#L327-L337
          -->
       <plugin>
         <groupId>org.sonatype.plugins</groupId>
         <artifactId>nexus-staging-maven-plugin</artifactId>
-        <version>1.6.14</version>
+        <version>1.7.0</version>
         <extensions>true</extensions>
         <configuration>
           <serverId>sonatype-nexus-staging</serverId>
diff --git a/release-notes/VERSION b/release-notes/VERSION
index e274ee5a..1e974d74 100644
--- a/release-notes/VERSION
+++ b/release-notes/VERSION
@@ -12,4 +12,5 @@ mostly)
 3.0 (not yet released)
 
 #272: Require JDK17 for jackson-annotations 3.0 for proper `module-info.java`
+#274: Change 3.0 to use `module-info.java` directly for build (instead of via Moditect)
 - Change `JsonInclude.value`, `JsonInclude.content` to `USE_DEFAULTS` (from `ALWAYS`)
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
new file mode 100644
index 00000000..12939e66
--- /dev/null
+++ b/src/main/java/module-info.java
@@ -0,0 +1,5 @@
+//  Jackson 3.x module-info for jackson-annotations Main artifact
+module com.fasterxml.jackson.annotation {
+    // Might not be required beyond exports but just in case:
+    opens com.fasterxml.jackson.annotation;
+}
diff --git a/src/moditect/module-info.java b/src/moditect/module-info.java
deleted file mode 100644
index e80286ce..00000000
--- a/src/moditect/module-info.java
+++ /dev/null
@@ -1,7 +0,0 @@
-// Generated 08-Mar-2019 using Moditect maven plugin
-module com.fasterxml.jackson.annotation {
-    exports com.fasterxml.jackson.annotation;
-    // 08-Mar-2019, tatu: may or may not be necessary but let's just
-    //    fully open to allow introspection
-    opens com.fasterxml.jackson.annotation;
-}