cs_2.7.0.0

ochprince · May 13, 2023 · 8750e59 · 8750e59
1 parent e63a2e2
commit 8750e59
Show file tree

Hide file tree

Showing 51 changed files with 433 additions and 407 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,4 @@ build
 bin/
 .classpath
 .vscode
+gradle/wrapper/gradle-8.0.2-bin.zip
diff --git a/README.md b/README.md
@@ -31,11 +31,11 @@ Add the following to your plugin to integrate with JobScheduler
 * Add [this workaround](https://github.com/opensearch-project/job-scheduler/blob/main/sample-extension-plugin/build.gradle#L36) to make sure that job-schedular plugin is correctly installed during integration tests.
 
 2. Implement the following classes
-* Implement these two interfaces [ScheduledJobParameter](https://github.com/opensearch-project/job-scheduler/blob/main/sample-extension-plugin/src/main/java/org/opensearch/jobscheduler/sampleextension/SampleJobParameter.java#L37) and [ScheduledJobRunner](https://github.com/opensearch-project/job-scheduler/blob/main/sample-extension-plugin/src/main/java/org/opensearch/jobscheduler/sampleextension/SampleJobRunner.java#L43)
-* Extend class [JobSchedulerExtension](https://github.com/opensearch-project/job-scheduler/blob/main/sample-extension-plugin/src/main/java/org/opensearch/jobscheduler/sampleextension/SampleExtensionPlugin.java#L12)
+* Implement these two interfaces [ScheduledJobParameter](https://github.com/opensearch-project/job-scheduler/blob/main/sample-extension-plugin/src/main/java/com/colasoft/opensearch/jobscheduler/sampleextension/SampleJobParameter.java#L37) and [ScheduledJobRunner](https://github.com/opensearch-project/job-scheduler/blob/main/sample-extension-plugin/src/main/java/com/colasoft/opensearch/jobscheduler/sampleextension/SampleJobRunner.java#L43)
+* Extend class [JobSchedulerExtension](https://github.com/opensearch-project/job-scheduler/blob/main/sample-extension-plugin/src/main/java/com/colasoft/opensearch/jobscheduler/sampleextension/SampleExtensionPlugin.java#L12)
 
 3. Add the resource file
-* Create `org.opensearch.jobscheduler.spi.JobSchedulerExtension` [file](https://github.com/opensearch-project/job-scheduler/blob/main/sample-extension-plugin/src/main/resources/META-INF/services/org.opensearch.jobscheduler.spi.JobSchedulerExtension#L1).
+* Create `com.colasoft.opensearch.jobscheduler.spi.JobSchedulerExtension` [file](https://github.com/opensearch-project/job-scheduler/blob/main/sample-extension-plugin/src/main/resources/META-INF/services/com.colasoft.opensearch.jobscheduler.spi.JobSchedulerExtension#L1).
 
 ## Contributing
 

diff --git a/build-tools/repositories.gradle b/build-tools/repositories.gradle
@@ -4,5 +4,9 @@
  */
 
 repositories {
+    maven {
+        allowInsecureProtocol(true)
+        url 'http://192.168.0.9:8081/nexus/content/groups/public'
+    }
     mavenCentral()
 }
diff --git a/build.gradle b/build.gradle
@@ -3,23 +3,29 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import com.github.jengelman.gradle.plugins.shadow.ShadowPlugin
-import org.opensearch.gradle.test.RestIntegTestTask
+import com.colasoft.opensearch.gradle.test.RestIntegTestTask
 
 buildscript {
     ext {
-        opensearch_version = System.getProperty("opensearch.version", "2.7.0-SNAPSHOT")
-        isSnapshot = "true" == System.getProperty("build.snapshot", "true")
+        opensearch_version = System.getProperty("opensearch.version", "2.7.0")
+        isSnapshot = "true" == System.getProperty("build.snapshot", "false")
         buildVersionQualifier = System.getProperty("build.version_qualifier", "")
     }
 
     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://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}"
     }
 }
 
@@ -59,7 +65,7 @@ tasks.matching {it.path in [":publishNebulaPublicationToSnapshotsRepository"]}.a
 opensearchplugin {
     name 'opensearch-job-scheduler'
     description 'OpenSearch Job Scheduler plugin'
-    classname 'org.opensearch.jobscheduler.JobSchedulerPlugin'
+    classname 'com.colasoft.opensearch.jobscheduler.JobSchedulerPlugin'
 }
 
 javaRestTest {
@@ -72,7 +78,7 @@ testClusters.javaRestTest {
 }
 
 allprojects {
-    group = 'org.opensearch'
+    group = 'com.colasoft.opensearch'
     version = opensearch_version.tokenize('-')[0] + '.0'
     if (buildVersionQualifier) {
         version += "-${buildVersionQualifier}"
@@ -107,7 +113,7 @@ allprojects {
                     pom {
                         name = "opensearch-job-scheduler"
                         description = "OpenSearch Job Scheduler plugin"
-                        groupId = "org.opensearch.plugin"
+                        groupId = "com.colasoft.opensearch.plugin"
                     }
                     pom.withXml { XmlProvider xml ->
                         Node node = xml.asNode()
@@ -133,26 +139,33 @@ publishing {
             pom {
                 name = "opensearch-job-scheduler"
                 description = "OpenSearch Job Scheduler plugin"
-                groupId = "org.opensearch.plugin"
+                groupId = "com.colasoft.opensearch.plugin"
             }
         }
     }
     repositories {
         maven {
-            name = "Snapshots" //  optional target repository name
-            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'
             }
         }
     }
 }
 
 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://aws.oss.sonatype.org/content/repositories/snapshots" }
 }
 
 dependencies {
@@ -260,7 +273,7 @@ task integTestRemote(type: RestIntegTestTask) {
 
     if (System.getProperty("tests.rest.cluster") != null) {
         filter {
-            includeTestsMatching "org.opensearch.jobscheduler.*RestIT"
+            includeTestsMatching "com.colasoft.opensearch.jobscheduler.*RestIT"
         }
     }
 }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+#distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionUrl=gradle-8.0.2-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/release-notes/opensearch.job-scheduler.release-notes-2.4.0.0.md b/release-notes/opensearch.job-scheduler.release-notes-2.4.0.0.md
@@ -5,7 +5,7 @@ Compatible with OpenSearch 2.4.0
 ### Maintenance
 * testing ci ([#264](https://github.com/opensearch-project/job-scheduler/pull/264)) ([#265](https://github.com/opensearch-project/job-scheduler/pull/265))
 * Add slf4j which is the dep of cronutils. ([#256](https://github.com/opensearch-project/job-scheduler/pull/256)) ([#257](https://github.com/opensearch-project/job-scheduler/pull/257))
-* add group = org.opensearch.plugin. ([#251](https://github.com/opensearch-project/job-scheduler/pull/251)) ([#255](https://github.com/opensearch-project/job-scheduler/pull/255))
+* add group = com.colasoft.opensearch.plugin. ([#251](https://github.com/opensearch-project/job-scheduler/pull/251)) ([#255](https://github.com/opensearch-project/job-scheduler/pull/255))
 * Updating CronUtils due to glassfish CVE. ([#245](https://github.com/opensearch-project/job-scheduler/pull/245)) ([#246](https://github.com/opensearch-project/job-scheduler/pull/246))
 * Increment version to 2.4.0-SNAPSHOT. ([#241](https://github.com/opensearch-project/job-scheduler/pull/241))
 

diff --git a/release-notes/opensearch.job-scheduler.release-notes-2.7.0.0.md b/release-notes/opensearch.job-scheduler.release-notes-2.7.0.0.md
@@ -3,7 +3,7 @@
 Compatible with OpenSearch 2.7.0
 
 ### Added
-* Adding name and description to org.opensearch.opensearch-job-scheduler pom ([#338](https://github.com/opensearch-project/job-scheduler/pull/338))
+* Adding name and description to com.colasoft.opensearch.opensearch-job-scheduler pom ([#338](https://github.com/opensearch-project/job-scheduler/pull/338))
 * Adding Decoupling snapshots ([#324](https://github.com/opensearch-project/job-scheduler/pull/324))
 * Adding generatePomFileForPluginZipPublication as dependency of publishNebulaPublicationToSnapshotsRepository ([#360](https://github.com/opensearch-project/job-scheduler/pull/360))
 * Adding groupId to pom section of build.gradle ([#363](https://github.com/opensearch-project/job-scheduler/pull/363))

diff --git a/sample-extension-plugin/build.gradle b/sample-extension-plugin/build.gradle
@@ -7,16 +7,16 @@ apply plugin: 'opensearch.opensearchplugin'
 apply plugin: 'opensearch.testclusters'
 apply plugin: 'opensearch.java-rest-test'
 
-import org.opensearch.gradle.test.RestIntegTestTask
-import org.opensearch.gradle.testclusters.StandaloneRestIntegTestTask
+import com.colasoft.opensearch.gradle.test.RestIntegTestTask
+import com.colasoft.opensearch.gradle.testclusters.StandaloneRestIntegTestTask
 
 import java.util.concurrent.Callable
 
 
 opensearchplugin {
     name 'opensearch-job-scheduler-sample-extension'
     description 'Sample plugin that extends OpenSearch Job Scheduler plugin'
-    classname 'org.opensearch.jobscheduler.sampleextension.SampleExtensionPlugin'
+    classname 'com.colasoft.opensearch.jobscheduler.sampleextension.SampleExtensionPlugin'
     extendedPlugins = ['opensearch-job-scheduler']
 }
 
@@ -27,9 +27,12 @@ ext {
 }
 
 repositories {
+    maven {
+        allowInsecureProtocol(true)
+        url 'http://192.168.0.9:8081/nexus/content/groups/public'
+    }
     mavenLocal()
     mavenCentral()
-    maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" }
 }
 
 dependencies {
@@ -96,7 +99,7 @@ integTest {
     }
     if (System.getProperty("tests.rest.bwcsuite") == null) {
         filter {
-            excludeTestsMatching "org.opensearch.jobscheduler.sampleextension.bwc.*IT"
+            excludeTestsMatching "com.colasoft.opensearch.jobscheduler.sampleextension.bwc.*IT"
         }
     }
 }
@@ -187,7 +190,7 @@ task prepareBwcTests {
         dependsOn 'prepareBwcTests'
         useCluster testClusters."${baseName}$i"
         filter {
-            includeTestsMatching "org.opensearch.jobscheduler.sampleextension.bwc.*IT"
+            includeTestsMatching "com.colasoft.opensearch.jobscheduler.sampleextension.bwc.*IT"
         }
         systemProperty 'tests.rest.bwcsuite', 'old_cluster'
         systemProperty 'tests.rest.bwcsuite_round', 'old'
@@ -207,7 +210,7 @@ task "${baseName}#mixedClusterTask"(type: StandaloneRestIntegTestTask) {
         testClusters."${baseName}0".upgradeNodeAndPluginToNextVersion(plugins)
     }
     filter {
-        includeTestsMatching "org.opensearch.jobscheduler.sampleextension.bwc.*IT"
+        includeTestsMatching "com.colasoft.opensearch.jobscheduler.sampleextension.bwc.*IT"
     }
     systemProperty 'tests.rest.bwcsuite', 'mixed_cluster'
     systemProperty 'tests.rest.bwcsuite_round', 'first'
@@ -226,7 +229,7 @@ task "${baseName}#twoThirdsUpgradedClusterTask"(type: StandaloneRestIntegTestTas
         testClusters."${baseName}0".upgradeNodeAndPluginToNextVersion(plugins)
     }
     filter {
-        includeTestsMatching "org.opensearch.jobscheduler.sampleextension.bwc.*IT"
+        includeTestsMatching "com.colasoft.opensearch.jobscheduler.sampleextension.bwc.*IT"
     }
     systemProperty 'tests.rest.bwcsuite', 'mixed_cluster'
     systemProperty 'tests.rest.bwcsuite_round', 'second'
@@ -245,7 +248,7 @@ task "${baseName}#rollingUpgradeClusterTask"(type: StandaloneRestIntegTestTask)
         testClusters."${baseName}0".upgradeNodeAndPluginToNextVersion(plugins)
     }
     filter {
-        includeTestsMatching "org.opensearch.jobscheduler.sampleextension.bwc.*IT"
+        includeTestsMatching "com.colasoft.opensearch.jobscheduler.sampleextension.bwc.*IT"
     }
     mustRunAfter "${baseName}#mixedClusterTask"
     systemProperty 'tests.rest.bwcsuite', 'mixed_cluster'
@@ -264,7 +267,7 @@ task "${baseName}#fullRestartClusterTask"(type: StandaloneRestIntegTestTask) {
         testClusters."${baseName}1".upgradeAllNodesAndPluginsToNextVersion(plugins)
     }
     filter {
-        includeTestsMatching "org.opensearch.jobscheduler.sampleextension.bwc.*IT"
+        includeTestsMatching "com.colasoft.opensearch.jobscheduler.sampleextension.bwc.*IT"
     }
     systemProperty 'tests.rest.bwcsuite', 'upgraded_cluster'
     systemProperty 'tests.plugin_bwc_version', bwcJobSchedulerVersion

diff --git a/...ampleextension/SampleExtensionPlugin.java → ...ampleextension/SampleExtensionPlugin.java b/...ampleextension/SampleExtensionPlugin.java → ...ampleextension/SampleExtensionPlugin.java
@@ -6,36 +6,36 @@
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  */
-package org.opensearch.jobscheduler.sampleextension;
+package com.colasoft.opensearch.jobscheduler.sampleextension;
 
-import org.opensearch.jobscheduler.spi.JobSchedulerExtension;
-import org.opensearch.jobscheduler.spi.ScheduledJobParser;
-import org.opensearch.jobscheduler.spi.ScheduledJobRunner;
-import org.opensearch.jobscheduler.spi.schedule.ScheduleParser;
+import com.colasoft.opensearch.jobscheduler.spi.JobSchedulerExtension;
+import com.colasoft.opensearch.jobscheduler.spi.ScheduledJobParser;
+import com.colasoft.opensearch.jobscheduler.spi.ScheduledJobRunner;
+import com.colasoft.opensearch.jobscheduler.spi.schedule.ScheduleParser;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.opensearch.client.Client;
-import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
-import org.opensearch.cluster.node.DiscoveryNodes;
-import org.opensearch.cluster.service.ClusterService;
-import org.opensearch.common.io.stream.NamedWriteableRegistry;
-import org.opensearch.common.settings.ClusterSettings;
-import org.opensearch.common.settings.IndexScopedSettings;
-import org.opensearch.common.settings.Settings;
-import org.opensearch.common.settings.SettingsFilter;
-import org.opensearch.core.xcontent.NamedXContentRegistry;
-import org.opensearch.core.xcontent.XContentParser;
-import org.opensearch.common.xcontent.XContentParserUtils;
-import org.opensearch.env.Environment;
-import org.opensearch.env.NodeEnvironment;
-import org.opensearch.plugins.ActionPlugin;
-import org.opensearch.plugins.Plugin;
-import org.opensearch.repositories.RepositoriesService;
-import org.opensearch.rest.RestController;
-import org.opensearch.rest.RestHandler;
-import org.opensearch.script.ScriptService;
-import org.opensearch.threadpool.ThreadPool;
-import org.opensearch.watcher.ResourceWatcherService;
+import com.colasoft.opensearch.client.Client;
+import com.colasoft.opensearch.cluster.metadata.IndexNameExpressionResolver;
+import com.colasoft.opensearch.cluster.node.DiscoveryNodes;
+import com.colasoft.opensearch.cluster.service.ClusterService;
+import com.colasoft.opensearch.common.io.stream.NamedWriteableRegistry;
+import com.colasoft.opensearch.common.settings.ClusterSettings;
+import com.colasoft.opensearch.common.settings.IndexScopedSettings;
+import com.colasoft.opensearch.common.settings.Settings;
+import com.colasoft.opensearch.common.settings.SettingsFilter;
+import com.colasoft.opensearch.core.xcontent.NamedXContentRegistry;
+import com.colasoft.opensearch.core.xcontent.XContentParser;
+import com.colasoft.opensearch.common.xcontent.XContentParserUtils;
+import com.colasoft.opensearch.env.Environment;
+import com.colasoft.opensearch.env.NodeEnvironment;
+import com.colasoft.opensearch.plugins.ActionPlugin;
+import com.colasoft.opensearch.plugins.Plugin;
+import com.colasoft.opensearch.repositories.RepositoriesService;
+import com.colasoft.opensearch.rest.RestController;
+import com.colasoft.opensearch.rest.RestHandler;
+import com.colasoft.opensearch.script.ScriptService;
+import com.colasoft.opensearch.threadpool.ThreadPool;
+import com.colasoft.opensearch.watcher.ResourceWatcherService;
 
 import java.io.IOException;
 import java.time.Instant;

diff --git a/...extension/SampleExtensionRestHandler.java → ...extension/SampleExtensionRestHandler.java b/...extension/SampleExtensionRestHandler.java → ...extension/SampleExtensionRestHandler.java
@@ -6,22 +6,22 @@
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  */
-package org.opensearch.jobscheduler.sampleextension;
+package com.colasoft.opensearch.jobscheduler.sampleextension;
 
-import org.opensearch.action.support.WriteRequest;
-import org.opensearch.jobscheduler.spi.schedule.IntervalSchedule;
-import org.opensearch.action.ActionListener;
-import org.opensearch.action.delete.DeleteRequest;
-import org.opensearch.action.delete.DeleteResponse;
-import org.opensearch.action.index.IndexRequest;
-import org.opensearch.action.index.IndexResponse;
-import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.xcontent.json.JsonXContent;
-import org.opensearch.rest.BaseRestHandler;
-import org.opensearch.rest.BytesRestResponse;
-import org.opensearch.rest.RestRequest;
-import org.opensearch.rest.RestResponse;
-import org.opensearch.rest.RestStatus;
+import com.colasoft.opensearch.action.support.WriteRequest;
+import com.colasoft.opensearch.jobscheduler.spi.schedule.IntervalSchedule;
+import com.colasoft.opensearch.action.ActionListener;
+import com.colasoft.opensearch.action.delete.DeleteRequest;
+import com.colasoft.opensearch.action.delete.DeleteResponse;
+import com.colasoft.opensearch.action.index.IndexRequest;
+import com.colasoft.opensearch.action.index.IndexResponse;
+import com.colasoft.opensearch.client.node.NodeClient;
+import com.colasoft.opensearch.common.xcontent.json.JsonXContent;
+import com.colasoft.opensearch.rest.BaseRestHandler;
+import com.colasoft.opensearch.rest.BytesRestResponse;
+import com.colasoft.opensearch.rest.RestRequest;
+import com.colasoft.opensearch.rest.RestResponse;
+import com.colasoft.opensearch.rest.RestStatus;
 
 import java.io.IOException;
 import java.time.Instant;

diff --git a/...r/sampleextension/SampleJobParameter.java → ...r/sampleextension/SampleJobParameter.java b/...r/sampleextension/SampleJobParameter.java → ...r/sampleextension/SampleJobParameter.java
@@ -6,11 +6,11 @@
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  */
-package org.opensearch.jobscheduler.sampleextension;
+package com.colasoft.opensearch.jobscheduler.sampleextension;
 
-import org.opensearch.jobscheduler.spi.ScheduledJobParameter;
-import org.opensearch.jobscheduler.spi.schedule.Schedule;
-import org.opensearch.core.xcontent.XContentBuilder;
+import com.colasoft.opensearch.jobscheduler.spi.ScheduledJobParameter;
+import com.colasoft.opensearch.jobscheduler.spi.schedule.Schedule;
+import com.colasoft.opensearch.core.xcontent.XContentBuilder;
 
 import java.io.IOException;
 import java.time.Instant;