Merge branch 'master' into release/5.3

NodePit · Aug 9, 2024 · b93fb0d · b93fb0d
2 parents acfe136 + ef72eaa
commit b93fb0d
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 24 deletions.
diff --git a/application/META-INF/MANIFEST.MF b/application/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: JSON node documentation generator
 Bundle-SymbolicName: de.philippkatz.knime.jsondocgen.application;singleton:=true
-Bundle-Version: 1.14.1.qualifier
+Bundle-Version: 1.14.2.qualifier
 Bundle-Vendor: Philipp Katz; Selenium Nodes
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,5.0.0)",

diff --git a/application/pom.xml b/application/pom.xml
@@ -4,13 +4,13 @@
 
   <modelVersion>4.0.0</modelVersion>
   <artifactId>de.philippkatz.knime.jsondocgen.application</artifactId>
-  <version>1.14.1-SNAPSHOT</version>
+  <version>1.14.2-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <parent>
     <groupId>de.philippkatz.knime.jsondocgen</groupId>
     <artifactId>de.philippkatz.knime.jsondocgen</artifactId>
-    <version>1.14.1-SNAPSHOT</version>
+    <version>1.14.2-SNAPSHOT</version>
   </parent>
 
   <build>

diff --git a/application/src/de/philippkatz/knime/jsondocgen/JsonNodeDocuGenerator.java b/application/src/de/philippkatz/knime/jsondocgen/JsonNodeDocuGenerator.java
@@ -48,10 +48,9 @@
 package de.philippkatz.knime.jsondocgen;
 
 import java.io.File;
-import java.io.FileOutputStream;
 import java.lang.reflect.Method;
 import java.net.URL;
-import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -67,7 +66,6 @@
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.commons.io.IOUtils;
 import org.apache.log4j.Logger;
 import org.apache.log4j.xml.DOMConfigurator;
 import org.eclipse.equinox.app.IApplication;
@@ -275,7 +273,7 @@ private void generate() throws Exception {
 			String resultJson = rootCategory.toJson();
 			File resultFile = new File(m_directory, "nodeDocumentation.json");
 			LOGGER.info("Writing nodes to " + resultFile);
-			IOUtils.write(resultJson, new FileOutputStream(resultFile), StandardCharsets.UTF_8);
+			Files.writeString(resultFile.toPath(), resultJson);
 
 		}
 
@@ -307,7 +305,7 @@ private void generate() throws Exception {
 
 			File portTypeResultFile = new File(m_directory, "portDocumentation.json");
 			LOGGER.info("Writing port types to " + portTypeResultFile);
-			IOUtils.write(Utils.toJson(rootElement), new FileOutputStream(portTypeResultFile), StandardCharsets.UTF_8);
+			Files.writeString(portTypeResultFile.toPath(), Utils.toJson(rootElement));
 
 		}
 
@@ -320,16 +318,14 @@ private void generate() throws Exception {
 
 			File splashIconsResultFile = new File(m_directory, "splashIcons.json");
 			LOGGER.info("Writing splash icons to " + splashIconsResultFile);
-			IOUtils.write(Utils.toJson(splashIcons), new FileOutputStream(splashIconsResultFile),
-					StandardCharsets.UTF_8);
+			Files.writeString(splashIconsResultFile.toPath(), Utils.toJson(splashIcons));
 		}
 
 		if (!m_skipMigrationRules) {
 			var migrationRuleDocs = MigrationRuleExtractor.extractMigrationRules();
 			var migrationsResultFile = new File(m_directory, "migrations.json");
 			LOGGER.info("Writing migrations to " + migrationsResultFile);
-			IOUtils.write(Utils.toJson(migrationRuleDocs), new FileOutputStream(migrationsResultFile),
-					StandardCharsets.UTF_8);
+			Files.writeString(migrationsResultFile.toPath(), Utils.toJson(migrationRuleDocs));
 		}
 	}
 

diff --git a/feature/feature.xml b/feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
    id="de.philippkatz.knime.jsondocgen.feature"
    label="NodePit JSON Documentation Generator"
