Merge pull request #1913 from apache/master

sync master to release 113 branch for beta3

Author: ebarboni

groovy/gradle.java/src/org/netbeans/modules/gradle/java/newproject/SimpleApplicationProjectWizard.java

@@ -53,7 +53,7 @@ private static Map<String, Object> initParams() {
         Map<String, Object> params = new HashMap<>();
         params.put(PROP_PLUGINS, Arrays.asList("java", "jacoco", "application"));
         params.put(PROP_DEPENDENCIES, Arrays.asList(
-                "testCompile 'junit:junit:4.12'"
+                "testImplementation     'junit:junit:4.13'"
         ));
         return params;
     }

groovy/gradle.java/src/org/netbeans/modules/gradle/java/newproject/SimpleLibraryProjectWizard.java

@@ -44,9 +44,9 @@ public SimpleLibraryProjectWizard() {
 
     private static Map<String, Object> initParams() {
         Map<String, Object> params = new HashMap<>();
-        params.put(PROP_PLUGINS, Arrays.asList("java", "jacoco", "maven"));
+        params.put(PROP_PLUGINS, Arrays.asList("java", "jacoco", "maven-publish"));
         params.put(PROP_DEPENDENCIES, Arrays.asList(
-                "testCompile 'junit:junit:4.12'"
+                "testImplementation     'junit:junit:4.13'"
         ));
         return params;
     }

groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/newproject/ServerSelectionPanelVisual.java

@@ -34,6 +34,7 @@
 import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform;
 import org.netbeans.modules.j2ee.deployment.devmodules.api.ServerManager;
 import org.openide.WizardDescriptor;
+import org.openide.util.NbBundle.Messages;
 
 /**
  *
@@ -127,6 +128,12 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
         );
     }// </editor-fold>//GEN-END:initComponents
 
+    @Override
+    @Messages("ServerSelectionPanel=Settings")
+    public String getName() {
+        return Bundle.ServerSelectionPanel();
+    }
+
     private void btAddServerButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btAddServerButtonActionPerformed
         String newServerId = ServerManager.showAddServerInstanceWizard();
         if (newServerId != null) {

groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/newproject/WebApplicationProjectWizard.java

@@ -85,7 +85,7 @@ protected void collectOperations(TemplateOperation ops, Map<String, Object> para
         List<String> dependencies = new LinkedList<>();
         dependencies.addAll(webDependencies(profileId));
         dependencies.add("");
-        dependencies.add("testCompile     'junit:junit:4.12'");
+        dependencies.add("testImplementation     'junit:junit:4.13'");
         params.put(PROP_DEPENDENCIES, dependencies);
 
         String projectName = (String) params.get(PROP_NAME);

groovy/gradle/src/org/netbeans/modules/gradle/spi/GradleFiles.java

@@ -139,10 +139,10 @@ private void searchBuildScripts() {
     }
 
     private void searchWrapper() {
-        File w = new File(rootDir, Utilities.isWindows() ? "gradlew.bat" : "gradlew");
+        File w = new File(rootDir, WRAPPER_PROPERTIES);
         if (w.isFile()) {
-            gradlew = w;
-            wrapperProperties = new File(rootDir, WRAPPER_PROPERTIES);
+            gradlew = new File(rootDir, Utilities.isWindows() ? "gradlew.bat" : "gradlew");
+            wrapperProperties = w;
         }
     }
 

ide/defaults/src/org/netbeans/modules/defaults/BlueTheme-editor.xml

@@ -67,4 +67,6 @@
     <fontcolor name="coverage-inferred" bgColor="1F4F40"/>
     <fontcolor name="coverage-partial" bgColor="909040"/>
 
+    <fontcolor name="remove-surround-code-delete" foreColor="ff32538C" bgColor="ff16253F"/>
+    <fontcolor name="remove-surround-code-remain" bgColor="ff0C3F33"/>
  </fontscolors>

ide/defaults/src/org/netbeans/modules/defaults/CityLights-editor.xml

@@ -48,4 +48,6 @@
     <fontcolor name="trailing-whitespace"/>
     <fontcolor name="nbeditor-bracesMatching-sidebar"/>
     <fontcolor name="indent-guide-lines" foreColor="white"/>
+    <fontcolor name="remove-surround-code-delete" foreColor="lightGray" bgColor="ff333333"/>
+    <fontcolor name="remove-surround-code-remain" bgColor="ff3E5431"/>
 </fontscolors>

ide/defaults/src/org/netbeans/modules/defaults/NetBeans55-editor.xml

@@ -47,4 +47,6 @@
     <fontcolor name="indent-whitespace"/>
     <fontcolor name="trailing-whitespace"/>
     <fontcolor name="nbeditor-bracesMatching-sidebar"/>
+    <fontcolor name="remove-surround-code-delete" foreColor="ffB4B4B4" bgColor="ffF5F5F5"/>
+    <fontcolor name="remove-surround-code-remain" bgColor="ffCCFFCC"/>
 </fontscolors>

ide/defaults/src/org/netbeans/modules/defaults/NetBeansEarth-editor.xml

@@ -47,4 +47,6 @@
     <fontcolor name="indent-whitespace"/>
     <fontcolor name="trailing-whitespace"/>
     <fontcolor name="nbeditor-bracesMatching-sidebar"/>
+    <fontcolor name="remove-surround-code-delete" foreColor="ffB4B4B4" bgColor="ffF5F5F5"/>
+    <fontcolor name="remove-surround-code-remain" bgColor="ffCCFFCC"/>
 </fontscolors>

ide/lsp.client/src/org/netbeans/modules/lsp/client/LSPBindings.java

@@ -33,6 +33,7 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.WeakHashMap;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
@@ -203,9 +204,10 @@ private static InitializeResult initServer(Process p, LanguageServer server, Fil
        wcc.getWorkspaceEdit().setDocumentChanges(true);
        wcc.getWorkspaceEdit().setResourceOperations(Arrays.asList(ResourceOperationKind.Create, ResourceOperationKind.Delete, ResourceOperationKind.Rename));
        initParams.setCapabilities(new ClientCapabilities(wcc, tdcc, null));
+       CompletableFuture<InitializeResult> initResult = server.initialize(initParams);
        while (true) {
            try {
-               return server.initialize(initParams).get(100, TimeUnit.MILLISECONDS);
+               return initResult.get(100, TimeUnit.MILLISECONDS);
            } catch (TimeoutException ex) {
                if (p != null && !p.isAlive()) {
                    InitializeResult emptyResult = new InitializeResult();