[ci] add jdks to test matrix

.azure/build.yml

@@ -50,41 +50,49 @@ jobs:
   dependsOn: Deps
   strategy:
     matrix:
+      linux-3.7:
+        imageName: "ubuntu-latest"
+        python.version: '3.7'
       linux-3.8:
         imageName: "ubuntu-latest"
         python.version: '3.8'
+        jdk.version: '8'
       linux-3.9:
         imageName: "ubuntu-latest"
         python.version: '3.9'
+        jdk.version: '11'
       linux-3.10:
         imageName: "ubuntu-latest"
         python.version: '3.10'
+        jdk.version: '17'
       linux-3.11:
         imageName: "ubuntu-latest"
         python.version: '3.11'
+        jdk.version: '17'
       linux-3.12:
         imageName: "ubuntu-latest"
         python.version: '3.12'
       windows-3.8:
         imageName: "windows-2019"
         python.version: '3.8'
+        jdk.version: '8'
+
       windows-3.9:
         imageName: "windows-2019"
         python.version: '3.9'
-        #jpypetest.fast: 'true'
+        jdk.version: '11'
       windows-3.10:
         imageName: "windows-2019"
         python.version: '3.10'
       windows-3.11:
         imageName: "windows-2019"
         python.version: '3.11'
-      windows-3.12:
-        imageName: "windows-2019"
-        python.version: '3.12'
+        jdk.version: '17'
       mac-3.9:
         imageName: "macos-11"
         python.version: '3.9'
         jpypetest.fast: 'true'
+        jdk.version: '17'
 
   pool:
     vmImage: $(imageName)

.azure/scripts/jdk.yml

@@ -1,14 +1,11 @@
 parameters:
 - name: version
   type: string
-  default: 8
+  default: '8'
 
 steps:
-- script: |
-    set v="##vso[task.setvariable variable=JAVA_HOME]%JAVA_HOME_${{parameters.version}}_X64%"
-    echo %v:"=%
-  condition: eq(variables['Agent.OS'], 'Windows_NT')
-
-- script: |
-    echo "##vso[task.setvariable variable=JAVA_HOME]$(JAVA_HOME_${{parameters.version}}_X64)"
-  condition: ne(variables['Agent.OS'], 'Windows_NT')
+  - task: JavaToolInstaller@0
+    inputs:
+      versionSpec: ${{ parameters.version }}
+      jdkArchitectureOption: 'x64'
+      jdkSourceOption: 'PreInstalled'

.azure/scripts/test.yml

@@ -6,7 +6,7 @@ steps:
 
 - template: jdk.yml
   parameters:
-    version: 11
+    version: '$(jdk.version)'
 
 - script: |
     python -m pip install --upgrade pytest setuptools
@@ -25,12 +25,12 @@ steps:
 
 - script: |
     python -m pytest -v --junit-xml=build/test/test.xml test/jpypetest --checkjni
-  displayName: 'Test JDK 11'
+  displayName: 'Test JDK $(jdk.version)'
   condition: eq(variables['jpypetest.fast'], 'false')
 
 - script: |
     python -m pytest -v --junit-xml=build/test/test.xml test/jpypetest --checkjni --fast
-  displayName: 'Test JDK 11 (fast)'
+  displayName: 'Test JDK $(jdk.version) (fast)'
   condition: eq(variables['jpypetest.fast'], 'true')
 
 # presence of jpype/ seems to confuse entry_points so `cd` elsewhere
@@ -45,5 +45,4 @@ steps:
   condition: succeededOrFailed()
   inputs:
      testResultsFiles: 'build/test/test.xml'
-     testRunTitle: 'Publish test results for Python $(python.version) with JDK 11'
-
+     testRunTitle: 'Publish test results for Python $(python.version) with JDK $(jdk.version)'

jpype/_jvmfinder.py

@@ -37,7 +37,6 @@
     To avoid this exception specify the JAVA_HOME environment variable as a
     valid jre or jdk root directory.
     """
-    pass
 
 
 class JVMNotSupportedException(ValueError):
@@ -49,7 +48,6 @@
     32 vs 64 bit, or the JVM is older than the version used to compile
     JPype.
     """
-    pass
 
 
 def getDefaultJVMPath():
@@ -74,6 +72,9 @@
     return finder.get_jvm_path()
 
 
+get_default_jvm_path = getDefaultJVMPath
+
+
 class JVMFinder(object):
     """
     JVM library finder base class

native/jni_include/jni.h

@@ -1179,6 +1179,11 @@ JNIEXPORT void JNI_OnUnload(JavaVM* vm, void* reserved);
 #define JNI_VERSION_1_6 0x00010006
 #define JNI_VERSION_1_7 0x00010007
 #define JNI_VERSION_1_8 0x00010008
+#define JNI_VERSION_9   0x00090000
+#define JNI_VERSION_10  0x000a0000
+#define JNI_VERSION_19  0x00130000
+#define JNI_VERSION_20  0x00140000
+#define JNI_VERSION_21  0x00150000
 
 #define JNI_OK          (0)         /* no error */
 #define JNI_ERR         (-1)        /* generic error */