Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ jobs:
uses: actions/setup-node@v5
with:
node-version-file: 'zeppelin-web-angular/.nvmrc'

- name: Set up npm
run: npm install --global npm@11.21.1
# TODO: Add zeppelin-web-angular root audit after Angular version upgrade and stabilization
- name: Run npm audit on zeppelin-react
working-directory: zeppelin-web-angular/projects/zeppelin-react
Expand Down
14 changes: 14 additions & 0 deletions .github/workflows/npm-audit-remediation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ on:
pull_request:
paths:
- '.github/workflows/npm-audit-remediation.yml'
- 'zeppelin-web-angular/.nvmrc'
- 'zeppelin-web-angular/pom.xml'
- 'zeppelin-web-angular/projects/zeppelin-react/audit-ci.jsonc'
- 'zeppelin-web-angular/projects/zeppelin-react/patches/**'
- 'zeppelin-web-angular/projects/zeppelin-react/scripts/check-braces-patch.cjs'
Expand Down Expand Up @@ -66,6 +68,9 @@ jobs:
with:
node-version-file: 'zeppelin-web-angular/.nvmrc'

- name: Set up npm
run: npm install --global npm@11.21.1

- name: Install and verify patched dependencies
working-directory: ${{ env.PACKAGE_DIRECTORY }}
run: |
Expand Down Expand Up @@ -180,6 +185,15 @@ jobs:
path: ${{ runner.temp }}/npm-audit-remediation
retention-days: 1

- name: Upload npm failure logs
if: failure()
uses: actions/upload-artifact@v6
with:
name: npm-audit-failure-logs
path: ~/.npm/_logs/*.log
if-no-files-found: ignore
retention-days: 3

publish:
needs: prepare
if: >-
Expand Down
2 changes: 1 addition & 1 deletion docs/setup/deployment/virtual_machine.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ itself, not in the Vagrant scripts.
</tr>
<tr>
<td>Node.js / npm</td>
<td>22.21.1 / 10.9.4</td>
<td>22.23.4 / 11.21.1</td>
<td><code>node.version</code> / <code>npm.version</code> in <code>zeppelin-web-angular/pom.xml</code></td>
</tr>
</table>
Expand Down
2 changes: 1 addition & 1 deletion scripts/vagrant/zeppelin-dev/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ not here.
| --- | --- | --- |
| OpenJDK / Oracle JDK | 11 | `java.version` in the root `pom.xml` |
| Maven | 3.6.3 or higher | `maven.version` in the root `pom.xml` |
| Node.js / npm | 22.21.1 / 10.9.4 | `node.version` / `npm.version` in `zeppelin-web-angular/pom.xml` |
| Node.js / npm | 22.23.4 / 11.21.1 | `node.version` / `npm.version` in `zeppelin-web-angular/pom.xml` |

Only the JDK has to be installed by hand. `./mvnw` downloads Maven, and
`frontend-maven-plugin` downloads the pinned Node.js and npm into each web
Expand Down
2 changes: 1 addition & 1 deletion zeppelin-web-angular/.nvmrc
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

22.21.1
22.23.4
4 changes: 2 additions & 2 deletions zeppelin-web-angular/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ Zeppelin notebooks front-end built with Angular.

### Prerequisites

- [Node.js](https://nodejs.org) 22.21.1 or use [creationix/nvm](https://github.com/creationix/nvm).
- NPM package manager (which is installed with Node.js by default).
- [Node.js](https://nodejs.org) 22.23.4 or use [creationix/nvm](https://github.com/creationix/nvm).
- npm 11.21.1 (`npm install --global npm@11.21.1` after selecting Node.js).
- [Angular CLI](https://angular.io/cli) version 8.3.0 or later.

### Install
Expand Down
4 changes: 2 additions & 2 deletions zeppelin-web-angular/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
<!--plugin versions-->
<plugin.frontend.nodeDownloadRoot>https://nodejs.org/dist/</plugin.frontend.nodeDownloadRoot>
<plugin.frontend.npmDownloadRoot>https://registry.npmjs.org/npm/-/</plugin.frontend.npmDownloadRoot>
<node.version>v22.21.1</node.version>
<npm.version>10.9.4</npm.version>
<node.version>v22.23.4</node.version>
<npm.version>11.21.1</npm.version>
</properties>

<dependencies>
Expand Down
Loading
Loading