From 90cebe7c41796392549c88f31e3c201d032d9240 Mon Sep 17 00:00:00 2001 From: Jaikiran Pai Date: Thu, 14 Aug 2025 13:35:59 +0530 Subject: [PATCH] 8365533: Remove outdated jdk.internal.javac package export to several modules from java.base --- src/java.base/share/classes/module-info.java | 8 +------- src/jdk.jartool/share/classes/module-info.java | 5 +---- src/jdk.jdeps/share/classes/module-info.java | 3 --- src/jdk.jfr/share/classes/module-info.java | 5 +---- src/jdk.jlink/share/classes/module-info.java | 5 +---- .../share/classes/jdk/jshell/JShellConsole.java | 1 - src/jdk.jshell/share/classes/module-info.java | 5 +---- 7 files changed, 5 insertions(+), 27 deletions(-) diff --git a/src/java.base/share/classes/module-info.java b/src/java.base/share/classes/module-info.java index 43d148a342886..0a27080ea3b59 100644 --- a/src/java.base/share/classes/module-info.java +++ b/src/java.base/share/classes/module-info.java @@ -155,13 +155,7 @@ exports jdk.internal.javac to java.compiler, java.desktop, // for ScopedValue - jdk.compiler, - jdk.incubator.vector, // participates in preview features - jdk.jartool, // participates in preview features - jdk.jdeps, // participates in preview features - jdk.jfr, // participates in preview features - jdk.jlink, // participates in preview features - jdk.jshell; // participates in preview features + jdk.compiler; exports jdk.internal.access to java.desktop, java.logging, diff --git a/src/jdk.jartool/share/classes/module-info.java b/src/jdk.jartool/share/classes/module-info.java index 880e516b70250..b1dcfb78a527d 100644 --- a/src/jdk.jartool/share/classes/module-info.java +++ b/src/jdk.jartool/share/classes/module-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -23,8 +23,6 @@ * questions. */ -import jdk.internal.javac.ParticipatesInPreview; - /** * Defines tools for manipulating Java Archive (JAR) files, * including the {@index jar jar tool} and @@ -49,7 +47,6 @@ * @moduleGraph * @since 9 */ -@ParticipatesInPreview module jdk.jartool { requires jdk.internal.opt; diff --git a/src/jdk.jdeps/share/classes/module-info.java b/src/jdk.jdeps/share/classes/module-info.java index 3c15c3330c7ac..e996f66b7d4b1 100644 --- a/src/jdk.jdeps/share/classes/module-info.java +++ b/src/jdk.jdeps/share/classes/module-info.java @@ -23,8 +23,6 @@ * questions. */ -import jdk.internal.javac.ParticipatesInPreview; - /** * Defines tools for analysing dependencies in Java libraries and programs, * including the {@index jdeps jdeps tool}, @@ -62,7 +60,6 @@ * @moduleGraph * @since 9 */ -@ParticipatesInPreview module jdk.jdeps { requires java.compiler; requires jdk.compiler; diff --git a/src/jdk.jfr/share/classes/module-info.java b/src/jdk.jfr/share/classes/module-info.java index 8b2a5af7e80b5..211c1f1e2a16d 100644 --- a/src/jdk.jfr/share/classes/module-info.java +++ b/src/jdk.jfr/share/classes/module-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -23,15 +23,12 @@ * questions. */ -import jdk.internal.javac.ParticipatesInPreview; - /** * Defines the API for JDK Flight Recorder. * * @moduleGraph * @since 9 */ -@ParticipatesInPreview module jdk.jfr { exports jdk.jfr; exports jdk.jfr.consumer; diff --git a/src/jdk.jlink/share/classes/module-info.java b/src/jdk.jlink/share/classes/module-info.java index a4fa40dc7901d..ba66da5360484 100644 --- a/src/jdk.jlink/share/classes/module-info.java +++ b/src/jdk.jlink/share/classes/module-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -23,8 +23,6 @@ * questions. */ -import jdk.internal.javac.ParticipatesInPreview; - /** * Defines the {@index jlink jlink tool} tool for creating run-time * images, the {@index jmod jmod tool} tool for creating and manipulating @@ -53,7 +51,6 @@ * @moduleGraph * @since 9 */ -@ParticipatesInPreview module jdk.jlink { requires jdk.internal.opt; requires jdk.jdeps; diff --git a/src/jdk.jshell/share/classes/jdk/jshell/JShellConsole.java b/src/jdk.jshell/share/classes/jdk/jshell/JShellConsole.java index d0792f7bdd0d3..845ec20c041e2 100644 --- a/src/jdk.jshell/share/classes/jdk/jshell/JShellConsole.java +++ b/src/jdk.jshell/share/classes/jdk/jshell/JShellConsole.java @@ -28,7 +28,6 @@ import java.io.PrintWriter; import java.io.Reader; import java.nio.charset.Charset; -import jdk.internal.javac.PreviewFeature; /** * An interface providing functionality for {@link java.io.Console} in the user's snippet. diff --git a/src/jdk.jshell/share/classes/module-info.java b/src/jdk.jshell/share/classes/module-info.java index b1e4270692db5..938310c1dd4e8 100644 --- a/src/jdk.jshell/share/classes/module-info.java +++ b/src/jdk.jshell/share/classes/module-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -23,8 +23,6 @@ * questions. */ -import jdk.internal.javac.ParticipatesInPreview; - /** * Provides the {@index jshell jshell tool} tool for evaluating * snippets of Java code, and defines a JDK-specific API for modeling and @@ -65,7 +63,6 @@ * @moduleGraph * @since 9 */ -@ParticipatesInPreview module jdk.jshell { requires java.logging; requires jdk.compiler;