This is an automated email from the ASF dual-hosted git repository. sardell pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/metron.git
View the commit online: https://github.com/apache/metron/commit/650c6cb39ae089c9bd8d8b039cd6a67140dbf085 The following commit(s) were added to refs/heads/master by this push: new 650c6cb METRON-2304 Update node and npm version to LTS releases (sardell) closes apache/metron#1550 650c6cb is described below commit 650c6cb39ae089c9bd8d8b039cd6a67140dbf085 Author: sardell <shane.m.ard...@gmail.com> AuthorDate: Wed Nov 20 08:46:00 2019 -0600 METRON-2304 Update node and npm version to LTS releases (sardell) closes apache/metron#1550 --- .../ansible/roles/ambari_common/tasks/nodejs-CentOS-6.yml | 2 +- .../ansible/roles/ambari_common/tasks/nodejs-CentOS-7.yml | 2 +- .../ansible/roles/ambari_common/tasks/nodejs-Ubuntu-14.yml | 2 +- metron-deployment/packaging/docker/ansible-docker/Dockerfile | 2 +- metron-deployment/packaging/docker/deb-docker/Dockerfile | 2 +- metron-deployment/packaging/docker/rpm-docker/Dockerfile | 2 +- metron-deployment/packaging/docker/rpm-docker/SPECS/metron.spec | 3 +++ metron-interface/metron-alerts/.nvmrc | 2 +- metron-interface/metron-alerts/pom.xml | 4 ++-- metron-interface/metron-config/.nvmrc | 1 + metron-interface/metron-config/pom.xml | 4 ++-- 11 files changed, 15 insertions(+), 11 deletions(-) diff --git a/metron-deployment/ansible/roles/ambari_common/tasks/nodejs-CentOS-6.yml b/metron-deployment/ansible/roles/ambari_common/tasks/nodejs-CentOS-6.yml index 8ea7363..f573cd5 100644 --- a/metron-deployment/ansible/roles/ambari_common/tasks/nodejs-CentOS-6.yml +++ b/metron-deployment/ansible/roles/ambari_common/tasks/nodejs-CentOS-6.yml @@ -16,7 +16,7 @@ # --- - name: Install Node.js repo on CentOS 6 - shell: curl -sL https://rpm.nodesource.com/setup_6.x | bash - + shell: curl -sL https://rpm.nodesource.com/setup_10.x | bash - args: warn: false become: true diff --git a/metron-deployment/ansible/roles/ambari_common/tasks/nodejs-CentOS-7.yml b/metron-deployment/ansible/roles/ambari_common/tasks/nodejs-CentOS-7.yml index b2a2cc0..48cdf5e 100644 --- a/metron-deployment/ansible/roles/ambari_common/tasks/nodejs-CentOS-7.yml +++ b/metron-deployment/ansible/roles/ambari_common/tasks/nodejs-CentOS-7.yml @@ -16,7 +16,7 @@ # --- - name: Install Node.js repo on CentOS 7 - shell: curl -sL https://rpm.nodesource.com/setup_7.x | bash - + shell: curl -sL https://rpm.nodesource.com/setup_10.x | bash - args: warn: false become: true diff --git a/metron-deployment/ansible/roles/ambari_common/tasks/nodejs-Ubuntu-14.yml b/metron-deployment/ansible/roles/ambari_common/tasks/nodejs-Ubuntu-14.yml index 2bfdecd..8a7c683 100644 --- a/metron-deployment/ansible/roles/ambari_common/tasks/nodejs-Ubuntu-14.yml +++ b/metron-deployment/ansible/roles/ambari_common/tasks/nodejs-Ubuntu-14.yml @@ -16,7 +16,7 @@ # --- - name: Install Node.js repo on Ubuntu 14 - shell: curl -sL https://deb.nodesource.com/setup_6.x | bash - + shell: curl -sL https://deb.nodesource.com/setup_10.x | bash - args: warn: false become: true diff --git a/metron-deployment/packaging/docker/ansible-docker/Dockerfile b/metron-deployment/packaging/docker/ansible-docker/Dockerfile index df3aeb5..1252b37 100644 --- a/metron-deployment/packaging/docker/ansible-docker/Dockerfile +++ b/metron-deployment/packaging/docker/ansible-docker/Dockerfile @@ -85,7 +85,7 @@ RUN yum install -y \ && touch /root/.bashrc \ && echo '/opt/rh/devtoolset-4/enable' >> /root/.bashrc \ # install node so that the node dependencies can be packaged into the RPMs \ - && curl --silent --location https://rpm.nodesource.com/setup_6.x | bash - \ + && curl --silent --location https://rpm.nodesource.com/setup_10.x | bash - \ && yum install -y \ nodejs \ # Remove packages just needed for builds \ diff --git a/metron-deployment/packaging/docker/deb-docker/Dockerfile b/metron-deployment/packaging/docker/deb-docker/Dockerfile index 5169efc..a19f15f 100644 --- a/metron-deployment/packaging/docker/deb-docker/Dockerfile +++ b/metron-deployment/packaging/docker/deb-docker/Dockerfile @@ -26,7 +26,7 @@ RUN apt-get update \ dpkg-dev \ gettext \ # install nodejs so that the node dependencies can be packaged into the DEBs \ - && curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash - \ + && curl -sL https://deb.nodesource.com/setup_10.x | sudo -E bash - \ && apt-get install -y \ nodejs \ && apt-get clean diff --git a/metron-deployment/packaging/docker/rpm-docker/Dockerfile b/metron-deployment/packaging/docker/rpm-docker/Dockerfile index f151678..9291278 100644 --- a/metron-deployment/packaging/docker/rpm-docker/Dockerfile +++ b/metron-deployment/packaging/docker/rpm-docker/Dockerfile @@ -39,7 +39,7 @@ RUN yum install -y \ rpmlint \ # install node so that the node dependencies can be packaged into the RPMs \ && cd /root \ - && curl --silent --location https://rpm.nodesource.com/setup_6.x | bash - \ + && curl --silent --location https://rpm.nodesource.com/setup_10.x | bash - \ && yum install -y \ gcc-c++ \ make \ diff --git a/metron-deployment/packaging/docker/rpm-docker/SPECS/metron.spec b/metron-deployment/packaging/docker/rpm-docker/SPECS/metron.spec index e4b99ca..4d1b69a 100644 --- a/metron-deployment/packaging/docker/rpm-docker/SPECS/metron.spec +++ b/metron-deployment/packaging/docker/rpm-docker/SPECS/metron.spec @@ -577,6 +577,7 @@ This package installs the Metron Management UI %{metron_home} %attr(0755,root,root) %{metron_home}/web/expressjs/node_modules/.bin/* %attr(0755,root,root) %{metron_home}/web/expressjs/server.js %attr(0644,root,root) %{metron_home}/web/expressjs/package.json +%attr(0644,root,root) %{metron_home}/web/expressjs/package-lock.json %attr(0644,root,root) %{metron_home}/web/management-ui/styles.*.css %attr(0644,root,root) %{metron_home}/web/management-ui/favicon.ico %attr(0644,root,root) %{metron_home}/web/management-ui/index.html @@ -745,6 +746,8 @@ chkconfig --del metron-management-ui chkconfig --del metron-alerts-ui %changelog +* Tue Nov 19 2019 Shane Ardell <shane.m.ard...@gmail.com> - 0.7.2 +- Update metron spec to include package-lock.json file introduced by npm version update * Mon Apr 8 2019 Apache Metron <d...@metron.apache.og> - 0.7.1 - Updat metron SPEC to include metron-hbase-server for enrichment coprocessor * Tue Mar 12 2019 Apache Metron <d...@metron.apache.og> - 0.7.1 diff --git a/metron-interface/metron-alerts/.nvmrc b/metron-interface/metron-alerts/.nvmrc index 0a7b8bc..c095bf0 100644 --- a/metron-interface/metron-alerts/.nvmrc +++ b/metron-interface/metron-alerts/.nvmrc @@ -1 +1 @@ -v9.11.1 +v10.17.0 diff --git a/metron-interface/metron-alerts/pom.xml b/metron-interface/metron-alerts/pom.xml index beeb0f3..7fc7278 100644 --- a/metron-interface/metron-alerts/pom.xml +++ b/metron-interface/metron-alerts/pom.xml @@ -25,8 +25,8 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <node.version>v9.11.1</node.version> - <npm.version>6.2.0</npm.version> + <node.version>v10.17.0</node.version> + <npm.version>6.11.3</npm.version> </properties> <dependencies> </dependencies> diff --git a/metron-interface/metron-config/.nvmrc b/metron-interface/metron-config/.nvmrc new file mode 100644 index 0000000..c306181 --- /dev/null +++ b/metron-interface/metron-config/.nvmrc @@ -0,0 +1 @@ +v10.17.0 \ No newline at end of file diff --git a/metron-interface/metron-config/pom.xml b/metron-interface/metron-config/pom.xml index e2f9f10..e167e5f 100644 --- a/metron-interface/metron-config/pom.xml +++ b/metron-interface/metron-config/pom.xml @@ -25,8 +25,8 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <node.version>v9.11.1</node.version> - <npm.version>6.2.0</npm.version> + <node.version>v10.17.0</node.version> + <npm.version>6.11.3</npm.version> </properties> <dependencies> </dependencies>
