[Refactor] From legacy build-tools to opensearch build-tools

buildSrc/build.gradle

@@ -60,7 +60,7 @@ repositories {
         // For some reason the root dirs all point to the buildSrc folder. The local Repo will be one above that.
         flatDir { dirs new File(project.rootDir, "../localRepo") }
     } else {
-        maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
+        maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" }
     }
 }
 
@@ -69,13 +69,13 @@ dependencies {
     compileOnly localGroovy()
 
     // Required for dependency licenses task
-    implementation 'org.apache.rat:apache-rat:0.11'
+    implementation 'org.apache.rat:apache-rat:0.13'
     implementation 'commons-codec:commons-codec:1.12'
 
     if (localRepo) {
         implementation name: "build-tools-${buildToolsVersion}"
     } else {
-        implementation group: 'org.elasticsearch.gradle', name: 'build-tools', version: buildToolsVersion
+        implementation group: 'org.opensearch.gradle', name: 'build-tools', version: buildToolsVersion
     }
 }
 

buildSrc/opensearch-hadoop-version.properties

@@ -1,4 +1,4 @@
-opensearch_hadoop        = 8.6.0
-opensearch      = 8.6.0
-lucene          = 9.0.0
-build-tools     = 8.6.0
+opensearch_hadoop        = 3.0.0
+opensearch      = 3.0.0
+lucene          = 9.5.0-snapshot-a4ef70f
+build-tools     = 3.0.0

buildSrc/src/main/groovy/org/opensearch/hadoop/gradle/BuildPlugin.groovy

@@ -22,7 +22,7 @@ package org.opensearch.hadoop.gradle
 import org.opensearch.hadoop.gradle.buildtools.DependenciesInfoPlugin
 import org.opensearch.hadoop.gradle.buildtools.DependencyLicensesTask
 import org.opensearch.hadoop.gradle.buildtools.LicenseHeadersTask
-import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask
+import org.opensearch.gradle.testclusters.StandaloneRestIntegTestTask
 import org.opensearch.hadoop.gradle.buildtools.UpdateShasTask
 import org.opensearch.hadoop.gradle.buildtools.info.BuildParams
 import org.opensearch.hadoop.gradle.scala.SparkVariantPlugin

buildSrc/src/main/groovy/org/opensearch/hadoop/gradle/fixture/OpenSearchFixturePlugin.groovy

@@ -19,10 +19,10 @@
 
 package org.opensearch.hadoop.gradle.fixture
 
-import org.elasticsearch.gradle.testclusters.ElasticsearchCluster
-import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask
-import org.elasticsearch.gradle.testclusters.TestClustersPlugin
-import org.elasticsearch.gradle.testclusters.TestDistribution
+import org.opensearch.gradle.testclusters.OpenSearchCluster
+import org.opensearch.gradle.testclusters.StandaloneRestIntegTestTask
+import org.opensearch.gradle.testclusters.TestClustersPlugin
+import org.opensearch.gradle.testclusters.TestDistribution
 import org.gradle.api.NamedDomainObjectContainer
 import org.gradle.api.Plugin
 import org.gradle.api.Project
