Merge pull request #44 from mojohaus/#43_java17

[#43] Java 17 requires keyalg argument for generateKeyPair.
mojohaus · Apr 24, 2022 · d85a288 · d85a288
2 parents b30bc4a + da7da05
commit d85a288
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -43,7 +43,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macOS-latest, windows-latest]
-        java: [8, 11] # build fails for 17
+        java: [8, 11, 17]
         # switch to semeru after: https://github.com/actions/setup-java/pull/289
         jdk: [temurin, zulu, adopt-openj9]
         exclude:
@@ -52,8 +52,8 @@ jobs:
             java: 11
             jdk: temurin
           # not ready yet, only as semeru
-          # - java: 17
-          #   jdk: adopt-openj9
+          - java: 17
+            jdk: adopt-openj9
       fail-fast: false
 
     runs-on: ${{ matrix.os }}

diff --git a/keytool-maven-plugin/src/it/MKEYTOOL-10/pom.xml b/keytool-maven-plugin/src/it/MKEYTOOL-10/pom.xml
@@ -44,6 +44,7 @@
           <dname>cn=Test Development, ou=Development,
             L=Herzele, ST=VL, o=FrankCornelis, c=BE
           </dname>
+          <keyalg>ec</keyalg>
           <keypass>secret</keypass>
           <storepass>secret</storepass>
           <alias>alias</alias>