Merge pull request #501 from jtnord/remove-plugin-module

remove Plugin-Module manifest entry
jenkinsci · Jun 8, 2023 · 32bd070 · 32bd070
2 parents 01b9bd6 + ba4dc55
commit 32bd070
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 5 deletions.
diff --git a/src/it/metadata-it/verify.groovy b/src/it/metadata-it/verify.groovy
@@ -37,7 +37,6 @@ try (JarFile j1 = new JarFile(p1)) {
     assert attributes.getValue('Plugin-ScmConnection').equals('scm:git:https://github.com/jenkinsci/maven-hpi-plugin.git')
     def matcher = attributes.getValue('Plugin-GitHash') =~ pattern
     assert matcher.matches()
-    assert attributes.getValue('Plugin-Module').equals('plugin1')
 }
 
 
@@ -71,8 +70,6 @@ try (JarFile j2 = new JarFile(p2)) {
     assert attributes.getValue('Plugin-ScmConnection').equals('scm:git:https://github.com/jenkinsci/maven-hpi-plugin.git')
     def matcher = attributes.getValue('Plugin-GitHash') =~ pattern
     assert matcher.matches()
-    assert attributes.getValue('Plugin-Module').equals('plugin2')
-
 }
 
 return true;
diff --git a/src/it/verify-it/verify.groovy b/src/it/verify-it/verify.groovy
@@ -58,7 +58,6 @@ Files.newInputStream(new File(basedir, 'target/verify-it/META-INF/MANIFEST.MF').
   assert manifest.getMainAttributes().getValue('Plugin-ScmUrl').equals('https://github.com/jenkinsci/verify-it-plugin')
   def matcher = manifest.getMainAttributes().getValue('Plugin-GitHash') =~ pattern
   assert matcher.matches()
-  assert manifest.getMainAttributes().getValue('Plugin-Module') == null
   assert manifest.getMainAttributes().getValue('Plugin-Version').startsWith('1.0-SNAPSHOT')
   assert manifest.getMainAttributes().getValue('Short-Name').equals('verify-it')
   assert manifest.getMainAttributes().getValue('Specification-Title').equals('MyNewPlugin') // was project.description in previous versions, now project.name

diff --git a/src/main/java/org/jenkinsci/maven/plugins/hpi/AbstractJenkinsManifestMojo.java b/src/main/java/org/jenkinsci/maven/plugins/hpi/AbstractJenkinsManifestMojo.java
@@ -237,7 +237,6 @@ protected void setAttributes(Manifest.ExistingSection mainSection)
         String gitHash = getGitHeadSha1();
         // Deprecated: Use "Implementation-Build" for consistency with core and core components
         addAttributeIfNotNull(mainSection, "Plugin-GitHash", gitHash);
-        addAttributeIfNotNull(mainSection, "Plugin-Module", getModule());
         addAttributeIfNotNull(mainSection, "Implementation-Build", gitHash);
     }