Merge pull request #396 from chali/BootJarAndJarNameConflict

bootJar and jar task output name is the same which can cause overriding and bundling wrong jar in debian
nebula-plugins · Feb 23, 2021 · 6905886 · 6905886
2 parents d635065 + 6093af6
commit 6905886
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/...groovy/com/netflix/gradle/plugins/application/OspackageApplicationSpringBootPlugin.groovy b/...groovy/com/netflix/gradle/plugins/application/OspackageApplicationSpringBootPlugin.groovy
@@ -68,6 +68,13 @@ class OspackageApplicationSpringBootPlugin implements Plugin<Project> {
                 enabled = true
             }
             project.afterEvaluate {
+                project.bootJar {
+                    if(GradleVersion.current().baseVersion < GradleVersion.version('6.0').baseVersion) {
+                        classifier = "boot"
+                    } else {
+                        archiveClassifier = "boot"
+                    }
+                }
                 project.distributions {
                     main {
                         if(GradleVersion.current().baseVersion < GradleVersion.version('6.0').baseVersion) {

diff --git a/...etflix/gradle/plugins/application/OspackageApplicationSpringBootPluginLauncherSpec.groovy b/...etflix/gradle/plugins/application/OspackageApplicationSpringBootPluginLauncherSpec.groovy
@@ -23,6 +23,9 @@ import org.junit.Rule
 import org.junit.contrib.java.lang.system.ProvideSystemProperty
 import spock.lang.Unroll
 
+import java.util.jar.JarEntry
+import java.util.jar.JarFile
+
 class OspackageApplicationSpringBootPluginLauncherSpec extends IntegrationSpec {
 
     @Rule
@@ -67,6 +70,8 @@ class OspackageApplicationSpringBootPluginLauncherSpec extends IntegrationSpec {
             dependencies {
                 implementation 'org.springframework.boot:spring-boot-starter:$bootVersion'
             }
+            
+            bootJar.mustRunAfter jar
 
             ospackage {
                 packageName = 'test'
@@ -87,7 +92,7 @@ class OspackageApplicationSpringBootPluginLauncherSpec extends IntegrationSpec {
         buildFile << buildScript(bootVersion, null)
 
         when:
-        runTasksSuccessfully('buildDeb')
+        runTasksSuccessfully('build', 'buildDeb')
 
         then:
         final archivePath = file("build/distributions/test_0_all.deb")
@@ -103,13 +108,23 @@ class OspackageApplicationSpringBootPluginLauncherSpec extends IntegrationSpec {
             assert scanner.getEntry("${it}").isFile()
         }
 
+        //make sure we don't have boot jar in debian
+        def jarFile = new JarFile(scanner.getEntryFile(moduleJarName))
+        ! isBootJar(jarFile)
+
         !scanner.controlContents.containsKey('./postinst')
 
         where:
         bootVersion | fileMode
         '2.4.2'     | 0755
     }
 
+    private boolean isBootJar(JarFile jarFile) {
+        jarFile.entries().any {
+            it.name.contains("BOOT-INF")
+        }
+    }
+
     @Unroll
     def 'application runs for boot #bootVersion'() {
         final applicationDir = "$moduleName-boot"