From e0bda4a537d1149a1e19800f1aee4f97f7604f5a Mon Sep 17 00:00:00 2001
From: Dave Lago <davelago@amazon.com>
Date: Wed, 5 Jan 2022 07:30:45 -0500
Subject: [PATCH 1/2] Version bump to 1.2.4.0

Signed-off-by: Dave Lago <davelago@amazon.com>
---
 build.gradle                 | 4 ++--
 plugin-descriptor.properties | 4 ++--
 pom.xml                      | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index f468fa1f3f..421adea215 100644
--- a/build.gradle
+++ b/build.gradle
@@ -37,7 +37,7 @@ plugins {
 buildDir = 'gradle-build'
 
 ext {
-    securityPluginVersion = '1.2.3.0'
+    securityPluginVersion = '1.2.4.0'
     isSnapshot = "true" == System.getProperty("build.snapshot", "true")
 }
 
@@ -67,7 +67,7 @@ ospackage {
     user 'root'
     permissionGroup 'root'
 
-    requires('opensearch-oss', "1.2.3", EQUAL)
+    requires('opensearch-oss', "1.2.4", EQUAL)
     packager = 'Amazon'
     vendor = 'Amazon'
     os = 'LINUX'
diff --git a/plugin-descriptor.properties b/plugin-descriptor.properties
index 31fe1f0e82..b08a730e1e 100644
--- a/plugin-descriptor.properties
+++ b/plugin-descriptor.properties
@@ -3,7 +3,7 @@
 description=Provide access control related features for OpenSearch 1.0.0
 #
 # 'version': plugin's version
-version=1.2.3.0-SNAPSHOT
+version=1.2.4.0-SNAPSHOT
 #
 # 'name': the plugin name
 name=opensearch-security
@@ -24,4 +24,4 @@ java.version=1.8
 # OpenSearch release. This version is checked when the plugin
 # is loaded so OpenSearch will refuse to start in the presence of
 # plugins with the incorrect opensearch.version.
-opensearch.version=1.2.3
+opensearch.version=1.2.4
diff --git a/pom.xml b/pom.xml
index 0471052e4c..5e0912ba77 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@
     <groupId>org.opensearch</groupId>
     <artifactId>opensearch-security</artifactId>
     <packaging>jar</packaging>
-    <version>1.2.3.0-SNAPSHOT</version>
+    <version>1.2.4.0-SNAPSHOT</version>
     <name>OpenSearch Security</name>
     <description>OpenSearch Security</description>
     <url>https://github.com/opensearch-project/security</url>
@@ -68,7 +68,7 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <maven.compiler.release>8</maven.compiler.release>
 
-        <opensearch.version>1.2.3-SNAPSHOT</opensearch.version>
+        <opensearch.version>1.2.4-SNAPSHOT</opensearch.version>
 
         <!-- deps -->
         <netty-native.version>2.0.25.Final</netty-native.version>
@@ -103,7 +103,7 @@
         <url>https://github.com/opensearch-project/security</url>
         <connection>scm:git:git@github.com:opensearch-project/security.git</connection>
         <developerConnection>scm:git:git@github.com:opensearch-project/security.git</developerConnection>
-        <tag>1.2.3.0</tag>
+        <tag>1.2.4.0</tag>
     </scm>
 
     <repositories>

From 076b2e3a361c5705ca7ca005bf94a366bda935b7 Mon Sep 17 00:00:00 2001
From: Dave Lago <davelago@amazon.com>
Date: Wed, 5 Jan 2022 07:18:51 -0500
Subject: [PATCH 2/2] Fix to prevent timeouts in GitHub actions (#1554)
 Cherry-pick from 07be53e

Signed-off-by: Dave Lago <davelago@amazon.com>
---
 .github/workflows/cd.yml | 3 +++
 .github/workflows/ci.yml | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 42d3b6b519..486eea6a27 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -5,6 +5,9 @@ on:
     tags:
       - '*'
 
+env:
+  MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.class=standard -Dmaven.wagon.http.retryHandler.count=3
+
 jobs:
   build:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b6a308d9ca..4c033d7802 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,6 +9,9 @@ on:
       - main
       - opendistro-*
 
+env:
+  MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.class=standard -Dmaven.wagon.http.retryHandler.count=3
+
 jobs:
   build:
     name: build