Revert "Workaround shadowJar bug" (vert-x3#771)

This reverts commit 27eaa62.

This is no longer required as we build the project with Maven.

Signed-off-by: Thomas Segismont <[email protected]>

Author: tsegismont

src/main/java/io/vertx/starter/service/GeneratorService.java

@@ -140,14 +140,14 @@ private void createProject(VertxProject project, TempDir tempDir) throws IOExcep
       if (project.getLanguage() == KOTLIN) {
         copy(tempDir, "files/gradle", "gradle.properties");
       }
-      copy(tempDir, "files/gradle", "gradle/wrapper/gradle-wrapper.jarr");
+      copy(tempDir, "files/gradle", "gradle/wrapper/gradle-wrapper.jar");
       copy(tempDir, "files/gradle", "gradle/wrapper/gradle-wrapper.properties");
       render(tempDir, ctx, ".", "build.gradle.kts");
       render(tempDir, ctx, ".", "settings.gradle.kts");
     } else if (project.getBuildTool() == MAVEN) {
       copy(tempDir, "files/maven", "mvnw");
       copy(tempDir, "files/maven", "mvnw.cmd");
-      copy(tempDir, "files/maven", "_mvn/wrapper/maven-wrapper.jarr");
+      copy(tempDir, "files/maven", "_mvn/wrapper/maven-wrapper.jar");
       copy(tempDir, "files/maven", "_mvn/wrapper/maven-wrapper.properties");
       render(tempDir, ctx, ".", "pom.xml");
     } else {
@@ -223,7 +223,7 @@ private void generateArchive(TempDir tempDir, ArchiveOutputStream stream) throws
   private void addFile(Path rootPath, Path filePath, ArchiveOutputStream stream) throws IOException {
     String relativePath = rootPath.relativize(filePath).toString();
     if (relativePath.length() == 0) return;
-    String entryName = jarFileWorkAround(leadingDot(relativePath));
+    String entryName = leadingDot(relativePath);
     ArchiveEntry entry = stream.createArchiveEntry(filePath.toFile(), entryName);
     if (EXECUTABLES.contains(entryName)) {
       if (entry instanceof ZipArchiveEntry zipArchiveEntry) {
@@ -245,11 +245,6 @@ private String leadingDot(String s) {
     return s.charAt(0) == '_' ? '.' + s.substring(1) : s;
   }
 
-  private String jarFileWorkAround(String s) {
-    // See https://github.com/johnrengelman/shadow/issues/111
-    return s.endsWith(".jarr") ? s.substring(0, s.length() - ".jarr".length()) + ".jar" : s;
-  }
-
   @FunctionalInterface
   private interface ArchiveOutputStreamFactory {
     ArchiveOutputStream create(ByteArrayOutputStream baos) throws IOException;