From 61fa400a6baa93ebaa4e36c81f5db3cd5fbeeb82 Mon Sep 17 00:00:00 2001 From: Michael Bien Date: Tue, 15 Sep 2026 11:39:49 +0200 Subject: [PATCH] Move libs.tomlj to rust cluster - only rust uses it still, other modules use libs.tomljava - disable sig test for this library due to verification failure in jakarta.tck:sigtest-maven-plugin:2.7 --- .../nbproject/org-netbeans-libs-tomlj.sig | 176 ------------------ nbbuild/cluster.properties | 2 +- {ide => rust}/libs.tomlj/build.xml | 2 +- .../libs.tomlj/external/binaries-list | 0 .../external/tomlj-1.1.0-license.txt | 0 {ide => rust}/libs.tomlj/manifest.mf | 0 .../libs.tomlj/nbproject/project.properties | 6 +- .../libs.tomlj/nbproject/project.xml | 0 .../org/netbeans/libs/tomlj/Bundle.properties | 0 9 files changed, 4 insertions(+), 182 deletions(-) delete mode 100644 ide/libs.tomlj/nbproject/org-netbeans-libs-tomlj.sig rename {ide => rust}/libs.tomlj/build.xml (93%) rename {ide => rust}/libs.tomlj/external/binaries-list (100%) rename {ide => rust}/libs.tomlj/external/tomlj-1.1.0-license.txt (100%) rename {ide => rust}/libs.tomlj/manifest.mf (100%) rename {ide => rust}/libs.tomlj/nbproject/project.properties (78%) rename {ide => rust}/libs.tomlj/nbproject/project.xml (100%) rename {ide => rust}/libs.tomlj/src/org/netbeans/libs/tomlj/Bundle.properties (100%) diff --git a/ide/libs.tomlj/nbproject/org-netbeans-libs-tomlj.sig b/ide/libs.tomlj/nbproject/org-netbeans-libs-tomlj.sig deleted file mode 100644 index 978561de4220..000000000000 --- a/ide/libs.tomlj/nbproject/org-netbeans-libs-tomlj.sig +++ /dev/null @@ -1,176 +0,0 @@ -#Signature file v4.1 -#Version 1.15 - -CLSS public abstract interface java.io.Serializable - -CLSS public abstract interface java.lang.Comparable<%0 extends java.lang.Object> -meth public abstract int compareTo({java.lang.Comparable%0}) - -CLSS public abstract java.lang.Enum<%0 extends java.lang.Enum<{java.lang.Enum%0}>> -cons protected init(java.lang.String,int) -intf java.io.Serializable -intf java.lang.Comparable<{java.lang.Enum%0}> -meth protected final java.lang.Object clone() throws java.lang.CloneNotSupportedException -meth protected final void finalize() -meth public final boolean equals(java.lang.Object) -meth public final int compareTo({java.lang.Enum%0}) -meth public final int hashCode() -meth public final int ordinal() -meth public final java.lang.Class<{java.lang.Enum%0}> getDeclaringClass() -meth public final java.lang.String name() -meth public java.lang.String toString() -meth public static <%0 extends java.lang.Enum<{%%0}>> {%%0} valueOf(java.lang.Class<{%%0}>,java.lang.String) -supr java.lang.Object - -CLSS public java.lang.Exception -cons protected init(java.lang.String,java.lang.Throwable,boolean,boolean) -cons public init() -cons public init(java.lang.String) -cons public init(java.lang.String,java.lang.Throwable) -cons public init(java.lang.Throwable) -supr java.lang.Throwable - -CLSS public java.lang.Object -cons public init() -meth protected java.lang.Object clone() throws java.lang.CloneNotSupportedException -meth protected void finalize() throws java.lang.Throwable -meth public boolean equals(java.lang.Object) -meth public final java.lang.Class getClass() -meth public final void notify() -meth public final void notifyAll() -meth public final void wait() throws java.lang.InterruptedException -meth public final void wait(long) throws java.lang.InterruptedException -meth public final void wait(long,int) throws java.lang.InterruptedException -meth public int hashCode() -meth public java.lang.String toString() - -CLSS public java.lang.RuntimeException -cons protected init(java.lang.String,java.lang.Throwable,boolean,boolean) -cons public init() -cons public init(java.lang.String) -cons public init(java.lang.String,java.lang.Throwable) -cons public init(java.lang.Throwable) -supr java.lang.Exception - -CLSS public java.lang.Throwable -cons protected init(java.lang.String,java.lang.Throwable,boolean,boolean) -cons public init() -cons public init(java.lang.String) -cons public init(java.lang.String,java.lang.Throwable) -cons public init(java.lang.Throwable) -intf java.io.Serializable -meth public final java.lang.Throwable[] getSuppressed() -meth public final void addSuppressed(java.lang.Throwable) -meth public java.lang.StackTraceElement[] getStackTrace() -meth public java.lang.String getLocalizedMessage() -meth public java.lang.String getMessage() -meth public java.lang.String toString() -meth public java.lang.Throwable fillInStackTrace() -meth public java.lang.Throwable getCause() -meth public java.lang.Throwable initCause(java.lang.Throwable) -meth public void printStackTrace() -meth public void printStackTrace(java.io.PrintStream) -meth public void printStackTrace(java.io.PrintWriter) -meth public void setStackTrace(java.lang.StackTraceElement[]) -supr java.lang.Object - -CLSS public final !enum org.tomlj.JsonOptions -fld public final static org.tomlj.JsonOptions ALL_VALUES_AS_STRINGS -fld public final static org.tomlj.JsonOptions VALUES_AS_OBJECTS_WITH_TYPE -meth public static org.tomlj.JsonOptions valueOf(java.lang.String) -meth public static org.tomlj.JsonOptions[] values() -supr java.lang.Enum - -CLSS public final org.tomlj.Toml -meth public static boolean equals(org.tomlj.TomlArray,org.tomlj.TomlArray) -meth public static boolean equals(org.tomlj.TomlTable,org.tomlj.TomlTable) -meth public static java.lang.String canonicalDottedKey(java.lang.String) -meth public static java.lang.String joinKeyPath(java.util.List) -meth public static java.lang.StringBuilder tomlEscape(java.lang.String) -meth public static java.util.List parseDottedKey(java.lang.String) -meth public static org.tomlj.TomlParseResult parse(java.io.InputStream) throws java.io.IOException -meth public static org.tomlj.TomlParseResult parse(java.io.InputStream,org.tomlj.TomlVersion) throws java.io.IOException -meth public static org.tomlj.TomlParseResult parse(java.io.Reader) throws java.io.IOException -meth public static org.tomlj.TomlParseResult parse(java.io.Reader,org.tomlj.TomlVersion) throws java.io.IOException -meth public static org.tomlj.TomlParseResult parse(java.lang.String) -meth public static org.tomlj.TomlParseResult parse(java.lang.String,org.tomlj.TomlVersion) -meth public static org.tomlj.TomlParseResult parse(java.nio.channels.ReadableByteChannel) throws java.io.IOException -meth public static org.tomlj.TomlParseResult parse(java.nio.channels.ReadableByteChannel,org.tomlj.TomlVersion) throws java.io.IOException -meth public static org.tomlj.TomlParseResult parse(java.nio.file.Path) throws java.io.IOException -meth public static org.tomlj.TomlParseResult parse(java.nio.file.Path,org.tomlj.TomlVersion) throws java.io.IOException -supr java.lang.Object -hfds simpleKeyPattern - -CLSS public abstract interface org.tomlj.TomlArray -meth public !varargs java.lang.String toJson(org.tomlj.JsonOptions[]) -meth public !varargs void toJson(java.lang.Appendable,org.tomlj.JsonOptions[]) throws java.io.IOException -meth public abstract boolean containsArrays() -meth public abstract boolean containsBooleans() -meth public abstract boolean containsDoubles() -meth public abstract boolean containsLocalDateTimes() -meth public abstract boolean containsLocalDates() -meth public abstract boolean containsLocalTimes() -meth public abstract boolean containsLongs() -meth public abstract boolean containsOffsetDateTimes() -meth public abstract boolean containsStrings() -meth public abstract boolean containsTables() -meth public abstract boolean isEmpty() -meth public abstract int size() -meth public abstract java.lang.Object get(int) -meth public abstract java.util.List toList() -meth public abstract org.tomlj.TomlPosition inputPositionOf(int) -meth public boolean getBoolean(int) -meth public double getDouble(int) -meth public java.lang.String getString(int) -meth public java.lang.String toJson(java.util.EnumSet) -meth public java.lang.String toToml() -meth public java.time.LocalDate getLocalDate(int) -meth public java.time.LocalDateTime getLocalDateTime(int) -meth public java.time.LocalTime getLocalTime(int) -meth public java.time.OffsetDateTime getOffsetDateTime(int) -meth public long getLong(int) -meth public org.tomlj.TomlArray getArray(int) -meth public org.tomlj.TomlTable getTable(int) -meth public void toJson(java.lang.Appendable,java.util.EnumSet) throws java.io.IOException -meth public void toToml(java.lang.Appendable) throws java.io.IOException - -CLSS public org.tomlj.TomlCommand -cons public init() -meth public static void main(java.lang.String[]) -supr java.lang.Object - -CLSS public org.tomlj.TomlInvalidTypeException -supr java.lang.RuntimeException - -CLSS public final org.tomlj.TomlParseError -meth public java.lang.String toString() -meth public org.tomlj.TomlPosition position() -supr java.lang.RuntimeException -hfds position - -CLSS public abstract interface org.tomlj.TomlParseResult -intf org.tomlj.TomlTable -meth public abstract java.util.List errors() -meth public boolean hasErrors() - -CLSS public final org.tomlj.TomlPosition -meth public boolean equals(java.lang.Object) -meth public int column() -meth public int hashCode() -meth public int line() -meth public java.lang.String toString() -meth public static org.tomlj.TomlPosition positionAt(int,int) -supr java.lang.Object -hfds column,line - -CLSS public abstract interface org.tomlj.TomlTable - -CLSS public final !enum org.tomlj.TomlVersion -fld public final static org.tomlj.TomlVersion HEAD -fld public final static org.tomlj.TomlVersion LATEST -fld public final static org.tomlj.TomlVersion V0_4_0 -fld public final static org.tomlj.TomlVersion V0_5_0 -fld public final static org.tomlj.TomlVersion V1_0_0 -supr java.lang.Enum -hfds canonical - diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties index cceffdbc839d..a668f4e128e3 100644 --- a/nbbuild/cluster.properties +++ b/nbbuild/cluster.properties @@ -402,7 +402,6 @@ nb.cluster.ide=\ libs.snakeyaml_engine,\ libs.svnClientAdapter,\ libs.svnClientAdapter.javahl,\ - libs.tomlj,\ libs.tomljava,\ libs.truffleapi,\ libs.xerces,\ @@ -1070,6 +1069,7 @@ nb.cluster.rust.depends=\ nb.cluster.platform,\ nb.cluster.ide nb.cluster.rust=\ + libs.tomlj,\ rust.cargo,\ rust.grammar,\ rust.kit,\ diff --git a/ide/libs.tomlj/build.xml b/rust/libs.tomlj/build.xml similarity index 93% rename from ide/libs.tomlj/build.xml rename to rust/libs.tomlj/build.xml index ff692ac02228..b252a2f9212d 100644 --- a/ide/libs.tomlj/build.xml +++ b/rust/libs.tomlj/build.xml @@ -19,6 +19,6 @@ under the License. --> - + diff --git a/ide/libs.tomlj/external/binaries-list b/rust/libs.tomlj/external/binaries-list similarity index 100% rename from ide/libs.tomlj/external/binaries-list rename to rust/libs.tomlj/external/binaries-list diff --git a/ide/libs.tomlj/external/tomlj-1.1.0-license.txt b/rust/libs.tomlj/external/tomlj-1.1.0-license.txt similarity index 100% rename from ide/libs.tomlj/external/tomlj-1.1.0-license.txt rename to rust/libs.tomlj/external/tomlj-1.1.0-license.txt diff --git a/ide/libs.tomlj/manifest.mf b/rust/libs.tomlj/manifest.mf similarity index 100% rename from ide/libs.tomlj/manifest.mf rename to rust/libs.tomlj/manifest.mf diff --git a/ide/libs.tomlj/nbproject/project.properties b/rust/libs.tomlj/nbproject/project.properties similarity index 78% rename from ide/libs.tomlj/nbproject/project.properties rename to rust/libs.tomlj/nbproject/project.properties index 767fdbcff4cb..ca5ce870e102 100644 --- a/ide/libs.tomlj/nbproject/project.properties +++ b/rust/libs.tomlj/nbproject/project.properties @@ -17,7 +17,5 @@ release.external/tomlj-1.1.0.jar=modules/ext/tomlj.jar is.autoload=true -# Restrict Sigcheck to the org.toml package. The internal package contains the -# ANTLRv4 Lexer/parser which are required to be public by the langiages.toml -# module, but otherwise it's discouraged to be used. -sigtest.public.packages=org.tomlj \ No newline at end of file +# jakarta.tck:sigtest-maven-plugin:2.7 failure +sigtest.skip.gen=true diff --git a/ide/libs.tomlj/nbproject/project.xml b/rust/libs.tomlj/nbproject/project.xml similarity index 100% rename from ide/libs.tomlj/nbproject/project.xml rename to rust/libs.tomlj/nbproject/project.xml diff --git a/ide/libs.tomlj/src/org/netbeans/libs/tomlj/Bundle.properties b/rust/libs.tomlj/src/org/netbeans/libs/tomlj/Bundle.properties similarity index 100% rename from ide/libs.tomlj/src/org/netbeans/libs/tomlj/Bundle.properties rename to rust/libs.tomlj/src/org/netbeans/libs/tomlj/Bundle.properties