diff --git a/app-misc/opendistro-kibana-plugin/opendistro-kibana-plugin-0.7.0.1.ebuild b/app-misc/opendistro-kibana-plugin/opendistro-kibana-plugin-0.7.0.1.ebuild index 7fa596b..34a041a 100644 --- a/app-misc/opendistro-kibana-plugin/opendistro-kibana-plugin-0.7.0.1.ebuild +++ b/app-misc/opendistro-kibana-plugin/opendistro-kibana-plugin-0.7.0.1.ebuild @@ -13,7 +13,6 @@ EGIT_COMMIT="8cd6706af63c4959bba4ea6631d889488daded06" SECURITY_PARENT_REPO="https://github.com/rbkmoney/opendistro-security-parent" SECURITY_PARENT_COMMIT="b3ddd5c012904f00c8765194790fb4558ca8da36" -KIBANA_VERSION="6.6.1" PLUGIN_NAME="opendistro_security_kibana_plugin-${PV}-rbkmoney" INSTALL_PATH="/usr/share/elasticsearch/plugins_archive/" @@ -21,10 +20,9 @@ LICENSE="MIT" SLOT="0" KEYWORDS="~amd64" -RDEPEND="dev-libs/openssl:0 - >=virtual/jdk-1.8:*" -DEPEND="${RDEPEND} - =net-libs/nodejs-10.15.2 +RDEPEND="" +DEPEND=">=virtual/jdk-1.8:* + =net-libs/nodejs-10.15.2 dev-java/maven-bin" mvn_install_dep() { @@ -43,29 +41,18 @@ src_install() { mkdir -p "${WORKDIR}"/.m2/repository # Load and install deps mvn_install_dep ${SECURITY_PARENT_REPO} ${SECURITY_PARENT_COMMIT} - # Build plugin - ./clean.sh - - # Download kibana - mkdir -p build_stage/kibana - cd build_stage/kibana - git init - git remote add origin https://github.com/elastic/kibana - git fetch - git checkout "tags/v${KIBANA_VERSION}" || die - - # Install node modules - cd ${S} - npm install || die - PLUGIN_DEST="build/kibana/${PLUGIN_NAME}" - mkdir -p "${PLUGIN_DEST}" - cp -a "index.js" "${PLUGIN_DEST}" - cp -a "package.json" "${PLUGIN_DEST}" - cp -a "lib" "${PLUGIN_DEST}" - cp -a "node_modules" "${PLUGIN_DEST}" - cp -a "public" "${PLUGIN_DEST}" - - # Package plugin + ./clean.sh + # Install node modules + cd ${S} + npm install || die + PLUGIN_DEST="build/kibana/${PLUGIN_NAME}" + mkdir -p "${PLUGIN_DEST}" + cp -a "index.js" "${PLUGIN_DEST}" + cp -a "package.json" "${PLUGIN_DEST}" + cp -a "lib" "${PLUGIN_DEST}" + cp -a "node_modules" "${PLUGIN_DEST}" + cp -a "public" "${PLUGIN_DEST}" + # Package plugin mvn clean install -Dmaven.repo.local="${WORKDIR}"/.m2/repository || die insinto ${INSTALL_PATH} doins target/releases/${PLUGIN_NAME}.zip