@@ -60,8 +60,8 @@ class OpenSearchFixturePlugin implements Plugin<Project> {
     }
 
     private static void createClusterFor(TaskCollection<StandaloneRestIntegTestTask> integrationTests, Project project, String version) {
-        def clustersContainer = project.extensions.getByName(TestClustersPlugin.EXTENSION_NAME) as NamedDomainObjectContainer<ElasticsearchCluster>
-        def integTestCluster = clustersContainer.create("integTest") { ElasticsearchCluster cluster ->
+        def clustersContainer = project.extensions.getByName(TestClustersPlugin.EXTENSION_NAME) as NamedDomainObjectContainer<OpenSearchCluster>
+        def integTestCluster = clustersContainer.create("integTest") { OpenSearchCluster cluster ->
             cluster.version = version
             cluster.testDistribution = TestDistribution.DEFAULT
         }

buildSrc/src/main/groovy/org/opensearch/hadoop/gradle/fixture/hadoop/HadoopClusterFormationTasks.groovy

@@ -20,8 +20,8 @@
 package org.opensearch.hadoop.gradle.fixture.hadoop
 
 import org.apache.tools.ant.DefaultLogger
-import org.elasticsearch.gradle.Version
-import org.elasticsearch.gradle.testclusters.DefaultTestClustersTask
+import org.opensearch.gradle.Version
+import org.opensearch.gradle.testclusters.DefaultTestClustersTask
 import org.opensearch.hadoop.gradle.buildtools.Fixture
 import org.opensearch.hadoop.gradle.buildtools.LoggedExec
 import org.opensearch.hadoop.gradle.fixture.hadoop.conf.HadoopClusterConfiguration
@@ -327,8 +327,8 @@ class HadoopClusterFormationTasks {
         // Add all node level configs to node Configuration
         return project.tasks.create(name: name, type: DefaultTestClustersTask, dependsOn: setup) {
             group = 'hadoopFixture'
-            if (node.elasticsearchCluster != null) {
-                useCluster(node.elasticsearchCluster)
+            if (node.opensearchCluster != null) {
+                useCluster(node.opensearchCluster)
             }
             doFirst {
                 // Write each config file needed

buildSrc/src/main/groovy/org/opensearch/hadoop/gradle/fixture/hadoop/InstanceInfo.groovy

@@ -20,7 +20,7 @@
 package org.opensearch.hadoop.gradle.fixture.hadoop
 
 import org.apache.tools.ant.taskdefs.condition.Os
-import org.elasticsearch.gradle.testclusters.ElasticsearchCluster
+import org.opensearch.gradle.testclusters.OpenSearchCluster
 import org.opensearch.hadoop.gradle.util.WaitForURL
 import org.opensearch.hadoop.gradle.fixture.hadoop.conf.InstanceConfiguration
 import org.gradle.api.GradleException
@@ -110,8 +110,8 @@ class InstanceInfo {
     /** buffer for ant output when starting this node */
     ByteArrayOutputStream buffer = new ByteArrayOutputStream()
 
-    /** Elasticsearch cluster dependency for tasks **/
-    ElasticsearchCluster elasticsearchCluster
+    /** OpenSearch cluster dependency for tasks **/
+    OpenSearchCluster opensearchCluster
 
     /**
      * A closure to call before the cluster is considered ready. The closure is passed the node info,
@@ -211,7 +211,7 @@ class InstanceInfo {
             args.add('"') // end the entire command, quoted
         }
 
-        this.elasticsearchCluster = config.getElasticsearchCluster()
+        this.opensearchCluster = config.getOpenSearchCluster()
     }
 
     Path binPath() {

buildSrc/src/main/groovy/org/opensearch/hadoop/gradle/fixture/hadoop/ServiceDescriptor.groovy

@@ -19,7 +19,7 @@
 
 package org.opensearch.hadoop.gradle.fixture.hadoop
 
-import org.elasticsearch.gradle.Version
+import org.opensearch.gradle.Version
 import org.opensearch.hadoop.gradle.fixture.hadoop.conf.InstanceConfiguration
 import org.opensearch.hadoop.gradle.fixture.hadoop.conf.ServiceConfiguration
 

buildSrc/src/main/groovy/org/opensearch/hadoop/gradle/fixture/hadoop/conf/EndProcessConfiguration.groovy

@@ -19,7 +19,7 @@
 
 package org.opensearch.hadoop.gradle.fixture.hadoop.conf
 
-import org.elasticsearch.gradle.testclusters.ElasticsearchCluster
+import org.opensearch.gradle.testclusters.OpenSearchCluster
 import org.gradle.api.Project
 
 /**
@@ -87,7 +87,7 @@ class EndProcessConfiguration extends ProcessConfiguration {
     }
 
     @Override
-    ElasticsearchCluster getElasticsearchCluster() {
+    OpenSearchCluster getOpenSearchCluster() {
         return null
     }
 }

buildSrc/src/main/groovy/org/opensearch/hadoop/gradle/fixture/hadoop/conf/ProcessConfiguration.groovy

@@ -19,7 +19,7 @@
 
 package org.opensearch.hadoop.gradle.fixture.hadoop.conf
 
-import org.elasticsearch.gradle.testclusters.ElasticsearchCluster
+import org.opensearch.gradle.testclusters.OpenSearchCluster
 import org.gradle.api.InvalidUserDataException
 import org.gradle.api.Project
 import org.gradle.api.Task
@@ -50,7 +50,7 @@ abstract class ProcessConfiguration {
     private String javaHome = null
     private String jvmArgs = ''
     private boolean debug = false
-    private ElasticsearchCluster elasticsearchCluster = null
+    private OpenSearchCluster opensearchCluster = null
 
     void addSystemProperty(String key, String value) {
         systemProperties.put(key, value)
@@ -198,17 +198,17 @@ abstract class ProcessConfiguration {
         return debug
     }
 
-    void useElasticsearchCluster(ElasticsearchCluster elasticsearchCluster) {
-        this.elasticsearchCluster = elasticsearchCluster
+    void useOpenSearchCluster(OpenSearchCluster opensearchCluster) {
+        this.opensearchCluster = opensearchCluster
     }
 
-    ElasticsearchCluster getElasticsearchCluster() {
-        if (this.elasticsearchCluster != null) {
-            return this.elasticsearchCluster
+    OpenSearchCluster getOpenSearchCluster() {
+        if (this.opensearchCluster != null) {
+            return this.opensearchCluster
         } else {
             ProcessConfiguration parent = parent()
             if (parent != null) {
-                return parent.getElasticsearchCluster()
+                return parent.getOpenSearchCluster()
             } else {
                 return null
             }

buildSrc/src/main/groovy/org/opensearch/hadoop/gradle/fixture/hadoop/conf/ServiceConfiguration.groovy

@@ -19,7 +19,7 @@
 
 package org.opensearch.hadoop.gradle.fixture.hadoop.conf
 
-import org.elasticsearch.gradle.Version
+import org.opensearch.gradle.Version
 import org.opensearch.hadoop.gradle.fixture.hadoop.RoleDescriptor
 import org.opensearch.hadoop.gradle.fixture.hadoop.ServiceDescriptor
 import org.gradle.api.GradleException

buildSrc/src/main/groovy/org/opensearch/hadoop/gradle/fixture/hadoop/services/HadoopServiceDescriptor.groovy

@@ -20,7 +20,7 @@
 package org.opensearch.hadoop.gradle.fixture.hadoop.services
 
 import org.apache.tools.ant.taskdefs.condition.Os
-import org.elasticsearch.gradle.Version
+import org.opensearch.gradle.Version
 import org.opensearch.hadoop.gradle.fixture.hadoop.ConfigFormats
 import org.opensearch.hadoop.gradle.fixture.hadoop.RoleDescriptor
 import org.opensearch.hadoop.gradle.fixture.hadoop.ServiceDescriptor

buildSrc/src/main/groovy/org/opensearch/hadoop/gradle/fixture/hadoop/services/HiveServiceDescriptor.groovy

@@ -19,7 +19,7 @@
 
 package org.opensearch.hadoop.gradle.fixture.hadoop.services
 
-import org.elasticsearch.gradle.Version
+import org.opensearch.gradle.Version
 import org.opensearch.hadoop.gradle.fixture.hadoop.ConfigFormats
 import org.opensearch.hadoop.gradle.fixture.hadoop.SetupTaskFactory
 import org.opensearch.hadoop.gradle.fixture.hadoop.conf.HadoopClusterConfiguration

buildSrc/src/main/groovy/org/opensearch/hadoop/gradle/fixture/hadoop/services/PigServiceDescriptor.groovy

@@ -19,7 +19,7 @@
 
 package org.opensearch.hadoop.gradle.fixture.hadoop.services
 
-import org.elasticsearch.gradle.Version
+import org.opensearch.gradle.Version
 import org.opensearch.hadoop.gradle.fixture.hadoop.ConfigFormats
 import org.opensearch.hadoop.gradle.fixture.hadoop.RoleDescriptor
 import org.opensearch.hadoop.gradle.fixture.hadoop.ServiceDescriptor

buildSrc/src/main/groovy/org/opensearch/hadoop/gradle/fixture/hadoop/services/SparkYarnServiceDescriptor.groovy

@@ -19,7 +19,7 @@
 
 package org.opensearch.hadoop.gradle.fixture.hadoop.services
 
-import org.elasticsearch.gradle.Version
+import org.opensearch.gradle.Version
 import org.opensearch.hadoop.gradle.fixture.hadoop.ConfigFormats
 import org.opensearch.hadoop.gradle.fixture.hadoop.RoleDescriptor
 import org.opensearch.hadoop.gradle.fixture.hadoop.ServiceDescriptor

buildSrc/src/main/groovy/org/opensearch/hadoop/gradle/fixture/hadoop/tasks/AbstractClusterTask.groovy

@@ -19,7 +19,7 @@
 
 package org.opensearch.hadoop.gradle.fixture.hadoop.tasks
 
-import org.elasticsearch.gradle.testclusters.DefaultTestClustersTask
+import org.opensearch.gradle.testclusters.DefaultTestClustersTask
 import org.opensearch.hadoop.gradle.fixture.hadoop.conf.HadoopClusterConfiguration
 import org.opensearch.hadoop.gradle.fixture.hadoop.conf.InstanceConfiguration
 import org.gradle.api.tasks.Input

buildSrc/src/main/java/org/opensearch/hadoop/gradle/buildtools/DependenciesInfoPlugin.java

@@ -19,7 +19,7 @@
 
 package org.opensearch.hadoop.gradle.buildtools;
 
-import org.elasticsearch.gradle.dependencies.CompileOnlyResolvePlugin;
+import org.opensearch.gradle.dependencies.CompileOnlyResolvePlugin;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.plugins.JavaPlugin;

buildSrc/src/main/java/org/opensearch/hadoop/gradle/buildtools/LicenseHeadersTask.java

@@ -178,7 +178,7 @@ public void runRat() {
             matchers.add(subStringMatcher(category, family, additional.getValue()));
         }
 
-        reportConfiguration.setHeaderMatcher(new HeaderMatcherMultiplexer(matchers.toArray(IHeaderMatcher[]::new)));
+        reportConfiguration.setHeaderMatcher(new HeaderMatcherMultiplexer(matchers));
         reportConfiguration.setApprovedLicenseNames(approvedLicenses.stream().map(license -> {
             SimpleLicenseFamily simpleLicenseFamily = new SimpleLicenseFamily();
             simpleLicenseFamily.setFamilyName(license);

buildSrc/src/main/java/org/opensearch/hadoop/gradle/buildtools/LoggedExec.java

@@ -18,7 +18,7 @@
  */
 package org.opensearch.hadoop.gradle.buildtools;
 
-import org.elasticsearch.gradle.FileSystemOperationsAware;
+import org.opensearch.gradle.FileSystemOperationsAware;
 import org.gradle.api.Action;
 import org.gradle.api.GradleException;
 import org.gradle.api.Task;

buildSrc/src/main/java/org/opensearch/hadoop/gradle/buildtools/Util.java

@@ -19,7 +19,7 @@
 
 package org.opensearch.hadoop.gradle.buildtools;
 
-import org.elasticsearch.gradle.util.GradleUtils;
+import org.opensearch.gradle.util.GradleUtils;
 import org.opensearch.hadoop.gradle.buildtools.info.GlobalBuildInfoPlugin;
 import org.gradle.api.Action;
 import org.gradle.api.GradleException;

buildSrc/src/main/java/org/opensearch/hadoop/gradle/buildtools/info/GlobalBuildInfoPlugin.java

@@ -18,7 +18,7 @@
  */
 package org.opensearch.hadoop.gradle.buildtools.info;
 
-import org.elasticsearch.gradle.OS;
+import org.opensearch.gradle.OS;
 import org.opensearch.hadoop.gradle.buildtools.Util;
 import org.gradle.api.GradleException;
 import org.gradle.api.JavaVersion;

buildSrc/src/main/java/org/opensearch/hadoop/gradle/scala/SparkVariantPlugin.java

@@ -272,7 +272,7 @@ public void execute(ComponentMetadataContext componentMetadataContext) {
                 if (SCALA_LIBRARY.equals(details.getId().getName())) {
                     details.allVariants(variantMetadata -> {
                         variantMetadata.withCapabilities(capabilityMetadata -> {
-                            capabilityMetadata.addCapability("org.elasticsearch.gradle", SCALA_LIBRARY, details.getId().getVersion());
+                            capabilityMetadata.addCapability("org.opensearch.gradle", SCALA_LIBRARY, details.getId().getVersion());
                         });
                     });
                 }

dist/build.gradle

@@ -1,6 +1,6 @@
-import org.opensearch.hadoop.gradle.buildtools.ConcatFilesTask
-import org.opensearch.hadoop.gradle.buildtools.DependenciesInfoTask
-import org.opensearch.hadoop.gradle.buildtools.DependencyLicensesTask
+import org.opensearch.gradle.ConcatFilesTask
+import org.opensearch.gradle.DependenciesInfoTask
+import org.opensearch.gradle.precommit.DependencyLicensesTask
 import org.opensearch.hadoop.gradle.BuildPlugin
 
 apply plugin: 'opensearch.hadoop.build'

qa/build.gradle

@@ -46,7 +46,7 @@ subprojects {
             if (localRepo) {
                 classpath name: "build-tools-${version}"
             } else {
-                classpath group: 'org.elasticsearch.gradle', name: 'build-tools', version: project.ext.buildToolsVersion
+                classpath group: 'org.opensearch.gradle', name: 'build-tools', version: project.ext.buildToolsVersion
             }
         }
     }

qa/kerberos/build.gradle

@@ -18,7 +18,7 @@
  */
 
 import org.opensearch.hadoop.gradle.buildtools.AntFixture
-import org.elasticsearch.gradle.testclusters.DefaultTestClustersTask
+import org.opensearch.gradle.testclusters.DefaultTestClustersTask
 import org.opensearch.hadoop.gradle.fixture.hadoop.HadoopFixturePlugin
 import org.opensearch.hadoop.gradle.fixture.hadoop.ServiceDescriptor
 import org.opensearch.hadoop.gradle.fixture.hadoop.conf.HadoopClusterConfiguration
@@ -292,7 +292,7 @@ if (disableTests) {
     HadoopClusterConfiguration config = project.hadoop.cluster("hadoopFixture") { HadoopClusterConfiguration config ->
         // Hadoop cluster depends on KDC Fixture being up and running
         config.addDependency(kdcFixture)
-        config.useElasticsearchCluster(testClusters.integTest)
+        config.useOpenSearchCluster(testClusters.integTest)
 
         config.service('hadoop') { ServiceConfiguration s ->
             s.addSystemProperty("java.security.krb5.conf", krb5Conf.toString())