diff --git a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
index 258afb473f6a..73de19e98b73 100644
--- a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
+++ b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
@@ -480,7 +480,7 @@ private void detectDependencies(NbProjectInfoModel model) {
             long time_report = System.currentTimeMillis();
             model.registerPerf(depPrefix + "collect", time_report - time_collect);
 
-            model.getInfo().put(configPrefix + "components", storeSet(componentIds));
+            model.getInfo().put(configPrefix + "components", componentIds);
             model.getInfo().put(configPrefix + "projects", projectNames);
             model.getInfo().put(configPrefix + "files", fileDeps);
             model.getInfo().put(configPrefix + "unresolved", unresolvedIds);
diff --git a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NetBeansExplodedWarPlugin.java b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NetBeansExplodedWarPlugin.java
index c5fd19ff7f09..fe847d500cd8 100644
--- a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NetBeansExplodedWarPlugin.java
+++ b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NetBeansExplodedWarPlugin.java
@@ -22,7 +22,6 @@
 import java.io.File;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
-import org.gradle.api.Task;
 import org.gradle.api.tasks.Sync;
 import org.gradle.api.tasks.bundling.War;
 
@@ -43,13 +42,14 @@ public void apply(Project project) {
     }
 
     private void addTask(Project p) {
-        War war = (War) p.property("war");
-        Sync sync = new Sync();
-        sync.setGroup("build");
-        sync.into(new File(new File(p.getBuildDir(), "exploded"), war.getArchiveFileName().get()));
-        sync.with(war);
-        Task explodedWar = p.getTasks().create(EXPLODED_WAR_TASK, Sync.class, sync);
-        war.getDependsOn().add(explodedWar);
+        War war = (War) p.getTasks().getByName("war");
+        p.getTasks().register(EXPLODED_WAR_TASK, Sync.class, (sync) -> {
+            sync.setGroup("build");
+            sync.into(new File(new File(p.getBuildDir(), "exploded"), war.getArchiveFileName().get()));
+            sync.with(war);
+            
+        });
+        war.dependsOn(EXPLODED_WAR_TASK);
     }
 
 }
diff --git a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NetBeansRunSinglePlugin.java b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NetBeansRunSinglePlugin.java
index 152dcfdb6581..c112a092a330 100644
--- a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NetBeansRunSinglePlugin.java
+++ b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NetBeansRunSinglePlugin.java
@@ -20,14 +20,11 @@
 package org.netbeans.modules.gradle.tooling;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import static java.util.Arrays.asList;
-import java.util.Map;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.tasks.JavaExec;
-import org.gradle.api.tasks.SourceSet;
-import org.gradle.process.CommandLineArgumentProvider;
+import org.gradle.api.tasks.SourceSetContainer;
 
 /**
  *
@@ -61,39 +58,37 @@ public void apply(Project project) {
     }
 
     private void addTask(Project project) {
-        Map<String,SourceSet> sourceSets = (Map<String,SourceSet>) project.property("sourceSets");
+        SourceSetContainer sourceSets = project.getExtensions().findByType(SourceSetContainer.class);
 
-        JavaExec je = new JavaExec();
-        je.setMain(project.property(RUN_SINGLE_MAIN).toString());
-        je.setClasspath(sourceSets.get("main").getRuntimeClasspath());
-        je.setStandardInput(System.in);
-
-        if (project.hasProperty(RUN_SINGLE_ARGS)) {
-            je.setArgs(asList(project.property(RUN_SINGLE_ARGS).toString().split(" ")));
-        }
+        project.getTasks().register(RUN_SINGLE_TASK, JavaExec.class, (je) -> {
+            // Using setMain to keep the backward compatibility
+            je.setMain(project.property(RUN_SINGLE_MAIN).toString());
+            je.setClasspath(sourceSets.findByName("main").getRuntimeClasspath());
+            je.setStandardInput(System.in);
+            if (project.hasProperty(RUN_SINGLE_ARGS)) {
+                je.setArgs(asList(project.property(RUN_SINGLE_ARGS).toString().split(" ")));
+            }
 
-        if(project.hasProperty(RUN_SINGLE_CWD)) {
-            je.setWorkingDir(project.property(RUN_SINGLE_CWD).toString());
-        }
+            if(project.hasProperty(RUN_SINGLE_CWD)) {
+                je.setWorkingDir(project.property(RUN_SINGLE_CWD).toString());
+            }
 
-        if (project.hasProperty(RUN_SINGLE_ENV)) {
-            // Quoted space-separated expressions of <ENV_VAR>=<ENV_VALUE>
-            // to set environment variables, or !<ENV_VAR>
-            // to remove environment variables
-            Arrays.stream(unescapeParameters(project.property(RUN_SINGLE_ENV).toString()))
-                    .forEach(env -> {
-                        if (env.startsWith("!")) {
-                            je.getEnvironment().remove(env);
-                        } else {
-                            int i = env.indexOf("=");
-                            if (i > 0) {
-                                je.getEnvironment().put(env.substring(0, i), env.substring(i + 1));
-                            }
+            if (project.hasProperty(RUN_SINGLE_ENV)) {
+                // Quoted space-separated expressions of <ENV_VAR>=<ENV_VALUE>
+                // to set environment variables, or !<ENV_VAR>
+                // to remove environment variables
+                for (String env : unescapeParameters(project.property(RUN_SINGLE_ENV).toString())) {                    
+                    if (env.startsWith("!")) {
+                        je.getEnvironment().remove(env);
+                    } else {
+                        int i = env.indexOf('=');
+                        if (i > 0) {
+                            je.getEnvironment().put(env.substring(0, i), env.substring(i + 1));
                         }
-                    });
-        }
-
-        project.getTasks().create(RUN_SINGLE_TASK, JavaExec.class, je);
+                    }
+                }
+            }
+        });
     }
 
     private String[] unescapeParameters(String s) {