From 3b02ad930437f5baa622d9d15a5cd451d8ba6fc9 Mon Sep 17 00:00:00 2001
From: Josiah Noel <32279667+SentryMan@users.noreply.github.com>
Date: Tue, 3 Sep 2024 12:41:17 -0400
Subject: [PATCH 1/4] Add module descriptor with moditect

---
 aws-lambda-java-core/module-info.java |  5 +++++
 aws-lambda-java-core/pom.xml          | 25 +++++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 aws-lambda-java-core/module-info.java

diff --git a/aws-lambda-java-core/module-info.java b/aws-lambda-java-core/module-info.java
new file mode 100644
index 00000000..d1cacb3c
--- /dev/null
+++ b/aws-lambda-java-core/module-info.java
@@ -0,0 +1,5 @@
+module aws.lambda.core {
+
+  exports com.amazonaws.services.lambda.runtime;
+  exports com.amazonaws.services.lambda.runtime.logging;
+}
diff --git a/aws-lambda-java-core/pom.xml b/aws-lambda-java-core/pom.xml
index 0dd848a9..3221aa59 100644
--- a/aws-lambda-java-core/pom.xml
+++ b/aws-lambda-java-core/pom.xml
@@ -43,6 +43,31 @@
     </repository>
   </distributionManagement>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.moditect</groupId>
+        <artifactId>moditect-maven-plugin</artifactId>
+        <version>1.0.0.Final</version>
+        <executions>
+          <execution>
+            <id>add-module-infos</id>
+            <phase>package</phase>
+            <goals>
+              <goal>add-module-info</goal>
+            </goals>
+            <configuration>
+              <overwriteExistingFiles>true</overwriteExistingFiles>
+              <module>
+                <moduleInfoFile>./module-info.java
+                </moduleInfoFile>
+              </module>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
   <profiles>
     <profile>
       <id>dev</id>

From 41eee66c9c1c48dc631dff363c89d48577b5cb9f Mon Sep 17 00:00:00 2001
From: Josiah Noel <32279667+SentryMan@users.noreply.github.com>
Date: Tue, 3 Sep 2024 20:02:11 -0400
Subject: [PATCH 2/4] it's module time

---
 .../module-info.java                          | 10 +++++++
 .../pom.xml                                   | 21 +++++++++++++++
 aws-lambda-java-events/module-info.java       | 11 ++++++++
 aws-lambda-java-events/pom.xml                | 25 ++++++++++++++++++
 aws-lambda-java-log4j2/module-info.java       |  9 +++++++
 aws-lambda-java-log4j2/pom.xml                | 26 ++++++++++++++++++-
 .../module-info.java                          | 16 ++++++++++++
 .../pom.xml                                   | 21 +++++++++++++++
 .../module-info.java                          | 18 +++++++++++++
 aws-lambda-java-serialization/pom.xml         | 25 ++++++++++++++++--
 10 files changed, 179 insertions(+), 3 deletions(-)
 create mode 100644 aws-lambda-java-events-sdk-transformer/module-info.java
 create mode 100644 aws-lambda-java-events/module-info.java
 create mode 100644 aws-lambda-java-log4j2/module-info.java
 create mode 100644 aws-lambda-java-runtime-interface-client/module-info.java
 create mode 100644 aws-lambda-java-serialization/module-info.java

diff --git a/aws-lambda-java-events-sdk-transformer/module-info.java b/aws-lambda-java-events-sdk-transformer/module-info.java
new file mode 100644
index 00000000..c4ab43ef
--- /dev/null
+++ b/aws-lambda-java-events-sdk-transformer/module-info.java
@@ -0,0 +1,10 @@
+module aws.lambda.events.sdk.transformer {
+
+  exports com.amazonaws.services.lambda.runtime.events.transformers.v1;
+  exports com.amazonaws.services.lambda.runtime.events.transformers.v1.dynamodb;
+  exports com.amazonaws.services.lambda.runtime.events.transformers.v2;
+  exports com.amazonaws.services.lambda.runtime.events.transformers.v2.dynamodb;
+
+  requires transitive aws.lambda.events;
+  requires static aws.java.sdk.dynamodb;
+}
diff --git a/aws-lambda-java-events-sdk-transformer/pom.xml b/aws-lambda-java-events-sdk-transformer/pom.xml
index 6a2b1735..4c66d7f4 100644
--- a/aws-lambda-java-events-sdk-transformer/pom.xml
+++ b/aws-lambda-java-events-sdk-transformer/pom.xml
@@ -85,6 +85,27 @@
         <artifactId>maven-failsafe-plugin</artifactId>
         <version>2.22.2</version>
       </plugin>
