Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gradle custom java zippublish plugin #2988

Merged
merged 65 commits into from
Apr 27, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
d60eafe
Added custom plugin
prudhvigodithi Apr 18, 2022
4a61852
fixed failure checks
prudhvigodithi Apr 20, 2022
1e8c5f1
fixed failure checks
prudhvigodithi Apr 20, 2022
5e87cde
ref String to null
prudhvigodithi Apr 20, 2022
770c886
Added gradlePlugin config
prudhvigodithi Apr 20, 2022
342bc64
Added gradlePlugin config
prudhvigodithi Apr 20, 2022
a8647ec
Added gradlePlugin config
prudhvigodithi Apr 20, 2022
0865be2
Added zipFilePath injection
prudhvigodithi Apr 21, 2022
be37b91
Added custom plugin eval logic
prudhvigodithi Apr 21, 2022
8a7c18e
Added system property for version check
prudhvigodithi Apr 21, 2022
a43e651
spotlessApply check
prudhvigodithi Apr 21, 2022
a523ab1
Added custom plugin eval logic
prudhvigodithi Apr 21, 2022
e8a11b7
spotlessJavaCheck fix
prudhvigodithi Apr 21, 2022
cf9e291
Reverted back existing publish plugin
prudhvigodithi Apr 22, 2022
88d21d4
Added feedback code fix
prudhvigodithi Apr 22, 2022
056d06e
modified BUILD_DISTRIBUTIONS_LOCATION to zipDistributionLocation
prudhvigodithi Apr 22, 2022
edf9028
fix lint issues
prudhvigodithi Apr 22, 2022
6baf646
fix lint issues
prudhvigodithi Apr 22, 2022
f8a528c
changed the zip artifcat identify logic
prudhvigodithi Apr 22, 2022
ebd85a3
Changed the zip file identify logic
prudhvigodithi Apr 22, 2022
26d83ee
Changed the zip file identify logic
prudhvigodithi Apr 22, 2022
cf9ee09
Changed the zip file identify logic
prudhvigodithi Apr 22, 2022
1aeb73a
Changed the zip file identify logic
prudhvigodithi Apr 22, 2022
b98ab64
Changed the zip file identify logic
prudhvigodithi Apr 22, 2022
bdf32dd
Merge branch 'gradleplugin-2.2' of github.com:prudhvigodithi/OpenSear…
prudhvigodithi Apr 22, 2022
321ec96
Changed the zip file identify logic
prudhvigodithi Apr 22, 2022
5e97819
ran spotlessApply
prudhvigodithi Apr 22, 2022
9ccbf81
ran spotlessApply
prudhvigodithi Apr 22, 2022
8b85320
fix lint issues
prudhvigodithi Apr 23, 2022
4d83dd1
fix lint issues
prudhvigodithi Apr 23, 2022
ac2f151
fix lint issues
prudhvigodithi Apr 23, 2022
daa06c3
fix lint issues
prudhvigodithi Apr 23, 2022
88d4562
fix lint issues
prudhvigodithi Apr 23, 2022
dba1cac
fix lint issues
prudhvigodithi Apr 23, 2022
36a98f9
fix lint issues
prudhvigodithi Apr 23, 2022
5e3ca97
fix lint issues
prudhvigodithi Apr 23, 2022
f1da84e
fix lint issues
prudhvigodithi Apr 23, 2022
71b1337
fix lint issues
prudhvigodithi Apr 23, 2022
15cd29f
fix lint issues
prudhvigodithi Apr 23, 2022
122d48f
fix lint issues
prudhvigodithi Apr 23, 2022
30ca4c6
fix lint issues
prudhvigodithi Apr 23, 2022
c733586
fix lint issues
prudhvigodithi Apr 23, 2022
89bf24a
fix lint issues
prudhvigodithi Apr 23, 2022
416e74e
fix lint issues
prudhvigodithi Apr 23, 2022
02a8234
fix lint issues
prudhvigodithi Apr 23, 2022
ad1e589
fix lint issues
prudhvigodithi Apr 23, 2022
2f9bca8
fix lint issues
prudhvigodithi Apr 23, 2022
ed0d1b0
fix lint issues
prudhvigodithi Apr 23, 2022
4445608
fix lint issues
prudhvigodithi Apr 23, 2022
b48cf2e
fix lint issues
prudhvigodithi Apr 23, 2022
710611c
fix lint issues
prudhvigodithi Apr 23, 2022
b61104d
fix lint issues
prudhvigodithi Apr 23, 2022
eb17f5a
fix lint issues
prudhvigodithi Apr 23, 2022
bfb812d
fix lint issues
prudhvigodithi Apr 23, 2022
740516e
fix lint issues
prudhvigodithi Apr 23, 2022
3071a55
fix lint issues
prudhvigodithi Apr 23, 2022
c2b5121
Code cleanup
prudhvigodithi Apr 23, 2022
f44aa2a
Code cleanup
prudhvigodithi Apr 23, 2022
303465f
Code cleanup
prudhvigodithi Apr 23, 2022
8f4a8d3
Code cleanup typos
prudhvigodithi Apr 23, 2022
7f87df9
Merge branch 'gradleplugin-2.2' of github.com:prudhvigodithi/OpenSear…
prudhvigodithi Apr 24, 2022
9b1cb92
code cleanup and extended unit tests
prudhvigodithi Apr 26, 2022
c866641
code cleanup and extended unit tests
prudhvigodithi Apr 26, 2022
9f32f4d
Naming convention fix
prudhvigodithi Apr 26, 2022
cdac61d
Naming convention fix
prudhvigodithi Apr 26, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions buildSrc/src/main/java/org/opensearch/gradle/PublishPlugin.java
Original file line number Diff line number Diff line change
Expand Up @@ -125,18 +125,21 @@ public String call() throws Exception {
// Add git origin info to generated POM files
publication.getPom().withXml(PublishPlugin::addScmInfo);

// have to defer this until archivesBaseName is set
project.afterEvaluate(p -> publication.setArtifactId(getArchivesBaseName(project)));
if (!publication.getName().toLowerCase().contains("zip")) {

// 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"));
}
// 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())))
);
prudhvigodithi marked this conversation as resolved.
Show resolved Hide resolved
generatePomTask.configure(
t -> t.dependsOn(String.format("generatePomFileFor%sPublication", Util.capitalize(publication.getName())))
);
}
});

}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
/*
* SPDX-License-Identifier: Apache-2.0
*
* The OpenSearch Contributors require contributions made to
* this file be licensed under the Apache-2.0 license or a
* compatible open source license.
*/
package org.opensearch.gradle.pluginzip;

