cs_2.7.0.0

ochprince · May 15, 2023 · 28ecfa2 · 28ecfa2
1 parent 09f9d11
commit 28ecfa2
Show file tree

Hide file tree

Showing 552 changed files with 7,683 additions and 7,665 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,4 +15,5 @@ src/test/resources/job-scheduler/
 src/test/resources/bwc/
 bin/
 spi/bin/
-src/test/resources/notifications*
+src/test/resources/notifications*
+gradle/wrapper/gradle-7.4.2-bin.zip
diff --git a/build.gradle b/build.gradle
@@ -4,8 +4,8 @@
  */
 
 
-import org.opensearch.gradle.testclusters.OpenSearchCluster
-import org.opensearch.gradle.testclusters.StandaloneRestIntegTestTask
+import com.colasoft.opensearch.gradle.testclusters.OpenSearchCluster
+import com.colasoft.opensearch.gradle.testclusters.StandaloneRestIntegTestTask
 
 import javax.net.ssl.HostnameVerifier
 import javax.net.ssl.HttpsURLConnection
@@ -25,8 +25,8 @@ import java.util.concurrent.TimeUnit
 
 buildscript {
     ext {
-        isSnapshot = "true" == System.getProperty("build.snapshot", "true")
-        opensearch_version = System.getProperty("opensearch.version", "2.7.0-SNAPSHOT")
+        isSnapshot = "true" == System.getProperty("build.snapshot", "false")
+        opensearch_version = System.getProperty("opensearch.version", "2.7.0")
         buildVersionQualifier = System.getProperty("build.version_qualifier", "")
         // 2.2.0-SNAPSHOT -> 2.2.0.0-SNAPSHOT
         version_tokens = opensearch_version.tokenize('-')
@@ -69,14 +69,19 @@ buildscript {
     }
 
     repositories {
+        maven {
+            allowInsecureProtocol(true)
+            url 'http://192.168.0.9:8081/nexus/content/groups/public'
+        }
+        maven {
+            url 'https://maven.aliyun.com/nexus/content/groups/public/'
+        }
         mavenLocal()
-        mavenCentral()
         maven { url "https://plugins.gradle.org/m2/" }
-        maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" }
     }
 
     dependencies {
-        classpath "org.opensearch.gradle:build-tools:${opensearch_version}"
+        classpath "com.colasoft.opensearch.gradle:build-tools:${opensearch_version}"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}"
         classpath "org.jetbrains.kotlin:kotlin-allopen:${kotlin_version}"
         classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.21.0"
@@ -135,7 +140,7 @@ check.dependsOn jacocoTestReport
 opensearchplugin {
     name 'opensearch-index-management'
     description 'OpenSearch Index Management Plugin'
-    classname 'org.opensearch.indexmanagement.IndexManagementPlugin'
+    classname 'com.colasoft.opensearch.indexmanagement.IndexManagementPlugin'
     extendedPlugins = ['opensearch-job-scheduler']
 }
 
@@ -144,7 +149,7 @@ tasks.named("integTest").configure {
 }
 
 allOpen {
-    annotation("org.opensearch.indexmanagement.util.OpenForTesting")
+    annotation("com.colasoft.opensearch.indexmanagement.util.OpenForTesting")
 }
 
 configurations {
@@ -187,29 +192,29 @@ ext {
 }
 
 allprojects {
-    group = "org.opensearch"
+    group = "com.colasoft.opensearch"
     version = "${opensearch_build}"
 }
 
 configurations {
     opensearchPlugin
 }
 dependencies {
-    compileOnly "org.opensearch:opensearch:${opensearch_version}"
-    compileOnly "org.opensearch:opensearch-job-scheduler-spi:${job_scheduler_version}"
+    compileOnly "com.colasoft.opensearch:opensearch:${opensearch_version}"
+    compileOnly "com.colasoft.opensearch:opensearch-job-scheduler-spi:${job_scheduler_version}"
     implementation "org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-common:${kotlin_version}"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${kotlin_version}"
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9'
     implementation "org.jetbrains:annotations:13.0"
     implementation project(path: ":${rootProject.name}-spi", configuration: 'shadow')
-    implementation "org.opensearch:common-utils:${common_utils_version}"
+    implementation "com.colasoft.opensearch:common-utils:${common_utils_version}"
     implementation "com.github.seancfoley:ipaddress:5.3.3"
     implementation "commons-codec:commons-codec:${versions.commonscodec}"
     implementation "org.apache.httpcomponents:httpclient:4.5.13"
     implementation "org.apache.httpcomponents:httpcore:4.4.15"
 
-    testImplementation "org.opensearch.test:framework:${opensearch_version}"
+    testImplementation "com.colasoft.opensearch.test:framework:${opensearch_version}"
     testImplementation "org.jetbrains.kotlin:kotlin-test:${kotlin_version}"
     testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0"
     testImplementation "org.mockito:mockito-core:${versions.mockito}"
@@ -221,15 +226,21 @@ dependencies {
     }
 
     // https://aws.oss.sonatype.org/content/repositories/snapshots/org/opensearch/plugin/
-    opensearchPlugin "org.opensearch.plugin:opensearch-job-scheduler:${job_scheduler_version}@zip"
-    opensearchPlugin "org.opensearch.plugin:opensearch-notifications-core:${notifications_version}@zip"
-    opensearchPlugin "org.opensearch.plugin:notifications:${notifications_version}@zip"
-    opensearchPlugin "org.opensearch.plugin:opensearch-security:${security_plugin_version}@zip"
+    opensearchPlugin "com.colasoft.opensearch.plugin:opensearch-job-scheduler:${job_scheduler_version}@zip"
+    opensearchPlugin "com.colasoft.opensearch.plugin:opensearch-notifications-core:${notifications_version}@zip"
+    opensearchPlugin "com.colasoft.opensearch.plugin:notifications:${notifications_version}@zip"
+    opensearchPlugin "com.colasoft.opensearch.plugin:opensearch-security:${security_plugin_version}@zip"
 }
 
 repositories {
+    maven {
+        allowInsecureProtocol(true)
+        url 'http://192.168.0.9:8081/nexus/content/groups/public'
+    }
+    maven {
+        url 'https://maven.aliyun.com/nexus/content/groups/public/'
+    }
     mavenLocal()
-    maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" }
 }
 
 publishing {
@@ -238,7 +249,7 @@ publishing {
             pom {
                 name = opensearchplugin.name
                 description = opensearchplugin.description
-                groupId = "org.opensearch.plugin"
+                groupId = "com.colasoft.opensearch.plugin"
                 licenses {
                     license {
                         name = "The Apache License, Version 2.0"
@@ -256,11 +267,12 @@ publishing {
     }
     repositories {
         maven {
-            name = "Snapshots"
-            url = "https://aws.oss.sonatype.org/content/repositories/snapshots"
+            setAllowInsecureProtocol(true)
+            name = 'release'
+            url = 'http://192.168.0.9:8081/nexus/content/repositories/sm_release_repositories'
             credentials {
-                username "$System.env.SONATYPE_USERNAME"
-                password "$System.env.SONATYPE_PASSWORD"
+                username 'sm_admin'
+                password 'p[-sdko12}(9K'
             }
         }
     }
@@ -545,20 +557,20 @@ integTest {
 
     if (System.getProperty("tests.rest.bwcsuite") == null) {
         filter {
-            excludeTestsMatching "org.opensearch.indexmanagement.bwc.*IT"
+            excludeTestsMatching "com.colasoft.opensearch.indexmanagement.bwc.*IT"
         }
     }
     // Exclude security test
     if (System.getProperty("https") == null || System.getProperty("https") == "false") {
         filter {
-            excludeTestsMatching "org.opensearch.*Security*IT"
+            excludeTestsMatching "com.colasoft.opensearch.*Security*IT"
         }
     }
 
     // TODO: Fix running notification test against remote cluster with security plugin installed
     if (System.getProperty("https") != null) {
         filter {
-            excludeTestsMatching "org.opensearch.indexmanagement.indexstatemanagement.action.NotificationActionIT"
+            excludeTestsMatching "com.colasoft.opensearch.indexmanagement.indexstatemanagement.action.NotificationActionIT"
         }
         exclude 'org/opensearch/indexmanagement/indexstatemanagement/MetadataRegressionIT.class'
     }
@@ -581,7 +593,7 @@ task integTestRemote(type: RestIntegTestTask) {
 
     if (System.getProperty("tests.rest.bwcsuite") == null) {
         filter {
-            excludeTestsMatching "org.opensearch.indexmanagement.bwc.*IT"
+            excludeTestsMatching "com.colasoft.opensearch.indexmanagement.bwc.*IT"
         }
     }
 
@@ -592,7 +604,7 @@ task integTestRemote(type: RestIntegTestTask) {
     // TODO: Fix running notification test against remote cluster with security plugin installed
     if (System.getProperty("https") != null) {
         filter {
-            excludeTestsMatching "org.opensearch.indexmanagement.indexstatemanagement.action.NotificationActionIT"
+            excludeTestsMatching "com.colasoft.opensearch.indexmanagement.indexstatemanagement.action.NotificationActionIT"
         }
     }
 
@@ -733,7 +745,7 @@ task prepareBwcTests {
         dependsOn 'prepareBwcTests'
         useCluster testClusters."${baseName}$i"
         filter {
-            includeTestsMatching "org.opensearch.indexmanagement.bwc.*IT"
+            includeTestsMatching "com.colasoft.opensearch.indexmanagement.bwc.*IT"
         }
         systemProperty 'tests.rest.bwcsuite', 'old_cluster'
         systemProperty 'tests.rest.bwcsuite_round', 'old'
@@ -757,7 +769,7 @@ task "${baseName}#oneThirdsUpgradeCluster"(type: StandaloneRestIntegTestTask) {
         }
     }
     filter {
-        includeTestsMatching "org.opensearch.indexmanagement.bwc.*IT"
+        includeTestsMatching "com.colasoft.opensearch.indexmanagement.bwc.*IT"
     }
     systemProperty 'tests.rest.bwcsuite', 'mixed_cluster'
     systemProperty 'tests.rest.bwcsuite_round', 'first'
@@ -777,7 +789,7 @@ task "${baseName}#twoThirdsUpgradedClusterTask"(type: StandaloneRestIntegTestTas
         testClusters."${baseName}0".upgradeNodeAndPluginToNextVersion(plugins)
     }
     filter {
-        includeTestsMatching "org.opensearch.indexmanagement.bwc.*IT"
+        includeTestsMatching "com.colasoft.opensearch.indexmanagement.bwc.*IT"
     }
     systemProperty 'tests.rest.bwcsuite', 'mixed_cluster'
     systemProperty 'tests.rest.bwcsuite_round', 'second'
@@ -797,7 +809,7 @@ task "${baseName}#rollingUpgradeClusterTask"(type: StandaloneRestIntegTestTask)
         testClusters."${baseName}0".upgradeNodeAndPluginToNextVersion(plugins)
     }
     filter {
-        includeTestsMatching "org.opensearch.indexmanagement.bwc.*IT"
+        includeTestsMatching "com.colasoft.opensearch.indexmanagement.bwc.*IT"
     }
     systemProperty 'tests.rest.bwcsuite', 'upgraded_cluster'
     systemProperty 'tests.rest.bwcsuite_round', 'third'
@@ -816,7 +828,7 @@ task "${baseName}#fullRestartClusterTask"(type: StandaloneRestIntegTestTask) {
         testClusters."${baseName}1".upgradeAllNodesAndPluginsToNextVersion(plugins)
     }
     filter {
-        includeTestsMatching "org.opensearch.indexmanagement.bwc.*IT"
+        includeTestsMatching "com.colasoft.opensearch.indexmanagement.bwc.*IT"
     }
     systemProperty 'tests.rest.bwcsuite', 'upgraded_cluster'
     systemProperty 'tests.plugin_bwc_version', bwcVersion
@@ -861,7 +873,7 @@ apply from: 'build-tools/pkgbuild.gradle'
 // This IT is to simulate the situation
 // when there are old version (without metadata change)
 // and new version mixed in one cluster
-import org.opensearch.gradle.test.RestIntegTestTask
+import com.colasoft.opensearch.gradle.test.RestIntegTestTask
 
 def mixedClusterTest = project.tasks.create('mixedCluster', RestIntegTestTask.class)
 def mixedClusterFlag = findProperty('mixed') as Boolean ?: false

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/release-notes/opensearch-index-management.release-notes-2.4.0.0.md b/release-notes/opensearch-index-management.release-notes-2.4.0.0.md
@@ -15,7 +15,7 @@ Compatible with OpenSearch 2.4.0
 * Bugfix/538 Adding timeout and retry to Transform '_search' API calls ([#576](https://github.com/opensearch-project/index-management/pull/576))
 
 ### Infrastructure
-* add group = org.opensearch.plugin ([#571](https://github.com/opensearch-project/index-management/pull/571))
+* add group = com.colasoft.opensearch.plugin ([#571](https://github.com/opensearch-project/index-management/pull/571))
 
 ### Maintenance
 * Fix kotlin warnings ([#551](https://github.com/opensearch-project/index-management/pull/551))

diff --git a/release-notes/opensearch-index-management.release-notes-2.7.0.0.md b/release-notes/opensearch-index-management.release-notes-2.7.0.0.md
@@ -14,7 +14,7 @@ Compatible with OpenSearch 2.7.0
 * Error Prevention: Add snapshot action. ([#745](https://github.com/opensearch-project/index-management/pull/745))
 
 ### Refactoring
-* Replace Set in org.opensearch.common.collect with java.util references. ([#717](https://github.com/opensearch-project/index-management/pull/717))
+* Replace Set in com.colasoft.opensearch.common.collect with java.util references. ([#717](https://github.com/opensearch-project/index-management/pull/717))
 * Fixed xContent dependencies due to OSCore changes. ([#721](https://github.com/opensearch-project/index-management/pull/721))
 
 ### Bug fixes

diff --git a/spi/build.gradle b/spi/build.gradle
@@ -2,7 +2,7 @@
  * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  */
-import org.opensearch.gradle.test.RestIntegTestTask
+import com.colasoft.opensearch.gradle.test.RestIntegTestTask
 
 plugins {
     id 'com.github.johnrengelman.shadow'
@@ -38,10 +38,15 @@ jacocoTestReport {
 check.dependsOn jacocoTestReport
 
 repositories {
+    maven {
+        allowInsecureProtocol(true)
+        url 'http://192.168.0.9:8081/nexus/content/groups/public'
+    }
+    maven {
+        url 'https://maven.aliyun.com/nexus/content/groups/public/'
+    }
     mavenLocal()
-    mavenCentral()
     maven { url "https://plugins.gradle.org/m2/" }
-    maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" }
 }
 
 configurations.all {
@@ -53,15 +58,15 @@ configurations.all {
 }
 
 dependencies {
-    compileOnly "org.opensearch:opensearch:${opensearch_version}"
-    compileOnly "org.opensearch:opensearch-job-scheduler-spi:${job_scheduler_version}"
+    compileOnly "com.colasoft.opensearch:opensearch:${opensearch_version}"
+    compileOnly "com.colasoft.opensearch:opensearch-job-scheduler-spi:${job_scheduler_version}"
     compileOnly "org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}"
     compileOnly "org.jetbrains.kotlin:kotlin-stdlib-common:${kotlin_version}"
     compileOnly "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlin_version}"
     compileOnly "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9"
-    compileOnly "org.opensearch:common-utils:${common_utils_version}"
+    compileOnly "com.colasoft.opensearch:common-utils:${common_utils_version}"
 
-    testImplementation "org.opensearch.test:framework:${opensearch_version}"
+    testImplementation "com.colasoft.opensearch.test:framework:${opensearch_version}"
     testImplementation "org.apache.logging.log4j:log4j-core:${versions.log4j}"
 }
 

diff --git a/spi/src/main/kotlin/org.opensearch.indexmanagement.spi/IndexManagementExtension.kt b/spi/src/main/kotlin/org.opensearch.indexmanagement.spi/IndexManagementExtension.kt
@@ -3,12 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.indexmanagement.spi
+package com.colasoft.opensearch.indexmanagement.spi
 
-import org.opensearch.indexmanagement.spi.indexstatemanagement.ActionParser
-import org.opensearch.indexmanagement.spi.indexstatemanagement.DefaultStatusChecker
-import org.opensearch.indexmanagement.spi.indexstatemanagement.IndexMetadataService
-import org.opensearch.indexmanagement.spi.indexstatemanagement.StatusChecker
+import com.colasoft.opensearch.indexmanagement.spi.indexstatemanagement.ActionParser
+import com.colasoft.opensearch.indexmanagement.spi.indexstatemanagement.DefaultStatusChecker
+import com.colasoft.opensearch.indexmanagement.spi.indexstatemanagement.IndexMetadataService
+import com.colasoft.opensearch.indexmanagement.spi.indexstatemanagement.StatusChecker
 
 /**
  * SPI for IndexManagement

diff --git a/spi/src/main/kotlin/org.opensearch.indexmanagement.spi/indexstatemanagement/Action.kt b/spi/src/main/kotlin/org.opensearch.indexmanagement.spi/indexstatemanagement/Action.kt
@@ -3,18 +3,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.indexmanagement.spi.indexstatemanagement
-
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
-import org.opensearch.core.xcontent.ToXContent
-import org.opensearch.core.xcontent.ToXContentObject
-import org.opensearch.core.xcontent.XContentBuilder
-import org.opensearch.indexmanagement.spi.indexstatemanagement.model.ActionMetaData
-import org.opensearch.indexmanagement.spi.indexstatemanagement.model.ActionRetry
-import org.opensearch.indexmanagement.spi.indexstatemanagement.model.ActionTimeout
-import org.opensearch.indexmanagement.spi.indexstatemanagement.model.ManagedIndexMetaData
-import org.opensearch.indexmanagement.spi.indexstatemanagement.model.StepContext
+package com.colasoft.opensearch.indexmanagement.spi.indexstatemanagement
+
+import com.colasoft.opensearch.common.io.stream.StreamOutput
+import com.colasoft.opensearch.common.io.stream.Writeable
+import com.colasoft.opensearch.core.xcontent.ToXContent
+import com.colasoft.opensearch.core.xcontent.ToXContentObject
+import com.colasoft.opensearch.core.xcontent.XContentBuilder
+import com.colasoft.opensearch.indexmanagement.spi.indexstatemanagement.model.ActionMetaData
+import com.colasoft.opensearch.indexmanagement.spi.indexstatemanagement.model.ActionRetry
+import com.colasoft.opensearch.indexmanagement.spi.indexstatemanagement.model.ActionTimeout
+import com.colasoft.opensearch.indexmanagement.spi.indexstatemanagement.model.ManagedIndexMetaData
+import com.colasoft.opensearch.indexmanagement.spi.indexstatemanagement.model.StepContext
 import java.time.Instant
 
 abstract class Action(

diff --git a/spi/src/main/kotlin/org.opensearch.indexmanagement.spi/indexstatemanagement/ActionParser.kt b/spi/src/main/kotlin/org.opensearch.indexmanagement.spi/indexstatemanagement/ActionParser.kt
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.indexmanagement.spi.indexstatemanagement
+package com.colasoft.opensearch.indexmanagement.spi.indexstatemanagement
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.core.xcontent.XContentParser
+import com.colasoft.opensearch.common.io.stream.StreamInput
+import com.colasoft.opensearch.core.xcontent.XContentParser
 
 abstract class ActionParser(var customAction: Boolean = false) {