(nifi) branch support/nifi-1.x updated: NIFI-13137 - Switch to Zulu for MacOS Java 8 action This closes #8739.

2024-05-04 Thread joewitt
This is an automated email from the ASF dual-hosted git repository.

joewitt pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
 new 5adc0d8cb8 NIFI-13137 - Switch to Zulu for MacOS Java 8 action This 
closes #8739.
5adc0d8cb8 is described below

commit 5adc0d8cb834206e09138d1310c303bdfa985df0
Author: Pierre Villard 
AuthorDate: Fri May 3 16:56:07 2024 +0200

NIFI-13137 - Switch to Zulu for MacOS Java 8 action
This closes #8739.

Signed-off-by: Joseph Witt 
---
 .github/workflows/ci-workflow.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci-workflow.yml 
b/.github/workflows/ci-workflow.yml
index fd23fef6c1..bb258143ea 100644
--- a/.github/workflows/ci-workflow.yml
+++ b/.github/workflows/ci-workflow.yml
@@ -241,7 +241,7 @@ jobs:
   macos-build-jp:
 timeout-minutes: 150
 runs-on: macos-latest
-name: MacOS Temurin JDK 8 JP
+name: MacOS Zulu JDK 8 JP
 steps:
   - name: System Information
 run: |
@@ -261,7 +261,7 @@ jobs:
   - name: Set up Java 8
 uses: actions/setup-java@v3
 with:
-  distribution: 'temurin'
+  distribution: 'zulu'
   java-version: '8'
   cache: 'maven'
   - name: Maven Compile



(nifi) branch main updated: [NIFI-12802] - Update to use node 22 (#8744)

2024-05-04 Thread scottyaslan
This is an automated email from the ASF dual-hosted git repository.

scottyaslan pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/main by this push:
 new d5bfec7d7f [NIFI-12802] - Update to use node 22 (#8744)
d5bfec7d7f is described below

commit d5bfec7d7f35c42cc768a1ea002755d16a428c35
Author: Rob Fellows 
AuthorDate: Sat May 4 11:15:10 2024 -0400

[NIFI-12802] - Update to use node 22 (#8744)

This closes #8744
---
 .../nifi-web/nifi-web-frontend/src/main/nifi/package-lock.json  | 2 +-
 .../nifi-web/nifi-web-frontend/src/main/nifi/package.json   | 2 +-
 pom.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/package-lock.json
 
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/package-lock.json
index e31a230267..aafec9ba43 100644
--- 
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/package-lock.json
+++ 
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/package-lock.json
@@ -72,7 +72,7 @@
 "typescript": "5.3.3"
 },
 "engines": {
-"node": ">=21.0.0"
+"node": ">=22.0.0"
 }
 },
 "node_modules/@aashutoshrathi/word-wrap": {
diff --git 
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/package.json
 
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/package.json
index 7c9cd256b2..bf22014d5f 100644
--- 
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/package.json
+++ 
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/package.json
@@ -80,6 +80,6 @@
 "typescript": "5.3.3"
 },
 "engines": {
-"node": ">=21.0.0"
+"node": ">=22.0.0"
 }
 }
diff --git a/pom.xml b/pom.xml
index fb6e76095a..9bbb03bcd1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,7 +103,7 @@
 
bellsoft/liberica-openjdk-debian
 
bellsoft/liberica-openjre-debian
 21
-v21.6.1
+v22.1.0
 1.14.2
 1.5.1
 
1706227889