From df2cdce0b284b80535add056dc63eb8f0e2b3bb9 Mon Sep 17 00:00:00 2001
From: Michael Simons <michael.simons@neo4j.com>
Date: Wed, 7 Dec 2022 11:15:33 +0100
Subject: [PATCH 1/2] Use moditect plugin to re-add `module-info` after it has
 been nuked by the shade plugin.

The shade plugin will not only warn about shading breaking encapsulation, it will also remove existing modules inside the project that does the shading, without any option not doing this. We using the moditect plugin to re-add it after it has been nuked. The shaded dependencies have been omitted from the module declaration of course, as they included.
---
 bundle/pom.xml | 37 +++++++++++++++++++++++++++++++++++++
 pom.xml        |  5 +++++
 2 files changed, 42 insertions(+)

diff --git a/bundle/pom.xml b/bundle/pom.xml
index cb41f3ec1c..b07370d227 100644
--- a/bundle/pom.xml
+++ b/bundle/pom.xml
@@ -218,6 +218,43 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.moditect</groupId>
+        <artifactId>moditect-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>add-module-infos</id>
+            <phase>package</phase>
+            <goals>
+              <goal>add-module-info</goal>
+            </goals>
+            <configuration>
+              <overwriteExistingFiles>true</overwriteExistingFiles>
+              <module>
+                <moduleInfoSource><![CDATA[
+                  module org.neo4j.driver {
+                    exports org.neo4j.driver;
+                    exports org.neo4j.driver.async;
+                    exports org.neo4j.driver.reactive;
+                    exports org.neo4j.driver.reactivestreams;
+                    exports org.neo4j.driver.types;
+                    exports org.neo4j.driver.summary;
+                    exports org.neo4j.driver.net;
+                    exports org.neo4j.driver.util;
+                    exports org.neo4j.driver.exceptions;
+
+                    requires transitive java.logging;
+                    requires transitive org.reactivestreams;
+                    requires static micrometer.core;
+                    requires static org.graalvm.nativeimage.builder;
+                    requires static org.slf4j;
+                  }
+                ]]></moduleInfoSource>
+              </module>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 
diff --git a/pom.xml b/pom.xml
index 4bb8b28c54..ed2d8a793d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -619,6 +619,11 @@
             </execution>
           </executions>
         </plugin>
+        <plugin>
+          <groupId>org.moditect</groupId>
+          <artifactId>moditect-maven-plugin</artifactId>
+          <version>1.0.0.RC2</version>
+        </plugin>
       </plugins>
     </pluginManagement>
 

From b616b8939f57258bfe6ffc8fae882978b96eca52 Mon Sep 17 00:00:00 2001
From: Michael Simons <michael@simons.ac>
Date: Fri, 3 Mar 2023 10:24:08 +0100
Subject: [PATCH 2/2] Apply suggestions from code review

Co-authored-by: Dmitriy Tverdiakov <11927660+injectives@users.noreply.github.com>
---
 bundle/pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bundle/pom.xml b/bundle/pom.xml
index b07370d227..005cda6ca7 100644
--- a/bundle/pom.xml
+++ b/bundle/pom.xml
@@ -246,8 +246,9 @@
                     requires transitive java.logging;
                     requires transitive org.reactivestreams;
                     requires static micrometer.core;
-                    requires static org.graalvm.nativeimage.builder;
+                    requires static org.graalvm.sdk;
                     requires static org.slf4j;
+                    requires static java.management;
                   }
                 ]]></moduleInfoSource>
               </module>