diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index a898396b6b..1427f4adec 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -38,5 +38,4 @@ jobs:
       uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
       with:
         name: reports
-        path: build/reports
-
+        path: '*/build/reports'
diff --git a/rhino-engine/src/main/java/module-info.java b/rhino-engine/src/main/java/module-info.java
index 5708da4ecd..c5ec2e2c3e 100644
--- a/rhino-engine/src/main/java/module-info.java
+++ b/rhino-engine/src/main/java/module-info.java
@@ -1,6 +1,6 @@
 module org.mozilla.rhino.engine {
     exports org.mozilla.javascript.engine;
 
-    requires org.mozilla.rhino;
-    requires java.scripting;
+    requires transitive org.mozilla.rhino;
+    requires transitive java.scripting;
 }
diff --git a/rhino-tools/src/main/java/module-info.java b/rhino-tools/src/main/java/module-info.java
index 0bad7559a9..d60c324b01 100644
--- a/rhino-tools/src/main/java/module-info.java
+++ b/rhino-tools/src/main/java/module-info.java
@@ -1,7 +1,8 @@
 module org.mozilla.rhino.tools {
-    requires org.mozilla.rhino;
-    requires java.desktop;
+    requires transitive org.mozilla.rhino;
+    requires transitive java.desktop;
 
+    exports org.mozilla.javascript.tools;
     exports org.mozilla.javascript.tools.debugger;
     exports org.mozilla.javascript.tools.jsc;
     exports org.mozilla.javascript.tools.shell;
diff --git a/rhino-xml/src/main/java/module-info.java b/rhino-xml/src/main/java/module-info.java
index 999bd68d22..f88109a202 100644
--- a/rhino-xml/src/main/java/module-info.java
+++ b/rhino-xml/src/main/java/module-info.java
@@ -1,6 +1,6 @@
 module org.mozilla.javascript.xml {
     exports org.mozilla.javascript.xmlimpl;
 
-    requires org.mozilla.rhino;
-    requires java.xml;
+    requires transitive org.mozilla.rhino;
+    requires transitive java.xml;
 }
diff --git a/rhino/src/main/java/module-info.java b/rhino/src/main/java/module-info.java
index a1885a6ad8..2aea58119a 100644
--- a/rhino/src/main/java/module-info.java
+++ b/rhino/src/main/java/module-info.java
@@ -12,5 +12,5 @@
     exports org.mozilla.javascript.xml;
 
     requires java.compiler;
-    requires java.desktop;
+    requires transitive java.desktop;
 }
diff --git a/rhino/src/main/java/org/mozilla/javascript/NativeObject.java b/rhino/src/main/java/org/mozilla/javascript/NativeObject.java
index 6408e53a55..a62de8de6e 100644
--- a/rhino/src/main/java/org/mozilla/javascript/NativeObject.java
+++ b/rhino/src/main/java/org/mozilla/javascript/NativeObject.java
@@ -42,6 +42,7 @@ public String toString() {
         return ScriptRuntime.defaultObjectToString(this);
     }
 
+    @SuppressWarnings("resource")
     @Override
     protected void fillConstructorProperties(IdFunctionObject ctor) {
         addIdFunctionProperty(ctor, OBJECT_TAG, ConstructorId_getPrototypeOf, "getPrototypeOf", 1);
diff --git a/rhino/src/main/java/org/mozilla/javascript/ScriptableObject.java b/rhino/src/main/java/org/mozilla/javascript/ScriptableObject.java
index a4865478f7..6a8efb6060 100644
--- a/rhino/src/main/java/org/mozilla/javascript/ScriptableObject.java
+++ b/rhino/src/main/java/org/mozilla/javascript/ScriptableObject.java
@@ -305,6 +305,7 @@ public void put(String name, Scriptable start, Object value) {
      * @param start the object whose property is being set
      * @param value value to set the property to
      */
+    @SuppressWarnings("resource")
     @Override
     public void put(int index, Scriptable start, Object value) {
         if (externalData != null) {
diff --git a/tests/src/test/java/org/mozilla/javascript/tests/json/JsonParserTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/json/JsonParserTest.java
similarity index 100%
rename from tests/src/test/java/org/mozilla/javascript/tests/json/JsonParserTest.java
rename to rhino/src/test/java/org/mozilla/javascript/tests/json/JsonParserTest.java