-   version="1.14.1.qualifier"
+   version="1.14.2.qualifier"
    provider-name="seleniumnodes.com; Philipp Katz">
 
    <plugin

diff --git a/feature/pom.xml b/feature/pom.xml
@@ -4,13 +4,13 @@
 
   <modelVersion>4.0.0</modelVersion>
   <artifactId>de.philippkatz.knime.jsondocgen.feature</artifactId>
-  <version>1.14.1-SNAPSHOT</version>
+  <version>1.14.2-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <parent>
     <groupId>de.philippkatz.knime.jsondocgen</groupId>
     <artifactId>de.philippkatz.knime.jsondocgen</artifactId>
-    <version>1.14.1-SNAPSHOT</version>
+    <version>1.14.2-SNAPSHOT</version>
   </parent>
 
 </project>
diff --git a/p2/pom.xml b/p2/pom.xml
@@ -4,13 +4,13 @@
 
   <modelVersion>4.0.0</modelVersion>
   <artifactId>de.philippkatz.knime.jsondocgen.p2</artifactId>
-  <version>1.14.1-SNAPSHOT</version>
+  <version>1.14.2-SNAPSHOT</version>
   <packaging>eclipse-repository</packaging>
 
   <parent>
     <groupId>de.philippkatz.knime.jsondocgen</groupId>
     <artifactId>de.philippkatz.knime.jsondocgen</artifactId>
-    <version>1.14.1-SNAPSHOT</version>
+    <version>1.14.2-SNAPSHOT</version>
   </parent>
 
 </project>
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>de.philippkatz.knime.jsondocgen</groupId>
   <artifactId>de.philippkatz.knime.jsondocgen</artifactId>
-  <version>1.14.1-SNAPSHOT</version>
+  <version>1.14.2-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <modules>
@@ -39,7 +39,7 @@
             <artifact>
               <groupId>de.philippkatz.knime.jsondocgen</groupId>
               <artifactId>de.philippkatz.knime.jsondocgen.targetplatform</artifactId>
-              <version>1.14.1-SNAPSHOT</version>
+              <version>1.14.2-SNAPSHOT</version>
             </artifact>
           </target>
           <environments>

diff --git a/targetplatform/pom.xml b/targetplatform/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>de.philippkatz.knime.jsondocgen</groupId>
     <artifactId>de.philippkatz.knime.jsondocgen</artifactId>
-    <version>1.14.1-SNAPSHOT</version>
+    <version>1.14.2-SNAPSHOT</version>
   </parent>
 
 </project>
diff --git a/tests/META-INF/MANIFEST.MF b/tests/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: JSON node documentation generator tests
 Bundle-SymbolicName: de.philippkatz.knime.jsondocgen.tests;singleton:=true
-Bundle-Version: 1.14.1.qualifier
+Bundle-Version: 1.14.2.qualifier
 Bundle-Vendor: Philipp Katz; Selenium Nodes
 Bundle-RequiredExecutionEnvironment: JavaSE-17
-Fragment-Host: de.philippkatz.knime.jsondocgen.application;bundle-version="1.14.1"
+Fragment-Host: de.philippkatz.knime.jsondocgen.application;bundle-version="1.14.2"
 Require-Bundle: org.junit;bundle-version="4.12.0"
diff --git a/tests/pom.xml b/tests/pom.xml
@@ -4,13 +4,13 @@
 
   <modelVersion>4.0.0</modelVersion>
   <artifactId>de.philippkatz.knime.jsondocgen.tests</artifactId>
-  <version>1.14.1-SNAPSHOT</version>
+  <version>1.14.2-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 
   <parent>
     <groupId>de.philippkatz.knime.jsondocgen</groupId>
     <artifactId>de.philippkatz.knime.jsondocgen</artifactId>
-    <version>1.14.1-SNAPSHOT</version>
+    <version>1.14.2-SNAPSHOT</version>
   </parent>
 
   <build>