diff --git a/spring-boot-tools/spring-boot-loader-tools/pom.xml b/spring-boot-tools/spring-boot-loader-tools/pom.xml index 557dab999f..c9f1f4620f 100644 --- a/spring-boot-tools/spring-boot-loader-tools/pom.xml +++ b/spring-boot-tools/spring-boot-loader-tools/pom.xml @@ -80,44 +80,6 @@ - - org.codehaus.mojo - exec-maven-plugin - 1.1.1 - - - generate-resources - - exec - - - - - git - - log - --pretty=format:Spring-Boot-Commit-Id: %H - -n1 - - ${project.build.directory}/build-number.mf - - - 0 - 1 - 127 - 128 - - - - - maven-jar-plugin - - - ${project.build.directory}/build-number.mf - - - diff --git a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java index 0837e520f3..87742d4d07 100644 --- a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java +++ b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java @@ -18,10 +18,8 @@ package org.springframework.boot.loader.tools; import java.io.File; import java.io.IOException; -import java.net.URL; import java.util.jar.JarFile; import java.util.jar.Manifest; -import java.util.zip.ZipEntry; /** * Utility class that can be used to repackage an archive so that it can be executed using @@ -36,8 +34,6 @@ public class Repackager { private static final String START_CLASS_ATTRIBUTE = "Start-Class"; private static final String BOOT_VERSION_ATTRIBUTE = "Spring-Boot-Version"; - - private static final String GIT_COMMIT_ATTRIBUTE = "Spring-Boot-Commit-Id"; private String mainClass; @@ -185,28 +181,6 @@ public class Repackager { String bootVersion = getClass().getPackage().getImplementationVersion(); manifest.getMainAttributes().putValue(BOOT_VERSION_ATTRIBUTE, bootVersion); - - String gitCommitHash = null; - JarFile jarFile = null; - try { - URL classContainer = getClass().getProtectionDomain().getCodeSource().getLocation(); - if (classContainer.toString().endsWith(".jar")) { - jarFile = new JarFile(new File(classContainer.toURI()), false); - ZipEntry manifestEntry = jarFile.getEntry("META-INF/MANIFEST.MF"); - gitCommitHash = new Manifest(jarFile.getInputStream(manifestEntry)). - getMainAttributes().getValue(GIT_COMMIT_ATTRIBUTE); - } - } catch (Exception ignoreAndMoveOn) { } - finally { - if (jarFile != null) { - try { jarFile.close(); } - catch (IOException ignored) {} - } - } - - if (gitCommitHash != null && gitCommitHash.length() > 0) { - manifest.getMainAttributes().putValue(GIT_COMMIT_ATTRIBUTE, gitCommitHash); - } return manifest; }