+      <plugin>
+        <groupId>org.moditect</groupId>
+        <artifactId>moditect-maven-plugin</artifactId>
+        <version>1.0.0.Final</version>
+        <executions>
+          <execution>
+            <id>add-module-infos</id>
+            <phase>package</phase>
+            <goals>
+              <goal>add-module-info</goal>
+            </goals>
+            <configuration>
+              <overwriteExistingFiles>true</overwriteExistingFiles>
+              <module>
+                <moduleInfoFile>./module-info.java
+                </moduleInfoFile>
+              </module>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 
diff --git a/aws-lambda-java-events/module-info.java b/aws-lambda-java-events/module-info.java
new file mode 100644
index 00000000..5b1172c9
--- /dev/null
+++ b/aws-lambda-java-events/module-info.java
@@ -0,0 +1,11 @@
+module aws.lambda.events {
+
+  exports com.amazonaws.services.lambda.runtime.events;
+  exports com.amazonaws.services.lambda.runtime.events.models;
+  exports com.amazonaws.services.lambda.runtime.events.models.dynamodb;
+  exports com.amazonaws.services.lambda.runtime.events.models.kinesis;
+  exports com.amazonaws.services.lambda.runtime.events.models.s3;
+
+  requires static lombok;
+  requires org.joda.time;
+}
diff --git a/aws-lambda-java-events/pom.xml b/aws-lambda-java-events/pom.xml
index ec3806fb..8da5bd84 100644
--- a/aws-lambda-java-events/pom.xml
+++ b/aws-lambda-java-events/pom.xml
@@ -80,6 +80,31 @@
         </dependency>
     </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.moditect</groupId>
+        <artifactId>moditect-maven-plugin</artifactId>
+        <version>1.0.0.Final</version>
+        <executions>
+          <execution>
+            <id>add-module-infos</id>
+            <phase>package</phase>
+            <goals>
+              <goal>add-module-info</goal>
+            </goals>
+            <configuration>
+              <overwriteExistingFiles>true</overwriteExistingFiles>
+              <module>
+                <moduleInfoFile>./module-info.java
+                </moduleInfoFile>
+              </module>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
     <profiles>
         <profile>
             <id>dev</id>
diff --git a/aws-lambda-java-log4j2/module-info.java b/aws-lambda-java-log4j2/module-info.java
new file mode 100644
index 00000000..80a39ba1
--- /dev/null
+++ b/aws-lambda-java-log4j2/module-info.java
@@ -0,0 +1,9 @@
+module aws.lambda.log4j2 {
+
+  exports com.amazonaws.services.lambda.runtime.log4j2;
+
+  requires aws.lambda.core;
+  requires org.apache.logging.log4j;
+  requires org.apache.logging.log4j.core;
+
+}
diff --git a/aws-lambda-java-log4j2/pom.xml b/aws-lambda-java-log4j2/pom.xml
index b33300ef..6061a846 100644
--- a/aws-lambda-java-log4j2/pom.xml
+++ b/aws-lambda-java-log4j2/pom.xml
@@ -61,7 +61,31 @@
             <version>${log4j.version}</version>
         </dependency>
     </dependencies>
-
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.moditect</groupId>
+        <artifactId>moditect-maven-plugin</artifactId>
+        <version>1.0.0.Final</version>
+        <executions>
+          <execution>
+            <id>add-module-infos</id>
+            <phase>package</phase>
+            <goals>
+              <goal>add-module-info</goal>
+            </goals>
+            <configuration>
+              <overwriteExistingFiles>true</overwriteExistingFiles>
+              <module>
+                <moduleInfoFile>./module-info.java
+                </moduleInfoFile>
+              </module>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
     <profiles>
         <profile>
             <id>dev</id>
