Remove unused code and test from #13125

- Context: #13125 (comment)
gradle · Sep 4, 2021 · 58427b1 · 58427b1
1 parent 57b8b09
commit 58427b1
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 31 deletions.
diff --git a/...src/integTest/groovy/org/gradle/api/tasks/JavaExecWithExecutableJarIntegrationTest.groovy b/...src/integTest/groovy/org/gradle/api/tasks/JavaExecWithExecutableJarIntegrationTest.groovy
@@ -18,7 +18,6 @@ package org.gradle.api.tasks
 
 import org.gradle.integtests.fixtures.AbstractIntegrationSpec
 import org.gradle.integtests.fixtures.UnsupportedWithConfigurationCache
-import spock.lang.Ignore
 import spock.lang.Issue
 import spock.lang.Unroll
 
@@ -102,31 +101,6 @@ class JavaExecWithExecutableJarIntegrationTest extends AbstractIntegrationSpec {
         'ExecOperations.javaexec' | 'runWithExecOperations'
     }
 
-    @Ignore("Change rolled back, to be added again in 7.0")
-    @Unroll
-    @UnsupportedWithConfigurationCache(iterationMatchers = ".* project.javaexec")
-    def "can run executable jar configured in the application plugin with #method"() {
-
-        buildFile << """
-            apply plugin: 'application'
-            application {
-                mainClass.set('driver.Driver')
-            }
-        """
-
-        when:
-        succeeds taskName
-
-        then:
-        file("out.txt").text == """helloworld"""
-
-        where:
-        method                    | taskName
-        'JavaExec task'           | 'runWithTask'
-        'project.javaexec'        | 'runWithJavaExec'
-        'ExecOperations.javaexec' | 'runWithExecOperations'
-    }
-
     @Issue("https://github.com/gradle/gradle/issues/1346")
     @Unroll
     @UnsupportedWithConfigurationCache(iterationMatchers = ".* project.javaexec")

diff --git a/subprojects/plugins/src/main/java/org/gradle/api/plugins/ApplicationPlugin.java b/subprojects/plugins/src/main/java/org/gradle/api/plugins/ApplicationPlugin.java
@@ -87,11 +87,6 @@ private void configureJavaCompileTask(TaskProvider<JavaCompile> javaCompile, Jav
         javaCompile.configure(j -> j.getOptions().getJavaModuleMainClass().convention(pluginExtension.getMainClass()));
     }
 
-    // Enable this back for Gradle 7.0
-    private void configureJarTask(TaskProvider<Jar> jar, JavaApplication pluginExtension) {
-        jar.configure(j -> j.getManifest().attributes(Collections.singletonMap("Main-Class", pluginExtension.getMainClass())));
-    }
-
     private void configureInstallTask(ProviderFactory providers, TaskProvider<Sync> installTask, ApplicationPluginConvention pluginConvention) {
         installTask.configure(task -> task.doFirst(
             "don't overwrite existing directories",