Merge branch '1.0.5' into master

# Conflicts: # pom.xml # src/main/nbm/manifest.mf
aditosoftware · Jan 24, 2022 · 67e3210 · 67e3210
2 parents a96b14e + 2deb18c
commit 67e3210
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 0 deletions.
diff --git a/pom.xml b/pom.xml
@@ -197,6 +197,16 @@
       <artifactId>org-netbeans-modules-lsp-client</artifactId>
       <version>${netbeans.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.netbeans.api</groupId>
+      <artifactId>org-netbeans-modules-editor</artifactId>
+      <version>${netbeans.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.netbeans.api</groupId>
+      <artifactId>org-netbeans-modules-editor-lib</artifactId>
+      <version>${netbeans.version}</version>
+    </dependency>
 
     <!-- Commons-IO -->
     <dependency>

diff --git a/src/main/java/de/adito/aditoweb/nbm/nodejs/impl/NodeJSExecutorImpl.java b/src/main/java/de/adito/aditoweb/nbm/nodejs/impl/NodeJSExecutorImpl.java
@@ -122,6 +122,11 @@ public CompletableFuture<Integer> executeAsync(@NotNull INodeJSEnvironment pEnv,
           builder.withVar(entry.getKey(), entry.getValue());
       }
 
+      // add all system properties
+      System.getProperties()
+          // dots are not allowed as key => replacing with underscore
+          .forEach((pKey, pValue) -> builder.withVar(((String) pKey).replaceAll("\\.", "_").toUpperCase(), (String) pValue));
+
       builder.withWorkingDirectory(workingDir)
           .withOutputStream(pDefaultOut)
           .withErrorStream(pErrorOut == null ? pDefaultOut : pErrorOut)

diff --git a/src/main/nbm/manifest.mf b/src/main/nbm/manifest.mf
@@ -10,6 +10,11 @@ OpenIDE-Module-Long-Description: NodeJS & TypeScript Support for ADITO Designer
   <ul>
     <li>Added JavaScript- and TypeScript-Client for Language Server Protocol</li>
   </ul>
+  <p style="font-weight: bold;">v1.0.5</p>
+  <p style="margin-left: 10px; font-weight: bold;">MINOR</p>
+  <ul>
+    <li>Add Java system properties to NodeJS execution process as environment variables</li>
+  </ul>
   <p style="font-weight: bold;">v1.0.4</p>
   <p style="margin-left: 10px; font-weight: bold;">BUGFIXES</p>
   <ul>