Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle/generation/extract-jdk-apis.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def resources = scriptResources(buildscript)
configure(project(":lucene:core")) {
ext {
apijars = layout.projectDirectory.dir("src/generated/jdk")
mrjarJavaVersions = [ 21 ]
mrjarJavaVersions = [ 24 ]
}

configurations {
Expand Down
5 changes: 2 additions & 3 deletions gradle/generation/extract-jdk-apis/ExtractJdkApis.java
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,13 @@

public final class ExtractJdkApis {

private static final FileTime FIXED_FILEDATE = FileTime.from(Instant.parse("2022-01-01T00:00:00Z"));
private static final FileTime FIXED_FILEDATE = FileTime.from(Instant.parse("2025-04-29T00:00:00Z"));

private static final String PATTERN_PANAMA_FOREIGN = "java.base/{java/lang/foreign/*,java/nio/channels/FileChannel}";
private static final String PATTERN_VECTOR_INCUBATOR = "jdk.incubator.vector/jdk/incubator/vector/*";
private static final String PATTERN_VECTOR_VM_INTERNALS = "java.base/jdk/internal/vm/vector/VectorSupport{,$Vector,$VectorMask,$VectorPayload,$VectorShuffle}";

static final Map<Integer,List<String>> CLASSFILE_PATTERNS = Map.of(
21, List.of(PATTERN_PANAMA_FOREIGN, PATTERN_VECTOR_VM_INTERNALS, PATTERN_VECTOR_INCUBATOR)
24, List.of(PATTERN_VECTOR_VM_INTERNALS, PATTERN_VECTOR_INCUBATOR)
);

public static void main(String... args) throws IOException {
Expand Down
4 changes: 2 additions & 2 deletions gradle/java/core-mrjar.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

// Produce an MR-JAR with Java 19+ foreign and vector implementations
// Produce an MR-JAR for panama vector implementations

configure(project(":lucene:core")) {
plugins.withType(JavaPlugin) {
Expand Down Expand Up @@ -52,7 +52,7 @@ configure(project(":lucene:core")) {
mrjarJavaVersions.each { jdkVersion ->
// the sourceSet which corresponds to the minimum/base Java version
// will copy its output to root of JAR, all other sourceSets will go into MR-JAR folders:
boolean isBaseVersion = (jdkVersion.toString() == rootProject.minJavaVersion.toString())
boolean isBaseVersion = (jdkVersion.toString() as int <= rootProject.minJavaVersion.toString() as int)
into(isBaseVersion ? '' : "META-INF/versions/${jdkVersion}") {
from sourceSets["main${jdkVersion}"].output
}
Expand Down
2 changes: 2 additions & 0 deletions lucene/CHANGES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ Other

* GITHUB#14229: Bump minimum required Java version to 25

* GITHUB#14564: Remove abstractions from MMapDirectory as we need no MR-JAR anymore. (Uwe Schindler)

======================= Lucene 10.3.0 =======================

API Changes
Expand Down
Binary file removed lucene/core/src/generated/jdk/jdk21.apijar
Binary file not shown.
Binary file added lucene/core/src/generated/jdk/jdk24.apijar
Binary file not shown.
Loading