Revert "Gradle custom java zippublish plugin (#2988)"

This reverts commit d61aa40.
opensearch-project · Apr 27, 2022 · b67594b · b67594b
1 parent d61aa40
commit b67594b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 192 deletions.
diff --git a/buildSrc/src/main/java/org/opensearch/gradle/PublishPlugin.java b/buildSrc/src/main/java/org/opensearch/gradle/PublishPlugin.java
@@ -125,21 +125,18 @@ public String call() throws Exception {
             // Add git origin info to generated POM files
             publication.getPom().withXml(PublishPlugin::addScmInfo);
 
-            if (!publication.getName().toLowerCase().contains("zip")) {
+            // have to defer this until archivesBaseName is set
+            project.afterEvaluate(p -> publication.setArtifactId(getArchivesBaseName(project)));
 
-                // have to defer this until archivesBaseName is set
-                project.afterEvaluate(p -> publication.setArtifactId(getArchivesBaseName(project)));
-
-                // publish sources and javadoc for Java projects.
-                if (project.getPluginManager().hasPlugin("opensearch.java")) {
-                    publication.artifact(project.getTasks().getByName("sourcesJar"));
-                    publication.artifact(project.getTasks().getByName("javadocJar"));
-                }
-
-                generatePomTask.configure(
-                    t -> t.dependsOn(String.format("generatePomFileFor%sPublication", Util.capitalize(publication.getName())))
-                );
+            // publish sources and javadoc for Java projects.
+            if (project.getPluginManager().hasPlugin("opensearch.java")) {
+                publication.artifact(project.getTasks().getByName("sourcesJar"));
+                publication.artifact(project.getTasks().getByName("javadocJar"));
             }
+
+            generatePomTask.configure(
+                t -> t.dependsOn(String.format("generatePomFileFor%sPublication", Util.capitalize(publication.getName())))
+            );
         });
 
     }

diff --git a/buildSrc/src/main/java/org/opensearch/gradle/pluginzip/Publish.java b/buildSrc/src/main/java/org/opensearch/gradle/pluginzip/Publish.java
diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/opensearch.pluginzip.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/opensearch.pluginzip.properties
diff --git a/buildSrc/src/test/java/org/opensearch/gradle/pluginzip/PublishTests.java b/buildSrc/src/test/java/org/opensearch/gradle/pluginzip/PublishTests.java