diff --git a/aws-lambda-java-runtime-interface-client/module-info.java b/aws-lambda-java-runtime-interface-client/module-info.java
new file mode 100644
index 00000000..99bca665
--- /dev/null
+++ b/aws-lambda-java-runtime-interface-client/module-info.java
@@ -0,0 +1,16 @@
+module aws.lambda.runtime.client {
+
+  exports com.amazonaws.services.lambda.crac;
+  exports com.amazonaws.services.lambda.runtime.api.client;
+  exports com.amazonaws.services.lambda.runtime.api.client.api;
+  exports com.amazonaws.services.lambda.runtime.api.client.logging;
+  exports com.amazonaws.services.lambda.runtime.api.client.runtimeapi;
+  exports com.amazonaws.services.lambda.runtime.api.client.runtimeapi.converters;
+  exports com.amazonaws.services.lambda.runtime.api.client.runtimeapi.dto;
+  exports com.amazonaws.services.lambda.runtime.api.client.util;
+
+  requires transitive aws.lambda.core;
+  requires transitive aws.lambda.serialization;
+  requires jdk.unsupported;
+
+}
diff --git a/aws-lambda-java-runtime-interface-client/pom.xml b/aws-lambda-java-runtime-interface-client/pom.xml
index b5ea2721..f13875b7 100644
--- a/aws-lambda-java-runtime-interface-client/pom.xml
+++ b/aws-lambda-java-runtime-interface-client/pom.xml
@@ -265,6 +265,27 @@
                     </execution>
                 </executions>
             </plugin>
+      <plugin>
+        <groupId>org.moditect</groupId>
+        <artifactId>moditect-maven-plugin</artifactId>
+        <version>1.0.0.Final</version>
+        <executions>
+          <execution>
+            <id>add-module-infos</id>
+            <phase>package</phase>
+            <goals>
+              <goal>add-module-info</goal>
+            </goals>
+            <configuration>
+              <overwriteExistingFiles>true</overwriteExistingFiles>
+              <module>
+                <moduleInfoFile>./module-info.java
+                </moduleInfoFile>
+              </module>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
         </plugins>
     </build>
 
diff --git a/aws-lambda-java-serialization/module-info.java b/aws-lambda-java-serialization/module-info.java
new file mode 100644
index 00000000..74e83f8e
--- /dev/null
+++ b/aws-lambda-java-serialization/module-info.java
@@ -0,0 +1,18 @@
+module aws.lambda.serialization {
+
+  exports com.amazonaws.services.lambda.runtime.serialization;
+  exports com.amazonaws.services.lambda.runtime.serialization.events;
+  exports com.amazonaws.services.lambda.runtime.serialization.events.mixins;
+  exports com.amazonaws.services.lambda.runtime.serialization.events.modules;
+  exports com.amazonaws.services.lambda.runtime.serialization.events.serializers;
+  exports com.amazonaws.services.lambda.runtime.serialization.factories;
+  exports com.amazonaws.services.lambda.runtime.serialization.util;
+
+  requires transitive com.fasterxml.jackson.databind;
+  requires static com.fasterxml.jackson.datatype.joda;
+  requires static org.json;
+  requires static com.google.gson;
+  requires static com.fasterxml.jackson.datatype.jsr310;
+  requires static com.fasterxml.jackson.datatype.jdk8;
+
+}
diff --git a/aws-lambda-java-serialization/pom.xml b/aws-lambda-java-serialization/pom.xml
index 07ccecc8..3b838ee4 100644
--- a/aws-lambda-java-serialization/pom.xml
+++ b/aws-lambda-java-serialization/pom.xml
@@ -266,6 +266,27 @@
                     </execution>
                 </executions>
             </plugin>
-        </plugins>
-    </build>
+      <plugin>
+        <groupId>org.moditect</groupId>
+        <artifactId>moditect-maven-plugin</artifactId>
+        <version>1.0.0.Final</version>
+        <executions>
+          <execution>
+            <id>add-module-infos</id>
+            <phase>package</phase>
+            <goals>
+              <goal>add-module-info</goal>
+            </goals>
+            <configuration>
+              <overwriteExistingFiles>true</overwriteExistingFiles>
+              <module>
+                <moduleInfoFile>./module-info.java
+                </moduleInfoFile>
+              </module>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>

