Revert "Merge branch_9x into fs/branch_9x (up to ccf4b198ec328095d45d2746189dc8ca633e8bcf)"

build.gradle

@@ -36,7 +36,7 @@ apply from: file('gradle/globals.gradle')
 // Calculate project version:
 version = {
   // Release manager: update base version here after release:
-  String baseVersion = '9.7.0'
+  String baseVersion = '9.6.0'
 
   // On a release explicitly set release version in one go:
   //  -Dversion.release=x.y.z
@@ -119,7 +119,7 @@ apply from: file('gradle/ide/eclipse.gradle')
 // (java, tests)
 apply from: file('gradle/java/folder-layout.gradle')
 apply from: file('gradle/java/javac.gradle')
-apply from: file('gradle/java/core-mrjar.gradle')
+apply from: file('gradle/java/memorysegment-mrjar.gradle')
 apply from: file('gradle/testing/defaults-tests.gradle')
 apply from: file('gradle/testing/randomization.gradle')
 apply from: file('gradle/testing/fail-on-no-tests.gradle')
@@ -158,7 +158,7 @@ apply from: file('gradle/generation/javacc.gradle')
 apply from: file('gradle/generation/forUtil.gradle')
 apply from: file('gradle/generation/antlr.gradle')
 apply from: file('gradle/generation/unicode-test-classes.gradle')
-apply from: file('gradle/generation/extract-jdk-apis.gradle')
+apply from: file('gradle/generation/panama-foreign.gradle')
 
 apply from: file('gradle/datasets/external-datasets.gradle')
 

buildSrc/scriptDepVersions.gradle

@@ -22,7 +22,7 @@
 ext {
   scriptDepVersions = [
       "apache-rat": "0.14",
-      "asm": "9.5",
+      "asm": "9.4",
       "commons-codec": "1.13",
       "ecj": "3.30.0",
       "flexmark": "0.61.24",

dev-tools/doap/lucene.rdf

@@ -67,20 +67,14 @@
     </maintainer>
 
     <!-- NOTE: please insert releases in numeric order, NOT chronologically. -->
-    <release>
-       <Version>
-         <name>lucene-9.6.0</name>
-         <created>2023-05-09</created>
-         <revision>9.6.0</revision>
-       </Version>
-    </release>
     <release>
        <Version>
          <name>lucene-9.5.0</name>
          <created>2023-01-30</created>
          <revision>9.5.0</revision>
        </Version>
     </release>
+
     <release>
        <Version>
          <name>lucene-9.4.2</name>

gradle/generation/extract-jdk-apis.gradle → gradle/generation/panama-foreign.gradle

@@ -17,17 +17,10 @@
 
 def resources = scriptResources(buildscript)
 
-configure(rootProject) {
-  ext {
-    // also change this in extractor tool: ExtractForeignAPI
-    vectorIncubatorJavaVersions = [ JavaVersion.VERSION_20, JavaVersion.VERSION_21 ] as Set
-  }
-}
-
 configure(project(":lucene:core")) {
   ext {
     apijars = file('src/generated/jdk');
-    mrjarJavaVersions = [ 19, 20, 21 ]
+    panamaJavaVersions = [ 19, 20 ]
   }
 
   configurations {
@@ -38,9 +31,9 @@ configure(project(":lucene:core")) {
     apiextractor "org.ow2.asm:asm:${scriptDepVersions['asm']}"
   }
 
-  for (jdkVersion : mrjarJavaVersions) {
-    def task = tasks.create(name: "generateJdkApiJar${jdkVersion}", type: JavaExec) {
-      description "Regenerate the API-only JAR file with public Panama Foreign & Vector API from JDK ${jdkVersion}"
+  for (jdkVersion : panamaJavaVersions) {
+    def task = tasks.create(name: "generatePanamaForeignApiJar${jdkVersion}", type: JavaExec) {
+      description "Regenerate the API-only JAR file with public Panama Foreign API from JDK ${jdkVersion}"
       group "generation"
 
       javaLauncher = javaToolchains.launcherFor {
@@ -52,21 +45,18 @@ configure(project(":lucene:core")) {
           javaLauncher.get()
           return true
         } catch (Exception e) {
-          logger.warn('Launcher for Java {} is not available; skipping regeneration of Panama Foreign & Vector API JAR.', jdkVersion)
+          logger.warn('Launcher for Java {} is not available; skipping regeneration of Panama Foreign API JAR.', jdkVersion)
           logger.warn('Error: {}', e.cause?.message)
           logger.warn("Please make sure to point env 'JAVA{}_HOME' to exactly JDK version {} or enable Gradle toolchain auto-download.", jdkVersion, jdkVersion)
           return false
         }
       }
-
+      
       classpath = configurations.apiextractor
-      mainClass = file("${resources}/ExtractJdkApis.java") as String
-      systemProperties = [
-        'user.timezone': 'UTC'
-      ]
+      mainClass = file("${resources}/ExtractForeignAPI.java") as String
       args = [
         jdkVersion,
-        new File(apijars, "jdk${jdkVersion}.apijar"),
+        new File(apijars, "panama-foreign-jdk${jdkVersion}.apijar"),
       ]
     }