Version 1.4.0

* Switch to NetBeans 11.2 * Run maven in single thread since multithread throws a NullPointerException
testmycode · Jan 9, 2020 · 1aafd7a · 1aafd7a
1 parent fc4e558
commit 1aafd7a
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 5 deletions.
diff --git a/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties b/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
@@ -19,7 +19,7 @@ SplashVersionTextFontType=Dialog
 SplashVersionTextColor=0x000000
 SplashVersionTextHorizontalAlignment=right
 
-currentVersion=Netbeans with TMC 1.3.0
+currentVersion=Netbeans with TMC 1.4.0
 LBL_splash_window_title=Starting Netbeans with TMC
 
 MSG_warning=NetBeans with TMC IDE - Warning

diff --git a/build.xml b/build.xml
@@ -10,7 +10,7 @@
 
     <target name="-check-mavenmodules">
         <uptodate property="mavenmodules.uptodate"
-                  srcfile="maven-wrapper/target/nbm/maven-wrapper-1.31.nbm"
+                  srcfile="maven-wrapper/target/nbm/maven-wrapper-1.32.nbm"
                   targetfile="mavenmodules"/>
     </target>
 

diff --git a/maven-wrapper/pom.xml b/maven-wrapper/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>fi.helsinki.cs.tmc</groupId>
     <artifactId>maven-wrapper</artifactId>
-    <version>1.31</version>
+    <version>1.32</version>
     <packaging>nbm</packaging>
 
     <name>TMC Maven Wrapper</name>

diff --git a/nbproject/platform.properties b/nbproject/platform.properties
@@ -89,4 +89,4 @@ nbjdk.active=default
 #    org.openide.execution,\
 #    org.openide.options,\
 #    org.openide.util.enumerations
-nbplatform.active=Apache_NetBeans_IDE_11.1
+nbplatform.active=Apache_NetBeans_IDE_11.2
diff --git a/tmc-plugin/manifest.mf b/tmc-plugin/manifest.mf
@@ -6,4 +6,4 @@ OpenIDE-Module-Requires:
   org.openide.windows.IOProvider,
   org.openide.windows.WindowManager
 OpenIDE-Module-Install: fi/helsinki/cs/tmc/actions/TmcModuleInstall.class
-OpenIDE-Module-Specification-Version: 1.3.0
+OpenIDE-Module-Specification-Version: 1.4.0
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/actions/FixUnoptimalSettings.java b/tmc-plugin/src/fi/helsinki/cs/tmc/actions/FixUnoptimalSettings.java
@@ -30,6 +30,7 @@ public FixUnoptimalSettings() {
     public void run() {
         fixMavenDependencyDownloadPolicy();
         fixMavenIndexingPolicy();
+        fixMavenMultiThreadIssue();
     }
 
     private void fixMavenDependencyDownloadPolicy() {
@@ -39,6 +40,13 @@ private void fixMavenDependencyDownloadPolicy() {
         }
     }
 
+    private void fixMavenMultiThreadIssue() {
+        final String setting = mavenPrefrences.get("defaultOptions", "");
+        if (!setting.contains("-T=1 -q")) {
+            mavenPrefrences.put("defaultOptions", "-T=1 -q");
+        }
+    }
+
     private void fixMavenIndexingPolicy() {
         final String disableIndexingValue = indexingPreferences.get("createIndex", "");
         if (!disableIndexingValue.equals("false")) {