From 6891743e1ab7061e876010a830c63c8437c3a3b0 Mon Sep 17 00:00:00 2001
From: Josiah Noel <32279667+SentryMan@users.noreply.github.com>
Date: Tue, 3 Sep 2024 20:10:55 -0400
Subject: [PATCH 3/4] don't fail when building twice

---
 aws-lambda-java-core/pom.xml                     | 1 +
 aws-lambda-java-events-sdk-transformer/pom.xml   | 1 +
 aws-lambda-java-events/pom.xml                   | 1 +
 aws-lambda-java-log4j2/pom.xml                   | 1 +
 aws-lambda-java-runtime-interface-client/pom.xml | 1 +
 aws-lambda-java-serialization/pom.xml            | 1 +
 6 files changed, 6 insertions(+)

diff --git a/aws-lambda-java-core/pom.xml b/aws-lambda-java-core/pom.xml
index 3221aa59..e4362d70 100644
--- a/aws-lambda-java-core/pom.xml
+++ b/aws-lambda-java-core/pom.xml
@@ -57,6 +57,7 @@
               <goal>add-module-info</goal>
             </goals>
             <configuration>
+              <failOnWarning>false</failOnWarning>
               <overwriteExistingFiles>true</overwriteExistingFiles>
               <module>
                 <moduleInfoFile>./module-info.java
diff --git a/aws-lambda-java-events-sdk-transformer/pom.xml b/aws-lambda-java-events-sdk-transformer/pom.xml
index 4c66d7f4..5a33b22c 100644
--- a/aws-lambda-java-events-sdk-transformer/pom.xml
+++ b/aws-lambda-java-events-sdk-transformer/pom.xml
@@ -97,6 +97,7 @@
               <goal>add-module-info</goal>
             </goals>
             <configuration>
+              <failOnWarning>false</failOnWarning>
               <overwriteExistingFiles>true</overwriteExistingFiles>
               <module>
                 <moduleInfoFile>./module-info.java
diff --git a/aws-lambda-java-events/pom.xml b/aws-lambda-java-events/pom.xml
index 8da5bd84..6f2cf151 100644
--- a/aws-lambda-java-events/pom.xml
+++ b/aws-lambda-java-events/pom.xml
@@ -94,6 +94,7 @@
               <goal>add-module-info</goal>
             </goals>
             <configuration>
+              <failOnWarning>false</failOnWarning>
               <overwriteExistingFiles>true</overwriteExistingFiles>
               <module>
                 <moduleInfoFile>./module-info.java
diff --git a/aws-lambda-java-log4j2/pom.xml b/aws-lambda-java-log4j2/pom.xml
index 6061a846..01d9b190 100644
--- a/aws-lambda-java-log4j2/pom.xml
+++ b/aws-lambda-java-log4j2/pom.xml
@@ -75,6 +75,7 @@
               <goal>add-module-info</goal>
             </goals>
             <configuration>
+              <failOnWarning>false</failOnWarning>
               <overwriteExistingFiles>true</overwriteExistingFiles>
               <module>
                 <moduleInfoFile>./module-info.java
diff --git a/aws-lambda-java-runtime-interface-client/pom.xml b/aws-lambda-java-runtime-interface-client/pom.xml
index f13875b7..b7636ddc 100644
--- a/aws-lambda-java-runtime-interface-client/pom.xml
+++ b/aws-lambda-java-runtime-interface-client/pom.xml
@@ -277,6 +277,7 @@
               <goal>add-module-info</goal>
             </goals>
             <configuration>
+              <failOnWarning>false</failOnWarning>
               <overwriteExistingFiles>true</overwriteExistingFiles>
               <module>
                 <moduleInfoFile>./module-info.java
diff --git a/aws-lambda-java-serialization/pom.xml b/aws-lambda-java-serialization/pom.xml
index 3b838ee4..c8dca3f6 100644
--- a/aws-lambda-java-serialization/pom.xml
+++ b/aws-lambda-java-serialization/pom.xml
@@ -278,6 +278,7 @@
               <goal>add-module-info</goal>
             </goals>
             <configuration>
+              <failOnWarning>false</failOnWarning>
               <overwriteExistingFiles>true</overwriteExistingFiles>
               <module>
                 <moduleInfoFile>./module-info.java

