Upgrade to java21

OpenConext · Oct 28, 2024 · 8e4b4a7 · 8e4b4a7
1 parent 8a28277
commit 8e4b4a7
Show file tree

Hide file tree

Showing 10 changed files with 3,359 additions and 2,046 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -21,7 +21,7 @@ jobs:
           node-version: '8'
       - uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 21
           distribution: "temurin"
           server-id: openconext-releases
           server-username: MAVEN_USERNAME
@@ -50,21 +50,21 @@ jobs:
           exit 1
         if: github.event_name != 'workflow_dispatch' && steps.versioncheck.outputs.version != github.ref_name
 
-      - name: Set up JDK 11 for snapshots
+      - name: Set up JDK 21 for snapshots
         uses: actions/setup-java@v4
         with:
-          java-version: "11"
+          java-version: "21"
           distribution: "temurin"
           cache: "maven"
           server-id: openconext-snapshots
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD
         if: ( endsWith(steps.versioncheck.outputs.version, '-SNAPSHOT'))
 
-      - name: Set up JDK 11 for releases
+      - name: Set up JDK 21 for releases
         uses: actions/setup-java@v4
         with:
-          java-version: "11"
+          java-version: "21"
           distribution: "temurin"
           cache: "maven"
           server-id: openconext-releases

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -5,9 +5,9 @@ name: CI Github
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   build:
@@ -23,7 +23,7 @@ jobs:
 
     - uses: actions/setup-java@v2
       with:
-        java-version: '11'
+        java-version: '21'
         distribution: 'adopt'
         cache: 'maven'
 

diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ OpenConext Attribute Aggregation
 
 ### [System Requirements](#system-requirements)
 
-- Java 11
+- Java 21
 - Maven 3
 - MySQL 5.5
 - npm

diff --git a/aa-gui/build.sh b/aa-gui/build.sh
@@ -2,4 +2,6 @@
 rm -Rf dist/*
 rm -Rf target/*
 #yarn install && yarn lint && yarn test && yarn run webpack
+source $NVM_DIR/nvm.sh
+nvm use
 npm install && npm run webpack
diff --git a/aa-gui/package-lock.json b/aa-gui/package-lock.json
diff --git a/aa-gui/pom.xml b/aa-gui/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.openconext</groupId>
         <artifactId>attribute-aggregation</artifactId>
-        <version>3.2.0</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,7 @@ OpenConext Attribute Aggregation @@
     ### [System Requirements](#system-requirements)
-    - Java 11
+    - Java 21
     - Maven 3
     - MySQL 5.5
     - npm
@@ Expand Down @@