2.6.3 develop to master merge

.github/workflows/build-on-pull-request.yml

@@ -0,0 +1,32 @@
+name: Build On Pull Request
+on:
+  pull_request:
+    branches: [ "master","develop" ]
+
+jobs:
+  Build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.ref }}
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
+
+      - name: Set up Java
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'adopt'
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: 16
+
+      - name: Build with NPM
+        run: |
+          npm config set legacy-peer-deps true
+          npm install -g @angular/cli
+          npm install --force
+          npm run build

.github/workflows/package-prod → .github/workflows/package-prod.yml

@@ -35,11 +35,8 @@ jobs:
       run: |
             npm config set legacy-peer-deps true
             npm install -g @angular/cli
-            npm install -g grunt-cli
-            npm install [email protected] --save-dev
-            npm install [email protected]
-            npm install node-sass --force
             npm install --force
+            npm run build
 
 
     - name: Create WAR file

.github/workflows/package.yml

@@ -22,7 +22,7 @@ jobs:
     - name: Set up Java
       uses: actions/setup-java@v3
       with:
-          java-version: '8'
+          java-version: '17'
           distribution: 'adopt'
 
 
@@ -31,16 +31,12 @@ jobs:
       with:
           node-version: 16
 
-    - name: Build with NPM and Maven
+    - name: Build with NPM
       run: |
             npm config set legacy-peer-deps true
             npm install -g @angular/cli
-            npm install [email protected] --save-dev
-            npm install [email protected]
-            npm install node-sass
             npm install --force
             npm run build
-            mvn clean install
 
     - name: Create WAR file
       run: mvn -B package --file pom.xml

.java-version

@@ -1 +1 @@
-1.8
+17.0

.nvmrc

@@ -1 +1 @@
-v8.9.0
+v16

.python-version

@@ -0,0 +1 @@
+2.7.18