git: bb6241a540cc - main - textproc/opensearch-*: Update to 2.4.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Jose Alonso Cardenas Marquez <acm_at_FreeBSD.org>
Date: Wed, 07 Dec 2022 00:10:43 UTC
The branch main has been updated by acm:

URL: https://cgit.FreeBSD.org/ports/commit/?id=bb6241a540ccc51efacabe77acc2f093778d38c4

commit bb6241a540ccc51efacabe77acc2f093778d38c4
Author:     Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
AuthorDate: 2022-12-07 00:04:41 +0000
Commit:     Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
CommitDate: 2022-12-07 00:10:34 +0000

    textproc/opensearch-*: Update to 2.4.0
    
    ChangeLog at:   https://github.com/opensearch-project/opensearch-build/blob/main/release-notes/opensearch-release-notes-2.4.0.md
    PR:             266456 266521
    Reported by:    Sven Ruediger <admin@ _at_ hackacad.net>
---
 textproc/opensearch-dashboards/Makefile  |  4 +++-
 textproc/opensearch-dashboards/distinfo  |  6 +++---
 textproc/opensearch/Makefile             | 12 +++++++-----
 textproc/opensearch/distinfo             |  6 +++---
 textproc/opensearch/files/pkg-message.in |  2 ++
 5 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/textproc/opensearch-dashboards/Makefile b/textproc/opensearch-dashboards/Makefile
index 32d69a9e3bf6..1a6489a29b3a 100644
--- a/textproc/opensearch-dashboards/Makefile
+++ b/textproc/opensearch-dashboards/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	opensearch-dashboards
-DISTVERSION=	2.2.1
+DISTVERSION=	2.4.0
 DISTVERSIONSUFFIX=	-linux-x64
 CATEGORIES=	textproc www
 MASTER_SITES=	https://artifacts.opensearch.org/releases/bundle/${PORTNAME}/${DISTVERSION}/
@@ -13,6 +13,8 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	npm-node14>0:www/npm-node14
 
+CONFLICTS=	opensearch-dashboard13
+
 USES=		nodejs:14,build,run python:build
 USE_RC_SUBR=	${PORTNAME}
 
diff --git a/textproc/opensearch-dashboards/distinfo b/textproc/opensearch-dashboards/distinfo
index 61dfe3017819..d902b030c0ad 100644
--- a/textproc/opensearch-dashboards/distinfo
+++ b/textproc/opensearch-dashboards/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1662757519
-SHA256 (opensearch-dashboards-2.2.1-linux-x64.tar.gz) = bc1883b2a8bea2b89b26643e7994cfbb5ab56e4ad509ca1293f909a3c0034bc7
-SIZE (opensearch-dashboards-2.2.1-linux-x64.tar.gz) = 233276106
+TIMESTAMP = 1670264361
+SHA256 (opensearch-dashboards-2.4.0-linux-x64.tar.gz) = d4e73f4e4cb37b8c6cc3a6798622dc0d3967f65ab14852e7adf18f49be988e90
+SIZE (opensearch-dashboards-2.4.0-linux-x64.tar.gz) = 297224081
diff --git a/textproc/opensearch/Makefile b/textproc/opensearch/Makefile
index 37a0f6d585ea..33af45ab31f4 100644
--- a/textproc/opensearch/Makefile
+++ b/textproc/opensearch/Makefile
@@ -1,8 +1,8 @@
 PORTNAME=	opensearch
-DISTVERSION=	2.2.1
+DISTVERSION=	2.4.0
 DISTVERSIONSUFFIX=	-linux-x64
 CATEGORIES=	textproc java devel
-MASTER_SITES=	https://artifacts.opensearch.org/releases/bundle/${PORTNAME}/${PORTVERSION}/
+MASTER_SITES=	https://artifacts.opensearch.org/releases/bundle/${PORTNAME}/${DISTVERSION}/
 
 MAINTAINER=	opensearch@FreeBSD.org
 COMMENT=	Full-text search engine for Java
@@ -14,6 +14,8 @@ BUILD_DEPENDS=	jna>0:devel/jna
 RUN_DEPENDS=	bash>0:shells/bash \
 		jna>0:devel/jna
 
+CONFLICTS=	opensearch13
+
 USES=		cpe shebangfix
 USE_JAVA=	yes
 JAVA_VERSION=	11+
@@ -38,7 +40,7 @@ OPTIONS_DEFAULT=PLUGINS
 
 CONFIG_FILES=	opensearch.yml jvm.options log4j2.properties
 
-PLUGINS_CONFIG_FILES= \
+PLUGINS_CONFIG_FILES?= \
 		opensearch-notifications-core/notifications-core.yml \
 		opensearch-notifications/notifications.yml \
 		opensearch-observability/observability.yml \
@@ -48,8 +50,8 @@ PLUGINS_CONFIG_FILES= \
 		opensearch-performance-analyzer/performance-analyzer.properties \
 		opensearch-performance-analyzer/plugin-stats-metadata \
 		opensearch-performance-analyzer/rca.conf \
-		opensearch-performance-analyzer/rca_idle_master.conf \
-		opensearch-performance-analyzer/rca_master.conf \
+		opensearch-performance-analyzer/rca_idle_cluster_manager.conf \
+		opensearch-performance-analyzer/rca_cluster_manager.conf \
 		opensearch-performance-analyzer/supervisord.conf \
 		opensearch-reports-scheduler/reports-scheduler.yml \
 		opensearch-security/action_groups.yml \
diff --git a/textproc/opensearch/distinfo b/textproc/opensearch/distinfo
index c97287bf5e67..ea1c74162e67 100644
--- a/textproc/opensearch/distinfo
+++ b/textproc/opensearch/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1662757415
-SHA256 (opensearch-2.2.1-linux-x64.tar.gz) = 259526b62b099f0bc3b8c5723c53332a5127cdace60c89ea1404daed916f7207
-SIZE (opensearch-2.2.1-linux-x64.tar.gz) = 450838944
+TIMESTAMP = 1670264313
+SHA256 (opensearch-2.4.0-linux-x64.tar.gz) = 82bee5f68ea3d74a7d835d35f1479509b8497d01c1ae758a4737f5ea799e38e8
+SIZE (opensearch-2.4.0-linux-x64.tar.gz) = 556689176
diff --git a/textproc/opensearch/files/pkg-message.in b/textproc/opensearch/files/pkg-message.in
index 57362436aa11..c08de567504c 100644
--- a/textproc/opensearch/files/pkg-message.in
+++ b/textproc/opensearch/files/pkg-message.in
@@ -1,6 +1,8 @@
 [
 { type: install
   message: <<EOM
+Opensearch was installed
+
 Please see %%ETCDIR%% for a sample version of
 opensearch.yml.