Merge branch 'master' into chore/MMP-596

mulesoft · Sep 28, 2023 · 599680b · 599680b
2 parents 8ae7578 + f4bcec3
commit 599680b
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 9 deletions.
diff --git a/embedded/embedded-impl/src/main/java/module-info.java b/embedded/embedded-impl/src/main/java/module-info.java
@@ -20,7 +20,7 @@
   requires org.mule.runtime.artifact;
   requires org.mule.runtime.container;
   requires org.mule.runtime.deployment;
-  // TODO W-13718989 Remove when launcher module is properly modularized
+  // TODO W-14145969 Remove when launcher module is properly modularized
   requires org.mule.runtime.deployment.model.impl;
   requires org.mule.runtime.log4j;
 

diff --git a/standalone/assembly-allowlist.txt b/standalone/assembly-allowlist.txt
@@ -53,6 +53,7 @@
 /mule-standalone-${productVersion}/lib/boot/libwrapper-solaris-sparc-64.so
 /mule-standalone-${productVersion}/lib/boot/libwrapper-solaris-x86-32.so
 /mule-standalone-${productVersion}/lib/boot/commons-cli-1.2.jar
+/mule-standalone-${productVersion}/lib/boot/mule-module-boot-api-${productVersion}.jar
 /mule-standalone-${productVersion}/lib/boot/mule-module-reboot-${productVersion}.jar
 /mule-standalone-${productVersion}/lib/boot/mule-module-jpms-utils-${productVersion}.jar
 /mule-standalone-${productVersion}/lib/boot/mule-module-tanuki-boot-${productVersion}.jar

diff --git a/standalone/pom.xml b/standalone/pom.xml
@@ -167,6 +167,11 @@
         </dependency>
 
         <!-- Modules for standalone container -->
+        <dependency>
+            <groupId>org.mule.runtime</groupId>
+            <artifactId>mule-module-boot-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.mule.runtime</groupId>
             <artifactId>mule-module-reboot</artifactId>

diff --git a/standalone/src/assembly/assembly.xml b/standalone/src/assembly/assembly.xml
@@ -130,6 +130,7 @@
             <useStrictFiltering>true</useStrictFiltering>
             <fileMode>0640</fileMode>
             <includes>
+                <include>org.mule.runtime:mule-module-boot-api</include>
                 <include>org.mule.runtime:mule-module-reboot</include>
                 <include>org.mule.runtime:mule-module-jpms-utils</include>
                 <include>org.mule.runtime:mule-module-tanuki-boot</include>
@@ -409,6 +410,7 @@
                 <exclude>org.mule.runtime:mule-module-service</exclude>
                 <exclude>org.mule.runtime:mule-module-policy-api</exclude>
                 <exclude>org.mule.runtime:mule-module-properties-config</exclude>
+                <exclude>org.mule.runtime:mule-module-boot-api</exclude>
                 <exclude>org.mule.runtime:mule-module-reboot</exclude>
                 <exclude>org.mule.runtime:mule-module-jpms-utils</exclude>
                 <exclude>org.mule.runtime:mule-module-tanuki-boot</exclude>

diff --git a/standalone/src/main/resources/conf/java11-plus/wrapper.jvmDependant.conf b/standalone/src/main/resources/conf/java11-plus/wrapper.jvmDependant.conf
@@ -5,11 +5,8 @@ wrapper.java.additional.<n2>=--add-modules=\
         org.mule.boot.tanuki,\
         org.mule.runtime.jpms.utils,\
         com.fasterxml.jackson.core
-# TODO W-13718989: this reads to org.mule.boot should be declared in the reading module
-wrapper.java.additional.<n3>=--add-reads=org.mule.boot.tanuki=org.mule.boot
-wrapper.java.additional.<n4>=--add-exports=org.mule.boot/org.mule.runtime.module.reboot=ALL-UNNAMED
-wrapper.java.additional.<n5>=--add-opens=java.base/java.lang=org.mule.runtime.jpms.utils
-wrapper.java.additional.<n6>=--add-opens=java.base/java.lang.reflect=org.mule.runtime.jpms.utils
-wrapper.java.additional.<n7>=--add-opens=java.base/java.security.cert=org.mule.runtime.jpms.utils
+wrapper.java.additional.<n3>=--add-opens=java.base/java.lang=org.mule.runtime.jpms.utils
+wrapper.java.additional.<n4>=--add-opens=java.base/java.lang.reflect=org.mule.runtime.jpms.utils
+wrapper.java.additional.<n5>=--add-opens=java.base/java.security.cert=org.mule.runtime.jpms.utils
 # Avoid printing warnings from Graal js engine used in scheduler-service
-wrapper.java.additional.<n8>=-Dpolyglot.engine.WarnInterpreterOnly=false
+wrapper.java.additional.<n6>=-Dpolyglot.engine.WarnInterpreterOnly=false
diff --git a/tests/src/test/java/org/mule/distributions/tests/AppControlTestCase.java b/tests/src/test/java/org/mule/distributions/tests/AppControlTestCase.java
@@ -29,7 +29,7 @@ public class AppControlTestCase extends AbstractAppControl {
   @Before
   public void setup() {
     getMule().deploy(getResourceAsString("apps", EMPTY_APP));
-    Map<String, String> envVars = new HashMap<>();
+    Map<String, String> envVars = new HashMap<>(System.getenv());
     envVars.put("DETAIL_STATUS", "true");
     getMule().setTestEnvVars(envVars);
   }