import java.util.*;
import org.gradle.api.Plugin;
import org.gradle.api.Project;
import org.gradle.api.publish.PublishingExtension;
import org.gradle.api.publish.maven.MavenPublication;
import org.gradle.api.publish.maven.plugins.MavenPublishPlugin;
import java.nio.file.Path;

public class Publish implements Plugin<Project> {
private Project project;

public final static String EXTENSION_NAME = "zipmavensettings";
public final static String PUBLICATION_NAME = "pluginZip";
public final static String STAGING_REPO = "zipStaging";
public final static String PLUGIN_ZIP_PUBLISH_POM_TASK = "generatePomFileForPluginZipPublication";
public final static String LOCALMAVEN = "publishToMavenLocal";
public final static String LOCAL_STAGING_REPO_PATH = "/build/local-staging-repo";
public String zipDistributionLocation = "/build/distributions/";

public static void configMaven(Project project) {
final Path buildDirectory = project.getRootDir().toPath();
project.getPluginManager().apply(MavenPublishPlugin.class);
project.getExtensions().configure(PublishingExtension.class, publishing -> {
publishing.repositories(repositories -> {
repositories.maven(maven -> {
maven.setName(STAGING_REPO);
maven.setUrl(buildDirectory.toString() + LOCAL_STAGING_REPO_PATH);
});
});
publishing.publications(publications -> {
publications.create(PUBLICATION_NAME, MavenPublication.class, mavenZip -> {
String zipGroup = "org.opensearch.plugin";
String zipArtifact = project.getName();
String zipVersion = getProperty("version", project);
mavenZip.artifact(project.getTasks().named("bundlePlugin"));
mavenZip.setGroupId(zipGroup);
mavenZip.setArtifactId(zipArtifact);
mavenZip.setVersion(zipVersion);
});
});
});
}

static String getProperty(String name, Project project) {
if (project.hasProperty(name)) {
Object property = project.property(name);
if (property != null) {
return property.toString();
}
}
return null;
}

@Override
public void apply(Project project) {
this.project = project;
project.afterEvaluate(evaluatedProject -> { configMaven(project); });
project.getGradle().getTaskGraph().whenReady(graph -> {
if (graph.hasTask(LOCALMAVEN)) {
project.getTasks().getByName(PLUGIN_ZIP_PUBLISH_POM_TASK).setEnabled(false);
}

});
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
implementation-class=org.opensearch.gradle.pluginzip.Publish
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
/*
* SPDX-License-Identifier: Apache-2.0
*
* The OpenSearch Contributors require contributions made to
* this file be licensed under the Apache-2.0 license or a
* compatible open source license.
*/

package org.opensearch.gradle.pluginzip;

import org.gradle.testkit.runner.BuildResult;
import org.gradle.testkit.runner.GradleRunner;
import org.gradle.testfixtures.ProjectBuilder;
import org.gradle.api.Project;
import org.opensearch.gradle.test.GradleUnitTestCase;
import org.junit.Test;
import java.io.IOException;
import org.gradle.api.publish.maven.tasks.PublishToMavenRepository;
import java.io.File;
import org.gradle.testkit.runner.BuildResult;
import java.io.FileWriter;
import java.io.Writer;
import static org.gradle.testkit.runner.TaskOutcome.SUCCESS;
import static org.junit.Assert.assertEquals;
import java.nio.file.Files;
import org.apache.maven.model.Model;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import java.io.FileReader;
import org.gradle.api.tasks.bundling.Zip;

public class PublishTests extends GradleUnitTestCase {

@Test
public void testZipPublish() throws IOException, XmlPullParserException {
Project project = ProjectBuilder.builder().build();
String zipPublishTask = "publishPluginZipPublicationToZipStagingRepository";
// Apply the opensearch.pluginzip plugin
project.getPluginManager().apply("opensearch.pluginzip");
// Check if the plugin has been applied to the project
assertTrue(project.getPluginManager().hasPlugin("opensearch.pluginzip"));
// Check if the project has the task from class PublishToMavenRepository after plugin apply
assertNotNull(project.getTasks().withType(PublishToMavenRepository.class));
// Create a mock bundlePlugin task
Zip task = project.getTasks().create("bundlePlugin", Zip.class);
Publish.configMaven(project);
// Check if the main task publishPluginZipPublicationToZipStagingRepository exists after plugin apply
assertTrue(project.getTasks().getNames().contains(zipPublishTask));
assertNotNull("Task to generate: ", project.getTasks().getByName(zipPublishTask));
// Run Gradle functional tests, but calling a build.gradle file, that resembles the plugin publish behavior
File projectDir = new File("build/functionalTest");
// Create a sample plugin zip file
File sampleZip = new File("build/functionalTest/sample-plugin.zip");
Files.createDirectories(projectDir.toPath());
Files.createFile(sampleZip.toPath());
writeString(new File(projectDir, "settings.gradle"), "");
// Generate the build.gradle file
String buildFileContent = "apply plugin: 'maven-publish' \n"
+ "publishing {\n"
+ " repositories {\n"
+ " maven {\n"
+ " url = 'local-staging-repo/'\n"
+ " name = 'zipStaging'\n"
+ " }\n"
+ " }\n"
+ " publications {\n"
+ " pluginZip(MavenPublication) {\n"
+ " groupId = 'org.opensearch.plugin' \n"
+ " artifactId = 'sample-plugin' \n"
+ " version = '2.0.0.0' \n"
+ " artifact('sample-plugin.zip') \n"
+ " }\n"
+ " }\n"
+ "}";
writeString(new File(projectDir, "build.gradle"), buildFileContent);
// Execute the task publishPluginZipPublicationToZipStagingRepository
GradleRunner runner = GradleRunner.create();
runner.forwardOutput();
runner.withPluginClasspath();
runner.withArguments(zipPublishTask);
runner.withProjectDir(projectDir);
BuildResult result = runner.build();
// Check if task publishMavenzipPublicationToZipstagingRepository has ran well
assertEquals(SUCCESS, result.task(":" + zipPublishTask).getOutcome());
// check if the zip has been published to local staging repo
assertTrue(
new File("build/functionalTest/local-staging-repo/org/opensearch/plugin/sample-plugin/2.0.0.0/sample-plugin-2.0.0.0.zip")
.exists()
);
// Parse the maven file and validate the groupID to org.opensearch.plugin
MavenXpp3Reader reader = new MavenXpp3Reader();
Model model = reader.read(
new FileReader("build/functionalTest/local-staging-repo/org/opensearch/plugin/sample-plugin/2.0.0.0/sample-plugin-2.0.0.0.pom")
);
assertEquals(model.getGroupId(), "org.opensearch.plugin");
}

private void writeString(File file, String string) throws IOException {
try (Writer writer = new FileWriter(file)) {
writer.write(string);
}
}

}