[arch-commits] Commit in opensearch/trunk (2 files)

[Justin Kromlinger]

    Date: Thursday, September 1, 2022 @ 20:55:32
  Author: hashworks
Revision: 1290423

upgpkg: opensearch 2.2.1-1

Modified:
  opensearch/trunk/PKGBUILD
Deleted:
  opensearch/trunk/remove-systemd-distribution-check.patch

-----------------------------------------+
 PKGBUILD                                |   16 ++++++----------
 remove-systemd-distribution-check.patch |   17 -----------------
 2 files changed, 6 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-09-01 20:53:18 UTC (rev 1290422)
+++ PKGBUILD	2022-09-01 20:55:32 UTC (rev 1290423)
@@ -27,7 +27,7 @@
   opensearch-store-smb-plugin
   opensearch-transport-nio-plugin
 )
-pkgver=2.1.0
+pkgver=2.2.1
 pkgrel=1
 # See https://github.com/opensearch-project/OpenSearch/blob/main/.ci/java-versions.properties
 _jrever=11
@@ -46,9 +46,8 @@
   opensearch-user.conf
   opensearch-tmpfile.conf
   opensearch.default
-  remove-systemd-distribution-check.patch
 )
-sha256sums=('608f3de99bb98b570e19c565bde908e1fce074c3a6bd354da15c857348f00278'
+sha256sums=('17899f43b2c40a2c28c94a1e7884f0768bc89620376748bf7388f1fdc68d636c'
             'b59d064ce8e348f22b969cc2b7522a1c7b64d4b4e3fd98d9ad1f01d842e94d46'
             '02bfe1e723f6522d7b5bf72d43c7847c4d9329d105b543583aa5b9c952e7d54d'
             '097de1fc6ef1f12e99d2b3def9c9803cf0dd8609aeace608048d599a2cb85c5c'
@@ -56,14 +55,8 @@
             'b3feb1e9c7e7ce6b33cea6c727728ed700332aae942ca475c3bcc1d56b9f113c'
             '79cb5856b7105da7f25c6da2a25be88ccba2b849fd92cc32c3204e2fad530efc'
             '12c4feb01c5c42e98e53f9d6fd457727ec0bf0b19bf9c4bc2ee216f31afe7afc'
-            '66401172f710e80e1f715c89bc6ed5a6d0ad567c58ad03101e59556c52245158'
-            '0d158e9fc2ac6375ae9c140eb79e0308794c1a0220d3634a2b98e94b37b6f8dc')
+            '66401172f710e80e1f715c89bc6ed5a6d0ad567c58ad03101e59556c52245158')
 
-prepare() {
-  cd "OpenSearch-${pkgver}"
-  patch -Np1 -i "${srcdir}/remove-systemd-distribution-check.patch"
-}
-
 build() {
   cd "OpenSearch-${pkgver}"
   export JAVA_HOME="/usr/lib/jvm/java-${_jdkver}-openjdk"
@@ -131,6 +124,9 @@
     'opensearch-anomaly-detection-plugin'
     'opensearch-asynchronous-search-plugin'
     'opensearch-cross-cluster-replication-plugin'
+    'opensearch-geospatial-plugin'
+    'opensearch-ml-commons-plugin'
+    'opensearch-notifications-plugin'
     'opensearch-index-management-plugin'
     'opensearch-job-scheduler-plugin'
     'opensearch-knn-plugin'

Deleted: remove-systemd-distribution-check.patch
===================================================================
--- remove-systemd-distribution-check.patch	2022-09-01 20:53:18 UTC (rev 1290422)
+++ remove-systemd-distribution-check.patch	2022-09-01 20:55:32 UTC (rev 1290423)
@@ -1,17 +0,0 @@
-diff --git a/modules/systemd/src/main/java/org/opensearch/systemd/SystemdPlugin.java b/modules/systemd/src/main/java/org/opensearch/systemd/SystemdPlugin.java
-index 40cc219cbb4..5b89f469da7 100644
---- a/modules/systemd/src/main/java/org/opensearch/systemd/SystemdPlugin.java
-+++ b/modules/systemd/src/main/java/org/opensearch/systemd/SystemdPlugin.java
-@@ -59,11 +59,7 @@ public class SystemdPlugin extends Plugin implements ClusterPlugin {
-     }
- 
-     SystemdPlugin(final boolean assertIsPackageDistribution, final Build.Type buildType, final String esSDNotify) {
--        final boolean isPackageDistribution = buildType == Build.Type.DEB || buildType == Build.Type.RPM;
--        if (assertIsPackageDistribution) {
--            // our build is configured to only include this module in the package distributions
--            assert isPackageDistribution : buildType;
--        }
-+        final boolean isPackageDistribution = true;
-         if (isPackageDistribution == false) {
-             logger.debug("disabling sd_notify as the build type [{}] is not a package distribution", buildType);
-             enabled = false;