G2-1562 Update tests & java version

g2forge · Apr 29, 2024 · 883dfa0 · 883dfa0
1 parent 9c28f73
commit 883dfa0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/gb-github/src/main/java/com/g2forge/gearbox/github/actions/HGHActions.java b/gb-github/src/main/java/com/g2forge/gearbox/github/actions/HGHActions.java
@@ -45,7 +45,7 @@ public static GHActionWorkflow createMavenWorkflow(String name, String branch, S
 			build.step(checkout.build());
 		}
 
-		final String JAVA_VERSION = "11";
+		final String JAVA_VERSION = "17";
 		build.step(GHActionStep.builder().uses("actions/setup-java@v3").with("distribution", "adopt").with("java-version", JAVA_VERSION).with("cache", "maven").build());
 
 		{

diff --git a/gb-github/src/test/java/com/g2forge/gearbox/github/actions/maven-simple.yaml b/gb-github/src/test/java/com/g2forge/gearbox/github/actions/maven-simple.yaml
@@ -2,24 +2,24 @@ name: Java CI with Maven
 "on":
   push:
     branches:
-    - master
+    - main
   pull_request:
     branches:
-    - master
+    - main
   workflow_dispatch: {}
 jobs:
   build:
     runs-on: ubuntu-latest
     concurrency: "${{ github.workflow }}-${{ github.ref }}"
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
-    - uses: actions/setup-java@v2
+      uses: actions/checkout@v4
+    - uses: actions/setup-java@v3
       with:
         distribution: adopt
-        java-version: 11
+        java-version: 17
         cache: maven
     - name: Build
-      run: "mvn -B ${{ (((github.event_name == 'push') || (github.event_name == 'workflow_dispatch')) && (github.ref == 'refs/heads/master')) && 'deploy' || 'package' }} --file pom.xml -Prelease,release-snapshot"
+      run: "mvn -B ${{ (((github.event_name == 'push') || (github.event_name == 'workflow_dispatch')) && (github.ref == 'refs/heads/main')) && 'deploy' || 'package' }} --file pom.xml -Prelease,release-snapshot"
       env:
         GITHUB_TOKEN: "${{ github.token }}"