From 83d0ad76d5c48a70dca5738eef2597f3116d94d7 Mon Sep 17 00:00:00 2001
From: Josiah Noel <32279667+SentryMan@users.noreply.github.com>
Date: Mon, 16 Sep 2024 10:02:06 -0400
Subject: [PATCH 4/4] bump version

---
 aws-lambda-java-core/pom.xml                     | 2 +-
 aws-lambda-java-events-sdk-transformer/pom.xml   | 2 +-
 aws-lambda-java-events/pom.xml                   | 2 +-
 aws-lambda-java-log4j2/pom.xml                   | 2 +-
 aws-lambda-java-runtime-interface-client/pom.xml | 2 +-
 aws-lambda-java-serialization/pom.xml            | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/aws-lambda-java-core/pom.xml b/aws-lambda-java-core/pom.xml
index e4362d70..174f6118 100644
--- a/aws-lambda-java-core/pom.xml
+++ b/aws-lambda-java-core/pom.xml
@@ -48,7 +48,7 @@
       <plugin>
         <groupId>org.moditect</groupId>
         <artifactId>moditect-maven-plugin</artifactId>
-        <version>1.0.0.Final</version>
+        <version>1.2.2.Final</version>
         <executions>
           <execution>
             <id>add-module-infos</id>
diff --git a/aws-lambda-java-events-sdk-transformer/pom.xml b/aws-lambda-java-events-sdk-transformer/pom.xml
index 5a33b22c..4abfa1a9 100644
--- a/aws-lambda-java-events-sdk-transformer/pom.xml
+++ b/aws-lambda-java-events-sdk-transformer/pom.xml
@@ -88,7 +88,7 @@
       <plugin>
         <groupId>org.moditect</groupId>
         <artifactId>moditect-maven-plugin</artifactId>
-        <version>1.0.0.Final</version>
+        <version>1.2.2.Final</version>
         <executions>
           <execution>
             <id>add-module-infos</id>
diff --git a/aws-lambda-java-events/pom.xml b/aws-lambda-java-events/pom.xml
index 6f2cf151..7d3ee127 100644
--- a/aws-lambda-java-events/pom.xml
+++ b/aws-lambda-java-events/pom.xml
@@ -85,7 +85,7 @@
       <plugin>
         <groupId>org.moditect</groupId>
         <artifactId>moditect-maven-plugin</artifactId>
-        <version>1.0.0.Final</version>
+        <version>1.2.2.Final</version>
         <executions>
           <execution>
             <id>add-module-infos</id>
diff --git a/aws-lambda-java-log4j2/pom.xml b/aws-lambda-java-log4j2/pom.xml
index 01d9b190..7fd37466 100644
--- a/aws-lambda-java-log4j2/pom.xml
+++ b/aws-lambda-java-log4j2/pom.xml
@@ -66,7 +66,7 @@
       <plugin>
         <groupId>org.moditect</groupId>
         <artifactId>moditect-maven-plugin</artifactId>
-        <version>1.0.0.Final</version>
+        <version>1.2.2.Final</version>
         <executions>
           <execution>
             <id>add-module-infos</id>
diff --git a/aws-lambda-java-runtime-interface-client/pom.xml b/aws-lambda-java-runtime-interface-client/pom.xml
index b7636ddc..d1a05eda 100644
--- a/aws-lambda-java-runtime-interface-client/pom.xml
+++ b/aws-lambda-java-runtime-interface-client/pom.xml
@@ -268,7 +268,7 @@
       <plugin>
         <groupId>org.moditect</groupId>
         <artifactId>moditect-maven-plugin</artifactId>
-        <version>1.0.0.Final</version>
+        <version>1.2.2.Final</version>
         <executions>
           <execution>
             <id>add-module-infos</id>
diff --git a/aws-lambda-java-serialization/pom.xml b/aws-lambda-java-serialization/pom.xml
index c8dca3f6..63d4aa29 100644
--- a/aws-lambda-java-serialization/pom.xml
+++ b/aws-lambda-java-serialization/pom.xml
@@ -269,7 +269,7 @@
       <plugin>
         <groupId>org.moditect</groupId>
         <artifactId>moditect-maven-plugin</artifactId>
-        <version>1.0.0.Final</version>
+        <version>1.2.2.Final</version>
         <executions>
           <execution>
             <id>add-module-infos</id>