Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package jline3 for openSUSE:Factory checked in at 2026-11-17 17:17:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jline3 (Old) and /work/SRC/openSUSE:Factory/.jline3.new.1251 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jline3" Tue Nov 17 17:17:50 2026 rev:20 rq:1397909 version:4.7.0 Changes: -------- --- /work/SRC/openSUSE:Factory/jline3/jline3.changes 2026-09-24 23:02:22.748571324 +0200 +++ /work/SRC/openSUSE:Factory/.jline3.new.1251/jline3.changes 2026-11-17 17:19:40.440777753 +0100 @@ -1,0 +2,47 @@ +Thu Nov 12 16:45:01 UTC 2026 - Fridrich Strba <[email protected]> + +- Update to upstream version 4.7.0 + * Major changes + + Require Java 11 or newer + + Complete the JPMS migration and use the standard Java + ServiceLoader for terminal provider discovery + + Remove the JNA terminal provider; keep the JNI and FFM + providers + + Remove all previously deprecated APIs + + Add the jline-shell, jline-prompt and jline-picocli modules + + Add terminal graphics, Kitty keyboard protocol, in-band + resize, synchronized output and grapheme cluster support + + Add Windows code page auto-detection, musl libc and AIX + support + * Security Fixes + + Prevent heap overflow in CLibrary.ioctl(int, long, int[]) + (GHSA-p73x-fv3x-mvv6) + + Create editor temp files with owner-only permissions + (GHSA-7whq-538g-8928) + + Skip history expansion for masked input + (GHSA-rcc3-r7r7-qvg2) + + Enforce the NEW-ENVIRON variable limit across frames + (GHSA-7qh2-r6cc-r47w) + + Guard the history /pattern regex search against ReDoS + (GHSA-vrw4-fppg-3rhf) + * Bug Fixes + + Reduce terminal startup latency with deferred build and + provider short-circuit + + Count halfwidth katakana voiced and semi-voiced sound marks + in display width + + Preserve the command buffer when the edit-and-execute secure + temp file fails + + Remove the eager native library load from the JLineLibrary + static initializer + + Fix terminal color palette initialization and FFM signal + handling + + Prevent keystroke theft by the pump thread + * Packaging changes + + Add picocli, prompt and shell subpackages + + Drop the curses and terminal-jna subpackages + + Add the picocli build dependency +- Modified patch: + * 0001-Remove-optional-dependency-on-universalchardet.patch + + rediff and include the fix for module-info.java + +------------------------------------------------------------------- Old: ---- jline-3.30.17.tar.gz New: ---- 4.7.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jline3.spec ++++++ --- /var/tmp/diff_new_pack.D5aUPT/_old 2026-11-17 17:19:41.376817263 +0100 +++ /var/tmp/diff_new_pack.D5aUPT/_new 2026-11-17 17:19:41.378817348 +0100 @@ -32,23 +32,23 @@ %bcond_with ssh %bcond_with juniversalchardet Name: jline3 -Version: 3.30.17 +Version: 4.7.0 Release: 0 Summary: Java library for handling console input License: BSD-3-Clause Group: Development/Libraries/Java URL: https://github.com/jline/jline3 -Source0: %{url}/archive/refs/tags/jline-%{version}.tar.gz +Source0: %{url}/archive/refs/tags/%{version}.tar.gz Source1: %{name}-build.tar.xz Source100: Load-native-library-system-wide-place.patch.in Patch0: 0001-Remove-optional-dependency-on-universalchardet.patch BuildRequires: ant BuildRequires: fdupes BuildRequires: jansi -BuildRequires: java-devel >= 1.8 +BuildRequires: java-devel >= 11 BuildRequires: javapackages-local >= 6 -BuildRequires: jna BuildRequires: jsr-305 +BuildRequires: picocli %if %{with juniversalchardet} BuildRequires: juniversalchardet %endif @@ -102,13 +102,6 @@ This package contains the command registry, object printer and widget implementations. -%package curses -Summary: JLine Curses -BuildArch: noarch - -%description curses -%{desc} - %package jansi Summary: Jansi Bundle @@ -130,6 +123,24 @@ This package contains the native library. +%package picocli +Summary: JLine Picocli +BuildArch: noarch + +%description picocli +%{desc} + +This package contains the JLine Picocli integration module. + +%package prompt +Summary: JLine Prompt +BuildArch: noarch + +%description prompt +%{desc} + +This package contains API for creating interactive console prompts. + %package reader Summary: JLine Reader BuildArch: noarch @@ -163,14 +174,14 @@ This package contains the helpers for using jline with Mina SSHD. %endif -%if %{with ffm} -%package terminal-ffm -Summary: JLine FFM Terminal +%package shell +Summary: JLine Shell BuildArch: noarch -%description terminal-ffm +%description shell %{desc} -%endif + +This package contains the jline shell. %package style Summary: JLine Style @@ -181,14 +192,26 @@ This package contains the styling api. -%package terminal-jna -Summary: JLine JNA Terminal +%if %{with ffm} +%package terminal-ffm +Summary: JLine FFM Terminal BuildArch: noarch -%description terminal-jna +%description terminal-ffm %{desc} -This package contains terminal implementations leveraging the JNA library. +This package contains terminal implementations leverating the +Foreign Function Memory (FFM) API introduced in JDK 22 +%endif + +%package terminal-jansi +Summary: JLine JANSI Terminal +BuildArch: noarch + +%description terminal-jansi +%{desc} + +This package contains terminal implementations leveraging the Jansi library. %package terminal-jni Summary: JLine JNI Terminal @@ -201,6 +224,8 @@ %package terminal Summary: JLine Terminal +Obsoletes: %{name}-curses +Obsoletes: %{name}-terminal-jna BuildArch: noarch %description terminal @@ -208,15 +233,6 @@ This package contains the Terminal api and implementations. -%package terminal-jansi -Summary: JLine JANSI Terminal -BuildArch: noarch - -%description terminal-jansi -%{desc} - -This package contains terminal implementations leveraging the Jansi library. - %package javadoc Summary: API documentation for %{name} BuildArch: noarch @@ -225,12 +241,14 @@ API documentation for %{name}. %prep -%setup -q -n %{name}-jline-%{version} -a1 +%setup -q -a1 %if %{without juniversalchardet} %patch -P 0 -p1 %pom_remove_dep -r :juniversalchardet . jline %endif +%pom_xpath_inject pom:project/pom:properties '<nisse.jgit.dynamicVersion>%{version}</nisse.jgit.dynamicVersion>' + sed "s;@SYSTEMLIBRARYPATH@;%{_libdir}/%{name}/;g" < %{SOURCE100} | patch -p1 cp -p console-ui/LICENSE.txt LICENSE-APACHE.txt @@ -258,7 +276,6 @@ # Unnecessary plugins for an rpm build %pom_remove_plugin :maven-enforcer-plugin %pom_remove_plugin :spotless-maven-plugin -%pom_remove_plugin :maven-release-plugin %pom_remove_plugin :maven-deploy-plugin %pom_remove_plugin :native-image-maven-plugin %pom_remove_plugin :maven-source-plugin @@ -280,26 +297,26 @@ mkdir -p jline/src/main/java mkdir -p jline/src/main/resources for module in \ - jansi-core \ - builtins \ - console \ native \ + terminal \ +%if %{with ffm} + terminal-ffm \ +%endif + terminal-jni \ reader \ + builtins \ + shell \ + console \ %if %{with ssh} remote-ssh \ %endif remote-telnet \ style \ - terminal \ -%if %{with ffm} - terminal-ffm \ -%endif - terminal-jansi \ - terminal-jna \ - terminal-jni; do + jansi-core; do if [ -d ${module}/src/main/java ]; then cp -r ${module}/src/main/java/* jline/src/main/java/ fi + find jline/src/main/java/ -name module-info.java -print -delete if [ -d ${module}/src/main/resources ]; then cp -r ${module}/src/main/resources/* jline/src/main/resources/ fi @@ -308,13 +325,14 @@ mkdir -p jansi/src/main/java mkdir -p jansi/src/main/resources for module in \ - jansi-core \ native \ terminal \ - terminal-jni; do + terminal-jni \ + jansi-core; do if [ -d ${module}/src/main/java ]; then cp -r ${module}/src/main/java/* jansi/src/main/java/ fi + find jansi/src/main/java/ -name module-info.java -print -delete if [ -d ${module}/src/main/resources ]; then cp -r ${module}/src/main/resources/* jansi/src/main/resources/ fi @@ -324,8 +342,8 @@ mkdir -p lib build-jar-repository -s lib \ jansi/jansi \ - jna/jna \ - jsr-305 + jsr-305 \ + picocli/picocli %if %{with juniversalchardet} build-jar-repository -s lib \ juniversalchardet/juniversalchardet @@ -347,10 +365,14 @@ ant package javadoc %if %{with ssh} - ant -f remote-ssh package javadoc + pushd remote-ssh + ant package javadoc + popd %endif %if %{with ffm} - ant -f terminal-ffm package javadoc + pushd terminal-ffm + ant -v package javadoc + popd %endif %install @@ -366,18 +388,19 @@ builtins \ console \ console-ui \ - curses reader \ + reader \ %if %{with ssh} remote-ssh \ %endif remote-telnet \ style \ + shell \ + prompt \ + picocli \ terminal \ %if %{with ffm} terminal-ffm \ %endif - terminal-jansi \ - terminal-jna \ terminal-jni; do install -pm 0644 ${i}/target/jline-${i}-%{version}.jar %{buildroot}%{_javadir}/%{name}/jline-${i}.jar done @@ -396,19 +419,20 @@ builtins \ console \ console-ui \ - curses reader \ + reader \ native \ %if %{with ssh} remote-ssh \ %endif remote-telnet \ style \ + shell \ + prompt \ + picocli \ terminal \ %if %{with ffm} terminal-ffm \ %endif - terminal-jansi \ - terminal-jna \ terminal-jni; do %{mvn_install_pom} ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/jline-${i}.pom %add_maven_depmap %{name}/jline-${i}.pom %{name}/jline-${i}.jar -f ${i} @@ -420,7 +444,7 @@ builtins \ console \ console-ui \ - curses reader \ + reader \ jansi \ jansi-core \ jline \ @@ -430,12 +454,13 @@ %endif remote-telnet \ style \ + shell \ + prompt \ + picocli \ terminal \ %if %{with ffm} terminal-ffm \ %endif - terminal-jansi \ - terminal-jna \ terminal-jni; do cp -r ${i}/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/${i} done @@ -464,13 +489,16 @@ %files console-ui -f .mfiles-console-ui %license LICENSE.txt -%files curses -f .mfiles-curses -%license LICENSE.txt - %files native -f .mfiles-native %{_libdir}/%{name} %license LICENSE.txt +%files picocli -f .mfiles-picocli +%license LICENSE.txt + +%files prompt -f .mfiles-prompt +%license LICENSE.txt + %files reader -f .mfiles-reader %license LICENSE.txt @@ -487,16 +515,13 @@ %files remote-telnet -f .mfiles-remote-telnet %license LICENSE.txt -%files style -f .mfiles-style +%files shell -f .mfiles-shell %license LICENSE.txt -%files terminal -f .mfiles-terminal -%license LICENSE.txt - -%files terminal-jansi -f .mfiles-terminal-jansi +%files style -f .mfiles-style %license LICENSE.txt -%files terminal-jna -f .mfiles-terminal-jna +%files terminal -f .mfiles-terminal %license LICENSE.txt %files terminal-jni -f .mfiles-terminal-jni ++++++ 0001-Remove-optional-dependency-on-universalchardet.patch ++++++ --- /var/tmp/diff_new_pack.D5aUPT/_old 2026-11-17 17:19:41.396818107 +0100 +++ /var/tmp/diff_new_pack.D5aUPT/_new 2026-11-17 17:19:41.401818318 +0100 @@ -1,17 +1,30 @@ -From 122ad3693ebf643e8f3d0eafd9ec4ac5b13130d7 Mon Sep 17 00:00:00 2001 +From 9f5631855aefce5d5bd7a397bdd9b3ad26e4a581 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski <[email protected]> Date: Wed, 26 Feb 2025 16:26:49 +0100 Subject: [PATCH] Remove optional dependency on universalchardet --- + builtins/src/main/java/module-info.java | 1 - builtins/src/main/java/org/jline/builtins/Nano.java | 12 ------------ - 1 file changed, 12 deletions(-) + 2 files changed, 13 deletions(-) +diff --git a/builtins/src/main/java/module-info.java b/builtins/src/main/java/module-info.java +index 6e4f098e..9f469029 100644 +--- a/builtins/src/main/java/module-info.java ++++ b/builtins/src/main/java/module-info.java +@@ -33,7 +33,6 @@ module org.jline.builtins { + requires transitive org.jline.style; + + // Optional dependencies +- requires static juniversalchardet; + requires static org.jline.shell; + + // Export public API diff --git a/builtins/src/main/java/org/jline/builtins/Nano.java b/builtins/src/main/java/org/jline/builtins/Nano.java -index b5112c2e..7d3bb3a7 100644 +index 623d1620..5ce40421 100644 --- a/builtins/src/main/java/org/jline/builtins/Nano.java +++ b/builtins/src/main/java/org/jline/builtins/Nano.java -@@ -53,7 +53,6 @@ import org.jline.utils.InfoCmp.Capability; +@@ -54,7 +54,6 @@ import org.jline.utils.InfoCmp.Capability; import org.jline.utils.RegexTimeoutException; import org.jline.utils.SafeRegex; import org.jline.utils.Status; @@ -19,7 +32,7 @@ import static org.jline.builtins.SyntaxHighlighter.*; import static org.jline.keymap.KeyMap.KEYMAP_LENGTH; -@@ -382,17 +381,6 @@ public class Nano implements Editor { +@@ -383,17 +382,6 @@ public class Nano implements Editor { } byte[] bytes = bos.toByteArray(); @@ -38,6 +51,6 @@ try (BufferedReader reader = new BufferedReader(new InputStreamReader(new ByteArrayInputStream(bytes), charset))) { -- -2.54.0 +2.56.0 ++++++ jline-3.30.17.tar.gz -> 4.7.0.tar.gz ++++++ ++++ 146994 lines of diff (skipped) ++++++ _scmsync.obsinfo ++++++ --- /var/tmp/diff_new_pack.D5aUPT/_old 2026-11-17 17:19:41.803835288 +0100 +++ /var/tmp/diff_new_pack.D5aUPT/_new 2026-11-17 17:19:41.806835414 +0100 @@ -1,6 +1,6 @@ -mtime: 1790170139 -commit: 7c11837185170673d9d36f1e970143b4d00b2cd05561532e783c8f10ed3fa706 +mtime: 1794505478 +commit: 1e07e7a5de3f3c1674855e42f982e06171afe0ba62392b2a83307bce22f108e5 url: https://src.opensuse.org/java-packages/jline3 -revision: 7c11837185170673d9d36f1e970143b4d00b2cd05561532e783c8f10ed3fa706 +revision: 1e07e7a5de3f3c1674855e42f982e06171afe0ba62392b2a83307bce22f108e5 projectscmsync: https://src.opensuse.org/java-packages/_ObsPrj ++++++ build.specials.obscpio ++++++ ++++++ build.specials.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/.gitignore new/.gitignore --- old/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/.gitignore 2026-11-12 18:44:38.000000000 +0100 @@ -0,0 +1 @@ +.osc ++++++ jline3-build.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build.xml new/build.xml --- old/build.xml 2025-03-21 11:08:05.959455990 +0100 +++ new/build.xml 2026-06-30 15:39:57.982735026 +0200 @@ -9,16 +9,16 @@ <target name="clean" description="Clean the output directory"> <ant antfile="build.xml" dir="native" target="clean"/> <ant antfile="build.xml" dir="terminal" target="clean"/> - <ant antfile="build.xml" dir="terminal-jna" target="clean"/> - <ant antfile="build.xml" dir="terminal-jansi" target="clean"/> <ant antfile="build.xml" dir="terminal-jni" target="clean"/> <ant antfile="build.xml" dir="reader" target="clean"/> + <ant antfile="build.xml" dir="shell" target="clean"/> + <ant antfile="build.xml" dir="style" target="clean"/> <ant antfile="build.xml" dir="builtins" target="clean"/> <ant antfile="build.xml" dir="console-ui" target="clean"/> + <ant antfile="build.xml" dir="prompt" target="clean"/> <ant antfile="build.xml" dir="console" target="clean"/> + <ant antfile="build.xml" dir="picocli" target="clean"/> <ant antfile="build.xml" dir="remote-telnet" target="clean"/> - <ant antfile="build.xml" dir="style" target="clean"/> - <ant antfile="build.xml" dir="curses" target="clean"/> <ant antfile="build.xml" dir="jansi-core" target="clean"/> <ant antfile="build.xml" dir="jline" target="clean"/> <ant antfile="build.xml" dir="jansi" target="clean"/> @@ -31,16 +31,16 @@ <target name="compile" description="Compile the code"> <ant antfile="build.xml" dir="native" target="compile"/> <ant antfile="build.xml" dir="terminal" target="compile"/> - <ant antfile="build.xml" dir="terminal-jna" target="compile"/> - <ant antfile="build.xml" dir="terminal-jansi" target="compile"/> <ant antfile="build.xml" dir="terminal-jni" target="compile"/> <ant antfile="build.xml" dir="reader" target="compile"/> + <ant antfile="build.xml" dir="shell" target="compile"/> + <ant antfile="build.xml" dir="style" target="compile"/> <ant antfile="build.xml" dir="builtins" target="compile"/> <ant antfile="build.xml" dir="console-ui" target="compile"/> + <ant antfile="build.xml" dir="prompt" target="compile"/> <ant antfile="build.xml" dir="console" target="compile"/> + <ant antfile="build.xml" dir="picocli" target="compile"/> <ant antfile="build.xml" dir="remote-telnet" target="compile"/> - <ant antfile="build.xml" dir="style" target="compile"/> - <ant antfile="build.xml" dir="curses" target="compile"/> <ant antfile="build.xml" dir="jansi-core" target="compile"/> <ant antfile="build.xml" dir="jline" target="compile"/> <ant antfile="build.xml" dir="jansi" target="compile"/> @@ -53,16 +53,16 @@ <target name="javadoc" description="Generates the Javadoc of the application"> <ant antfile="build.xml" dir="native" target="javadoc"/> <ant antfile="build.xml" dir="terminal" target="javadoc"/> - <ant antfile="build.xml" dir="terminal-jna" target="javadoc"/> - <ant antfile="build.xml" dir="terminal-jansi" target="javadoc"/> <ant antfile="build.xml" dir="terminal-jni" target="javadoc"/> <ant antfile="build.xml" dir="reader" target="javadoc"/> + <ant antfile="build.xml" dir="shell" target="javadoc"/> + <ant antfile="build.xml" dir="style" target="javadoc"/> <ant antfile="build.xml" dir="builtins" target="javadoc"/> <ant antfile="build.xml" dir="console-ui" target="javadoc"/> + <ant antfile="build.xml" dir="prompt" target="javadoc"/> <ant antfile="build.xml" dir="console" target="javadoc"/> + <ant antfile="build.xml" dir="picocli" target="javadoc"/> <ant antfile="build.xml" dir="remote-telnet" target="javadoc"/> - <ant antfile="build.xml" dir="style" target="javadoc"/> - <ant antfile="build.xml" dir="curses" target="javadoc"/> <ant antfile="build.xml" dir="jansi-core" target="javadoc"/> <ant antfile="build.xml" dir="jline" target="javadoc"/> <ant antfile="build.xml" dir="jansi" target="javadoc"/> @@ -75,16 +75,16 @@ <target name="package" description="Package the application"> <ant antfile="build.xml" dir="native" target="package"/> <ant antfile="build.xml" dir="terminal" target="package"/> - <ant antfile="build.xml" dir="terminal-jna" target="package"/> - <ant antfile="build.xml" dir="terminal-jansi" target="package"/> <ant antfile="build.xml" dir="terminal-jni" target="package"/> <ant antfile="build.xml" dir="reader" target="package"/> + <ant antfile="build.xml" dir="shell" target="package"/> + <ant antfile="build.xml" dir="style" target="package"/> <ant antfile="build.xml" dir="builtins" target="package"/> <ant antfile="build.xml" dir="console-ui" target="package"/> + <ant antfile="build.xml" dir="prompt" target="package"/> <ant antfile="build.xml" dir="console" target="package"/> + <ant antfile="build.xml" dir="picocli" target="package"/> <ant antfile="build.xml" dir="remote-telnet" target="package"/> - <ant antfile="build.xml" dir="style" target="package"/> - <ant antfile="build.xml" dir="curses" target="package"/> <ant antfile="build.xml" dir="jansi-core" target="package"/> <ant antfile="build.xml" dir="jline" target="package"/> <ant antfile="build.xml" dir="jansi" target="package"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/builtins/build.xml new/builtins/build.xml --- old/builtins/build.xml 2026-07-21 11:15:13.450945566 +0200 +++ new/builtins/build.xml 2026-06-30 17:22:25.298668021 +0200 @@ -24,13 +24,14 @@ <!-- ====================================================================== --> <path id="build.classpath"> - <pathelement location="../reader/target/classes"/> - <pathelement location="../terminal/target/classes"/> - <pathelement location="../native/target/classes"/> - <pathelement location="../style/target/classes"/> <fileset dir="../lib"> <include name="**/*.jar"/> </fileset> + <pathelement location="../native/target/classes"/> + <pathelement location="../reader/target/classes"/> + <pathelement location="../shell/target/classes"/> + <pathelement location="../style/target/classes"/> + <pathelement location="../terminal/target/classes"/> </path> <!-- ====================================================================== --> @@ -59,7 +60,9 @@ <src> <pathelement location="${build.srcDir}"/> </src> - <classpath refid="build.classpath"/> + <modulepath> + <path refid="build.classpath"/> + </modulepath> </javac> <copy todir="${build.outputDir}"> <fileset dir="${build.resourceDir}"/> @@ -72,7 +75,7 @@ <target name="javadoc" description="Generates the Javadoc of the application"> <javadoc sourcepath="${build.srcDir}" - classpathref="build.classpath" + modulepathref="build.classpath" packagenames="*" destdir="${reporting.outputDirectory}/apidocs" access="protected" @@ -112,8 +115,8 @@ <attribute name="Bundle-Name" value="JLine Builtins"/> <attribute name="Bundle-SymbolicName" value="org.jline.builtins"/> <attribute name="Bundle-Version" value="${project.version}"/> - <attribute name="Export-Package" value="org.jline.builtins;uses:="org.jline.keymap,org.jline.reader,org.jline.terminal,org.jline.utils";version="${project.version}""/> - <attribute name="Import-Package" value="org.jline.console,org.jline.keymap;version="[3.29,4)",org.jline.reader.impl.completer;version="[3.29,4)",org.jline.reader.impl;version="[3.29,4)",org.jline.reader;version="[3.29,4)",org.jline.terminal.impl;version="[3.29,4)",org.jline.terminal;version="[3.29,4)",org.jline.utils;version="[3.29,4)""/> + <attribute name="Export-Package" value="org.jline.builtins;uses:="javax.swing,org.jline.keymap,org.jline.reader,org.jline.shell,org.jline.terminal,org.jline.terminal.impl,org.jline.utils";version="${project.version}""/> + <attribute name="Import-Package" value="com.sun.net.httpserver,java.awt,java.awt.event,java.io,java.lang,java.lang.invoke,java.lang.management,java.lang.reflect,java.net,java.nio.charset,java.nio.file,java.nio.file.attribute,java.text,java.time,java.time.format,java.time.temporal,java.util,java.util.concurrent,java.util.concurrent.atomic,java.util.function,java.util.regex,java.util.stream,java.util.zip,javax.swing,org.jline.console,org.jline.keymap;version="[4.3,5)",org.jline.reader.impl.completer;version="[4.3,5)",org.jline.reader.impl;version="[4.3,5)",org.jline.reader;version="[4.3,5)",org.jline.shell;version="[4.3,5)";resolution:=optional,org.jline.terminal.impl;version="[4.3,5)",org.jline.terminal;version="[4.3,5)",org.jline.utils;version="[4.3,5)""/> <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> <attribute name="JavaPackages-Version" value="${project.version}"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/common.xml new/common.xml --- old/common.xml 2026-09-23 15:05:12.495023989 +0200 +++ new/common.xml 2026-11-12 17:34:22.410459376 +0100 @@ -3,14 +3,14 @@ <project name="common" basedir="."> <property file="build.properties"/> - <property name="project.version" value="3.30.17"/> + <property name="project.version" value="4.7.0"/> <property name="project.groupId" value="org.jline"/> <property name="project.url" value="https://github.com/jline/jline3"/> <property name="project.license.url" value="https://opensource.org/licenses/BSD-3-Clause"/> - <property name="compiler.release" value="8"/> - <property name="compiler.source" value="1.${compiler.release}"/> + <property name="compiler.release" value="11"/> + <property name="compiler.source" value="${compiler.release}"/> <property name="compiler.target" value="${compiler.source}"/> </project> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/console/build.xml new/console/build.xml --- old/console/build.xml 2026-07-21 11:16:08.578771093 +0200 +++ new/console/build.xml 2026-06-30 17:22:25.298965159 +0200 @@ -26,12 +26,11 @@ <path id="build.classpath"> <pathelement location="../builtins/target/classes"/> <pathelement location="../reader/target/classes"/> + <pathelement location="../shell/target/classes"/> <pathelement location="../style/target/classes"/> <pathelement location="../terminal/target/classes"/> <pathelement location="../native/target/classes"/> - <fileset dir="../lib"> - <include name="**/*.jar"/> - </fileset> + <pathelement location="../console-ui/target/classes"/> </path> <!-- ====================================================================== --> @@ -60,7 +59,9 @@ <src> <pathelement location="${build.srcDir}"/> </src> - <classpath refid="build.classpath"/> + <modulepath> + <path refid="build.classpath"/> + </modulepath> </javac> </target> @@ -70,7 +71,7 @@ <target name="javadoc" description="Generates the Javadoc of the application"> <javadoc sourcepath="${build.srcDir}" - classpathref="build.classpath" + modulepathref="build.classpath" packagenames="*" destdir="${reporting.outputDirectory}/apidocs" access="protected" @@ -110,8 +111,8 @@ <attribute name="Bundle-Name" value="JLine Console"/> <attribute name="Bundle-SymbolicName" value="org.jline.console"/> <attribute name="Bundle-Version" value="${project.version}"/> - <attribute name="Export-Package" value="org.jline.console.impl;uses:="org.jline.builtins,org.jline.console,org.jline.reader,org.jline.reader.impl,org.jline.reader.impl.completer,org.jline.terminal,org.jline.utils";version="${project.version}",org.jline.console;uses:="org.jline.builtins,org.jline.reader,org.jline.reader.impl.completer,org.jline.terminal,org.jline.utils";version="${project.version}",org.jline.widget;uses:="org.jline.console,org.jline.keymap,org.jline.reader,org.jline.utils";version="${project.version}""/> - <attribute name="Import-Package" value="org.jline.builtins;version="[3.29,4)",org.jline.keymap;version="[3.29,4)",org.jline.reader.impl.completer;version="[3.29,4)",org.jline.reader.impl;version="[3.29,4)",org.jline.reader;version="[3.29,4)",org.jline.terminal;version="[3.29,4)",org.jline.utils;version="[3.29,4)""/> + <attribute name="Export-Package" value="org.jline.console.impl;uses:="org.jline.builtins,org.jline.console,org.jline.reader,org.jline.reader.impl,org.jline.reader.impl.completer,org.jline.shell,org.jline.terminal,org.jline.utils";version="${project.version}",org.jline.console;uses:="org.jline.builtins,org.jline.reader,org.jline.reader.impl.completer,org.jline.terminal,org.jline.utils";version="${project.version}",org.jline.widget;uses:="org.jline.console,org.jline.keymap,org.jline.reader,org.jline.utils";version="${project.version}""/> + <attribute name="Import-Package" value="java.awt,java.io,java.lang,java.lang.invoke,java.lang.reflect,java.math,java.net,java.nio.charset,java.nio.file,java.security,java.util,java.util.function,java.util.regex,java.util.stream,org.jline.builtins;version="[4.3,5)",org.jline.keymap;version="[4.3,5)",org.jline.reader.impl.completer;version="[4.3,5)",org.jline.reader.impl;version="[4.3,5)",org.jline.reader;version="[4.3,5)",org.jline.shell;version="[4.3,5)",org.jline.terminal;version="[4.3,5)",org.jline.utils;version="[4.3,5)""/> <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> <attribute name="JavaPackages-Version" value="${project.version}"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/console-ui/build.xml new/console-ui/build.xml --- old/console-ui/build.xml 2026-07-21 11:16:12.874598543 +0200 +++ new/console-ui/build.xml 2026-06-30 17:22:25.299193692 +0200 @@ -29,9 +29,7 @@ <pathelement location="../terminal/target/classes"/> <pathelement location="../native/target/classes"/> <pathelement location="../style/target/classes"/> - <fileset dir="../lib"> - <include name="**/*.jar"/> - </fileset> + <pathelement location="../shell/target/classes"/> </path> <!-- ====================================================================== --> @@ -60,7 +58,9 @@ <src> <pathelement location="${build.srcDir}"/> </src> - <classpath refid="build.classpath"/> + <modulepath> + <path refid="build.classpath"/> + </modulepath> </javac> <copy todir="${build.outputDir}"> <fileset dir="${build.resourceDir}"/> @@ -73,7 +73,7 @@ <target name="javadoc" description="Generates the Javadoc of the application"> <javadoc sourcepath="${build.srcDir}" - classpathref="build.classpath" + modulepathref="build.classpath" packagenames="*" destdir="${reporting.outputDirectory}/apidocs" access="protected" @@ -107,14 +107,14 @@ excludes="**/package.html"> <manifest> <attribute name="Automatic-Module-Name" value="org.jline.consoleui"/> - <attribute name="Bundle-Description" value="JLine"/> + <attribute name="Bundle-Description" value="JLine Console UI - DEPRECATED: Use jline-prompt instead"/> <attribute name="Bundle-License" value="${project.license.url}"/> <attribute name="Bundle-ManifestVersion" value="2"/> - <attribute name="Bundle-Name" value="JLine Console UI"/> + <attribute name="Bundle-Name" value="JLine Console UI (Deprecated)"/> <attribute name="Bundle-SymbolicName" value="org.jline.console-ui"/> <attribute name="Bundle-Version" value="${project.version}"/> <attribute name="Export-Package" value="org.jline.consoleui.elements.items.impl;uses:="org.jline.consoleui.elements.items";version="${project.version}",org.jline.consoleui.elements.items;version="${project.version}",org.jline.consoleui.elements;uses:="org.jline.consoleui.elements.items,org.jline.reader,org.jline.utils";version="${project.version}",org.jline.consoleui.prompt.builder;uses:="org.jline.consoleui.elements,org.jline.reader,org.jline.utils";version="${project.version}",org.jline.consoleui.prompt;uses:="org.jline.consoleui.elements,org.jline.consoleui.elements.items,org.jline.consoleui.prompt.builder,org.jline.keymap,org.jline.reader,org.jline.terminal,org.jline.utils";version="${project.version}""/> - <attribute name="Import-Package" value="org.jline.builtins;version="[3.29,4)",org.jline.keymap;version="[3.29,4)",org.jline.reader.impl;version="[3.29,4)",org.jline.reader;version="[3.29,4)",org.jline.terminal;version="[3.29,4)",org.jline.utils;version="[3.29,4)""/> + <attribute name="Import-Package" value="java.io,java.lang,java.lang.invoke,java.util,java.util.function,java.util.stream,org.jline.builtins;version="[4.3,5)",org.jline.keymap;version="[4.3,5)",org.jline.reader.impl;version="[4.3,5)",org.jline.reader;version="[4.3,5)",org.jline.terminal;version="[4.3,5)",org.jline.utils;version="[4.3,5)""/> <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> <attribute name="JavaPackages-Version" value="${project.version}"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/curses/build.xml new/curses/build.xml --- old/curses/build.xml 2026-07-21 11:16:17.402704198 +0200 +++ new/curses/build.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,127 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<project name="jline-curses" default="package" basedir="."> - - <!-- ====================================================================== --> - <!-- Build environment properties --> - <!-- ====================================================================== --> - - <include file="../common.xml"/> - <property file="build.properties"/> - - <property name="project.artifactId" value="jline-curses"/> - - <property name="build.finalName" value="${project.artifactId}-${project.version}"/> - <property name="build.dir" value="target"/> - <property name="build.outputDir" value="${build.dir}/classes"/> - <property name="build.srcDir" value="src/main/java"/> - <property name="build.resourceDir" value="src/main/resources"/> - - <property name="reporting.outputDirectory" value="${build.dir}/site"/> - - <!-- ====================================================================== --> - <!-- Defining classpaths --> - <!-- ====================================================================== --> - - <path id="build.classpath"> - <pathelement location="../terminal/target/classes"/> - <pathelement location="../native/target/classes"/> - <pathelement location="../reader/target/classes"/> - <fileset dir="../lib"> - <include name="**/*.jar"/> - </fileset> - </path> - - <!-- ====================================================================== --> - <!-- Cleaning up target --> - <!-- ====================================================================== --> - - <target name="clean" description="Clean the output directory"> - <delete dir="${build.dir}"/> - </target> - - <!-- ====================================================================== --> - <!-- Compilation target --> - <!-- ====================================================================== --> - - <target name="compile" description="Compile the code"> - <mkdir dir="${build.outputDir}"/> - <javac destdir="${build.outputDir}" - nowarn="true" - debug="true" - encoding="utf-8" - optimize="false" - deprecation="true" - release="${compiler.release}" - verbose="false" - fork="false"> - <src> - <pathelement location="${build.srcDir}"/> - </src> - <classpath refid="build.classpath"/> - </javac> - </target> - - <!-- ====================================================================== --> - <!-- Javadoc target --> - <!-- ====================================================================== --> - - <target name="javadoc" description="Generates the Javadoc of the application"> - <javadoc sourcepath="${build.srcDir}" - classpathref="build.classpath" - packagenames="*" - destdir="${reporting.outputDirectory}/apidocs" - access="protected" - encoding="utf-8" - verbose="false" - version="true" - use="true" - author="true" - splitindex="false" - nodeprecated="false" - nodeprecatedlist="false" - notree="false" - noindex="false" - nohelp="false" - nonavbar="false" - serialwarn="false" - charset="ISO-8859-1" - linksource="false" - breakiterator="false"/> - </target> - - <!-- ====================================================================== --> - <!-- Package target --> - <!-- ====================================================================== --> - - <target name="package" depends="compile" description="Package the application"> - <jar jarfile="${build.dir}/${build.finalName}.jar" - compress="true" - index="false" - basedir="${build.outputDir}" - excludes="**/package.html"> - <manifest> - <attribute name="Automatic-Module-Name" value="org.jline.curses"/> - <attribute name="Bundle-Description" value="JLine"/> - <attribute name="Bundle-License" value="${project.license.url}"/> - <attribute name="Bundle-ManifestVersion" value="2"/> - <attribute name="Bundle-Name" value="JLine Curses"/> - <attribute name="Bundle-SymbolicName" value="org.jline.curses"/> - <attribute name="Bundle-Version" value="${project.version}"/> - <attribute name="Export-Package" value="org.jline.curses.impl;uses:="org.jline.curses,org.jline.terminal,org.jline.utils";version="${project.version}",org.jline.curses;uses:="org.jline.curses.impl,org.jline.terminal,org.jline.utils";version="${project.version}""/> - <attribute name="Import-Package" value="org.jline.keymap;version="[3.29,4)",org.jline.terminal;version="[3.29,4)",org.jline.utils;version="[3.29,4)""/> - <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> - <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> - <attribute name="JavaPackages-Version" value="${project.version}"/> - <attribute name="Require-Capability" value="osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=${compiler.target}))""/> - </manifest> - </jar> - </target> - - <!-- ====================================================================== --> - <!-- A dummy target for the package named after the type it creates --> - <!-- ====================================================================== --> - - <target name="jar" depends="package" description="Builds the jar for the application"/> - -</project> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jansi/build.xml new/jansi/build.xml --- old/jansi/build.xml 2026-07-21 11:16:40.306406702 +0200 +++ new/jansi/build.xml 2026-06-30 17:22:25.299412506 +0200 @@ -23,11 +23,7 @@ <!-- Defining classpaths --> <!-- ====================================================================== --> - <path id="build.classpath"> - <fileset dir="../lib"> - <include name="**/*.jar"/> - </fileset> - </path> + <path id="build.classpath"/> <!-- ====================================================================== --> <!-- Cleaning up target --> @@ -55,7 +51,9 @@ <src> <pathelement location="${build.srcDir}"/> </src> - <classpath refid="build.classpath"/> + <classpath> + <path refid="build.classpath"/> + </classpath> </javac> <copy todir="${build.outputDir}"> <fileset dir="${build.resourceDir}"/> @@ -109,8 +107,8 @@ <attribute name="Bundle-SymbolicName" value="org.jline.jansi"/> <attribute name="Bundle-Version" value="${project.version}"/> <attribute name="Embed-Dependency" value="*;scope=compile|runtime;inline=true"/> - <attribute name="Export-Package" value="org.jline.jansi.io;uses:="org.jline.jansi,org.jline.utils";version="${project.version}",org.jline.jansi;uses:="org.jline.jansi.io,org.jline.terminal";version="${project.version}",org.jline.nativ;version="${project.version}",org.jline.terminal.impl.exec;uses:="org.jline.terminal,org.jline.terminal.impl,org.jline.terminal.spi";version="${project.version}",org.jline.terminal.impl.jni.freebsd;uses:="org.jline.nativ,org.jline.terminal,org.jline.terminal.impl.jni,org.jline.terminal.spi";version="${project.version}",org.jline.terminal.impl.jni.linux;uses:="org.jline.nativ,org.jline.terminal,org.jline.terminal.impl.jni,org.jline.terminal.spi";version="${project.version}",org.jline.terminal.impl.jni.osx;uses:="org.jline.nativ,org.jline.terminal,org.jline.terminal.impl.jni,org.jline.terminal.spi";version="${project.version }",org.jline.terminal.impl.jni.solaris;uses:="org.jline.nativ,org.jline.terminal,org.jline.terminal.impl.jni,org.jline.terminal.spi";version="${project.version}",org.jline.terminal.impl.jni.win;uses:="org.jline.terminal,org.jline.terminal.impl,org.jline.terminal.spi,org.jline.utils";version="${project.version}",org.jline.terminal.impl.jni;uses:="org.jline.nativ,org.jline.terminal,org.jline.terminal.impl,org.jline.terminal.spi";version="${project.version}",org.jline.terminal.impl;uses:="org.jline.terminal,org.jline.terminal.spi,org.jline.utils";version="${project.version}",org.jline.terminal.spi;uses:="org.jline.terminal";version="${project.version}",org.jline.terminal;uses:="org.jline.terminal.spi,org.jline.utils";version="${project.version}",org.jline.utils;uses:="org.jline.terminal";version="${project.version}""/> - <attribute name="Import-Package" value="sun.misc;resolution:=optional"/> + <attribute name="Export-Package" value="org.jline.jansi.io;version="${project.version}";uses:="org.jline.jansi,org.jline.utils",org.jline.jansi;version="${project.version}";uses:="org.jline.jansi.io,org.jline.terminal",org.jline.nativ.FreeBSD.x86;version="${project.version}",org.jline.nativ.FreeBSD.x86_64;version="${project.version}",org.jline.nativ.Linux.arm64;version="${project.version}",org.jline.nativ.Linux.arm;version="${project.version}",org.jline.nativ.Linux.armv6;version="${project.version}",org.jline.nativ.Linux.armv7;version="${project.version}",org.jline.nativ.Linux.ppc64;version="${project.version}",org.jline.nativ.Linux.x86;version="${project.version}",org.jline.nativ.Linux.x86_64;version="${project.version}",org.jline.nativ.Mac.arm64;version="${project.version}",org.jline.nativ.Mac.x86;version="${project.version}" ,org.jline.nativ.Mac.x86_64;version="${project.version}",org.jline.nativ.Windows.arm64;version="${project.version}",org.jline.nativ.Windows.x86;version="${project.version}",org.jline.nativ.Windows.x86_64;version="${project.version}",org.jline.nativ;version="${project.version}",org.jline.terminal.impl.exec;uses:="org.jline.terminal,org.jline.terminal.impl,org.jline.terminal.spi";version="${project.version}",org.jline.terminal.impl.jni.freebsd;uses:="org.jline.terminal,org.jline.terminal.impl.jni,org.jline.terminal.spi";version="${project.version}",org.jline.terminal.impl.jni.linux;uses:="org.jline.terminal,org.jline.terminal.impl.jni,org.jline.terminal.spi";version="${project.version}",org.jline.terminal.impl.jni.osx;uses:="org.jline.terminal,org.jline.terminal.impl.jni,org.jline.terminal.spi";version="${project.version}",org.jline.terminal.impl.jni.solari s;uses:="org.jline.terminal,org.jline.terminal.impl.jni,org.jline.terminal.spi";version="${project.version}",org.jline.terminal.impl.jni.win;uses:="org.jline.terminal,org.jline.terminal.impl,org.jline.terminal.spi,org.jline.utils";version="${project.version}",org.jline.terminal.impl.jni;uses:="org.jline.nativ,org.jline.terminal,org.jline.terminal.impl,org.jline.terminal.spi";version="${project.version}",org.jline.terminal.impl;uses:="org.jline.terminal,org.jline.terminal.spi,org.jline.utils";version="${project.version}",org.jline.terminal.spi;uses:="org.jline.terminal";version="${project.version}",org.jline.terminal;uses:="org.jline.terminal.spi,org.jline.utils";version="${project.version}",org.jline.utils;uses:="org.jline.terminal";version="${project.version}""/> + <attribute name="Import-Package" value="java.awt,java.awt.image,java.io,java.lang,java.lang.invoke,java.lang.reflect,java.net,java.nio,java.nio.charset,java.nio.file,java.security,java.text,java.util,java.util.concurrent,java.util.concurrent.atomic,java.util.concurrent.locks,java.util.function,java.util.regex,java.util.stream,javax.imageio,sun.misc;resolution:=optional"/> <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> <attribute name="JavaPackages-Version" value="${project.version}"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jansi-core/build.xml new/jansi-core/build.xml --- old/jansi-core/build.xml 2026-07-21 11:16:51.690488576 +0200 +++ new/jansi-core/build.xml 2026-06-30 17:22:25.299604269 +0200 @@ -26,9 +26,6 @@ <path id="build.classpath"> <pathelement location="../terminal/target/classes"/> <pathelement location="../native/target/classes"/> - <fileset dir="../lib"> - <include name="**/*.jar"/> - </fileset> </path> <!-- ====================================================================== --> @@ -57,7 +54,9 @@ <src> <pathelement location="${build.srcDir}"/> </src> - <classpath refid="build.classpath"/> + <modulepath> + <path refid="build.classpath"/> + </modulepath> </javac> <copy todir="${build.outputDir}"> <fileset dir="${build.resourceDir}"/> @@ -70,7 +69,7 @@ <target name="javadoc" description="Generates the Javadoc of the application"> <javadoc sourcepath="${build.srcDir}" - classpathref="build.classpath" + modulepathref="build.classpath" packagenames="*" destdir="${reporting.outputDirectory}/apidocs" access="protected" @@ -111,7 +110,7 @@ <attribute name="Bundle-SymbolicName" value="org.jline.jansi-core"/> <attribute name="Bundle-Version" value="${project.version}"/> <attribute name="Export-Package" value="org.jline.jansi.io;uses:="org.jline.jansi,org.jline.utils";version="${project.version}",org.jline.jansi;uses:="org.jline.jansi.io,org.jline.terminal";version="${project.version}""/> - <attribute name="Import-Package" value="org.jline.terminal.impl;version="[3.29,4)",org.jline.terminal.spi;version="[3.29,4)",org.jline.terminal;version="[3.29,4)",org.jline.utils;version="[3.29,4)""/> + <attribute name="Import-Package" value="java.io,java.lang,java.lang.invoke,java.nio.charset,java.util,java.util.concurrent,org.jline.terminal.impl;version="[4.3,5)",org.jline.terminal.spi;version="[4.3,5)",org.jline.terminal;version="[4.3,5)",org.jline.utils;version="[4.3,5)""/> <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> <attribute name="JavaPackages-Version" value="${project.version}"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jline/build.xml new/jline/build.xml --- old/jline/build.xml 2025-03-21 20:21:33.271938804 +0100 +++ new/jline/build.xml 2026-06-30 17:22:25.299776862 +0200 @@ -62,7 +62,9 @@ <pathelement location="${build.srcDir}"/> </src> <exclude name="**/ffm/*.java"/> - <classpath refid="build.classpath"/> + <classpath> + <path refid="build.classpath"/> + </classpath> </javac> <copy todir="${build.outputDir}"> <fileset dir="${build.resourceDir}"/> @@ -133,8 +135,8 @@ <attribute name="Bundle-Name" value="JLine Bundle"/> <attribute name="Bundle-SymbolicName" value="org.jline"/> <attribute name="Bundle-Version" value="${project.version}"/> - <attribute name="Export-Package" value="org.jline.builtins.ssh;uses:="org.apache.sshd.client,org.apache.sshd.server,org.apache.sshd.server.channel,org.apache.sshd.server.command,org.apache.sshd.server.session,org.apache.sshd.server.shell,org.jline.reader,org.jline.terminal";version="${project.version}",org.jline.builtins.telnet;uses:="org.jline.terminal";version="${project.version}",org.jline.builtins;uses:="org.jline.keymap,org.jline.reader,org.jline.terminal,org.jline.utils";version="${project.version}",org.jline.console.impl;uses:="org.jline.builtins,org.jline.console,org.jline.reader,org.jline.reader.impl,org.jline.reader.impl.completer,org.jline.terminal,org.jline.utils";version="${project.version}",org.jline.console;uses:="org.jline.builtins,org.jline.reader,org.jline.reader.impl.completer,org.jline.terminal,org.jline.utils";version="${project.version}",org.jline.jansi.i o;uses:="org.jline.jansi,org.jline.utils";version="${project.version}",org.jline.jansi;uses:="org.jline.jansi.io,org.jline.terminal";version="${project.version}",org.jline.keymap;uses:="org.jline.terminal,org.jline.utils";version="${project.version}",org.jline.nativ;version="${project.version}",org.jline.reader.impl.completer;uses:="org.jline.reader,org.jline.terminal";version="${project.version}",org.jline.reader.impl.history;uses:="org.jline.reader";version="${project.version}",org.jline.reader.impl;uses:="org.jline.keymap,org.jline.reader,org.jline.terminal,org.jline.utils";version="${project.version}",org.jline.reader;uses:="org.jline.keymap,org.jline.terminal,org.jline.utils";version="${project.version}",org.jline.style;uses:="javax.annotation,org.jline.terminal,org.jline.utils";version="${project.version}",org .jline.terminal.impl.exec;uses:="org.jline.terminal,org.jline.terminal.impl,org.jline.terminal.spi";version="${project.version}",org.jline.terminal.impl.ffm;uses:="org.jline.terminal,org.jline.terminal.impl,org.jline.terminal.spi";version="${project.version}",org.jline.terminal.impl.jansi.freebsd;uses:="org.fusesource.jansi.internal,org.jline.terminal,org.jline.terminal.impl.jansi,org.jline.terminal.spi";version="${project.version}",org.jline.terminal.impl.jansi.linux;uses:="org.fusesource.jansi.internal,org.jline.terminal,org.jline.terminal.impl.jansi,org.jline.terminal.spi";version="${project.version}",org.jline.terminal.impl.jansi.osx;uses:="org.fusesource.jansi.internal,org.jline.terminal,org.jline.terminal.impl.jansi,org.jline.terminal.spi";version="${project.version}",org.jline.terminal.impl.jansi.solaris;uses:="org.fusesource.jansi.internal,org.jline.terminal,org.jline.ter minal.impl.jansi,org.jline.terminal.spi";version="${project.version}",org.jline.terminal.impl.jansi.win;uses:="org.jline.terminal,org.jline.terminal.impl,org.jline.terminal.spi,org.jline.utils";version="${project.version}",org.jline.terminal.impl.jansi;uses:="org.fusesource.jansi.internal,org.jline.terminal,org.jline.terminal.impl,org.jline.terminal.spi";version="${project.version}",org.jline.terminal.impl.jna.freebsd;uses:="com.sun.jna,org.jline.terminal,org.jline.terminal.impl.jna,org.jline.terminal.spi";version="${project.version}",org.jline.terminal.impl.jna.linux;uses:="com.sun.jna,org.jline.terminal,org.jline.terminal.impl.jna,org.jline.terminal.spi";version="${project.version}",org.jline.terminal.impl.jna.osx;uses:="com.sun.jna,org.jline.terminal,org.jline.terminal.impl.jna,org.jline.terminal.spi";version="${project.version}",org.jline.terminal.impl.jna.solaris;u ses:="com.sun.jna,org.jline.terminal,org.jline.terminal.impl.jna,org.jline.terminal.spi";version="${project.version}",org.jline.terminal.impl.jna.win;uses:="com.sun.jna,org.jline.terminal,org.jline.terminal.impl,org.jline.terminal.spi,org.jline.utils";version="${project.version}",org.jline.terminal.impl.jna;uses:="org.jline.terminal,org.jline.terminal.impl,org.jline.terminal.spi";version="${project.version}",org.jline.terminal.impl.jni.freebsd;uses:="org.jline.nativ,org.jline.terminal,org.jline.terminal.impl.jni,org.jline.terminal.spi";version="${project.version}",org.jline.terminal.impl.jni.linux;uses:="org.jline.nativ,org.jline.terminal,org.jline.terminal.impl.jni,org.jline.terminal.spi";version="${project.version}",org.jline.terminal.impl.jni.osx;uses:="org.jline.nativ,org.jline.terminal,org.jline.terminal.impl.jni,org.jline.terminal.spi";version="${project.version}& quot;,org.jline.terminal.impl.jni.solaris;uses:="org.jline.nativ,org.jline.terminal,org.jline.terminal.impl.jni,org.jline.terminal.spi";version="${project.version}",org.jline.terminal.impl.jni.win;uses:="org.jline.terminal,org.jline.terminal.impl,org.jline.terminal.spi,org.jline.utils";version="${project.version}",org.jline.terminal.impl.jni;uses:="org.jline.nativ,org.jline.terminal,org.jline.terminal.impl,org.jline.terminal.spi";version="${project.version}",org.jline.terminal.impl;uses:="org.jline.terminal,org.jline.terminal.spi,org.jline.utils";version="${project.version}",org.jline.terminal.spi;uses:="org.jline.terminal";version="${project.version}",org.jline.terminal;uses:="org.jline.terminal.spi,org.jline.utils";version="${project.version}",org.jline.utils;uses:="org.jline.terminal";version="${project.version}",org.jline.widget;uses:=" org.jline.console,org.jline.keymap,org.jline.reader,org.jline.utils";version="${project.version}""/> - <attribute name="Import-Package" value="com.sun.jna.ptr;resolution:=optional;version="[5.13,6)",com.sun.jna.win32;resolution:=optional;version="[5.13,6)",com.sun.jna;resolution:=optional;version="[5.13,6)",java.awt;resolution:=optional,java.io;resolution:=optional,java.lang.annotation;resolution:=optional,java.lang.foreign;resolution:=optional,java.lang.invoke;resolution:=optional,java.lang.management;resolution:=optional,java.lang.reflect;resolution:=optional,java.lang;resolution:=optional,java.math;resolution:=optional,java.net;resolution:=optional,java.nio.charset;resolution:=optional,java.nio.file.attribute;resolution:=optional,java.nio.file;resolution:=optional,java.nio;resolution:=optional,java.security;resolution:=optional,java.text;resolution:=optional,java.time.format;resolution:=optional,java.time.temporal;resolution:=optional,java.time;resolution:=optional,java.util.concurrent.atomic;resolution:=optional,java.util.concurrent.locks;res olution:=optional,java.util.concurrent;resolution:=optional,java.util.function;resolution:=optional,java.util.logging;resolution:=optional,java.util.regex;resolution:=optional,java.util.stream;resolution:=optional,java.util;resolution:=optional,javax.annotation;resolution:=optional,org.apache.sshd.client.auth.keyboard;resolution:=optional,org.apache.sshd.client.channel;resolution:=optional,org.apache.sshd.client.future;resolution:=optional,org.apache.sshd.client.session;resolution:=optional,org.apache.sshd.client;resolution:=optional,org.apache.sshd.common.channel;resolution:=optional,org.apache.sshd.common.config.keys;resolution:=optional,org.apache.sshd.common.keyprovider;resolution:=optional,org.apache.sshd.common.session;resolution:=optional,org.apache.sshd.common.util.io.input;resolution:=optional,org.apache.sshd.common.util.io.output;resolution:=optional,org.apache.sshd.common;resolution:=optional,org.apache.sshd.scp.server;resolution:=optional;version="[2.14,3)",org .apache.sshd.server.channel;resolution:=optional,org.apache.sshd.server.command;resolution:=optional,org.apache.sshd.server.keyprovider;resolution:=optional,org.apache.sshd.server.session;resolution:=optional,org.apache.sshd.server.shell;resolution:=optional,org.apache.sshd.server;resolution:=optional,org.apache.sshd.sftp.server;resolution:=optional;version="[2.14,3)",org.fusesource.jansi.internal;resolution:=optional;version="[2.4,3)",org.fusesource.jansi;resolution:=optional;version="[2.4,3)",org.slf4j;resolution:=optional;version="[1.7,2)",sun.misc;resolution:=optional"/> + <attribute name="Export-Package" value="org.jline.builtins.ssh;uses:="org.apache.sshd.client,org.apache.sshd.server,org.apache.sshd.server.channel,org.apache.sshd.server.command,org.apache.sshd.server.session,org.apache.sshd.server.shell,org.jline.reader,org.jline.terminal";version="${project.version}",org.jline.builtins.telnet;uses:="org.jline.terminal";version="${project.version}",org.jline.builtins;uses:="javax.swing,org.jline.keymap,org.jline.reader,org.jline.shell,org.jline.terminal,org.jline.terminal.impl,org.jline.utils";version="${project.version}",org.jline.console.impl;uses:="org.jline.builtins,org.jline.console,org.jline.reader,org.jline.reader.impl,org.jline.reader.impl.completer,org.jline.shell,org.jline.terminal,org.jline.utils";version="${project.version}",org.jline.console;uses:="org.jline.builtins,org.jline.reader,org.jline.reader.impl.completer,org.jline.terminal,org.jline. utils";version="${project.version}",org.jline.jansi.io;version="${project.version}";uses:="org.jline.jansi,org.jline.utils",org.jline.jansi;version="${project.version}";uses:="org.jline.jansi.io,org.jline.terminal",org.jline.keymap;uses:="org.jline.terminal,org.jline.utils";version="${project.version}",org.jline.nativ.FreeBSD.x86;version="${project.version}",org.jline.nativ.FreeBSD.x86_64;version="${project.version}",org.jline.nativ.Linux.arm64;version="${project.version}",org.jline.nativ.Linux.arm;version="${project.version}",org.jline.nativ.Linux.armv6;version="${project.version}",org.jline.nativ.Linux.armv7;version="${project.version}",org.jline.nativ.Linux.ppc64;version="${project.version}",org.jline.nativ.Linux.x86;version="${project.version}",org.jline.nativ.Linux.x86_64;version="${project.version}",org.jline.nativ .Mac.arm64;version="${project.version}",org.jline.nativ.Mac.x86;version="${project.version}",org.jline.nativ.Mac.x86_64;version="${project.version}",org.jline.nativ.Windows.arm64;version="${project.version}",org.jline.nativ.Windows.x86;version="${project.version}",org.jline.nativ.Windows.x86_64;version="${project.version}",org.jline.nativ;version="${project.version}",org.jline.reader.impl.completer;uses:="org.jline.reader";version="${project.version}",org.jline.reader.impl.history;uses:="org.jline.reader";version="${project.version}",org.jline.reader.impl;uses:="org.jline.keymap,org.jline.reader,org.jline.terminal,org.jline.utils";version="${project.version}",org.jline.reader;uses:="org.jline.keymap,org.jline.terminal,org.jline.utils";version="${project.version}",org.jline.shell.impl;uses:="org.jline.reader,org.jline.shell,org.jli ne.terminal,org.jline.utils";version="${project.version}",org.jline.shell.widget;uses:="org.jline.reader,org.jline.shell,org.jline.utils";version="${project.version}",org.jline.shell;uses:="org.jline.reader,org.jline.shell.impl,org.jline.terminal,org.jline.utils";version="${project.version}",org.jline.style;uses:="org.jline.terminal,org.jline.utils";version="${project.version}",org.jline.terminal.impl.exec;uses:="org.jline.terminal,org.jline.terminal.impl,org.jline.terminal.spi";version="${project.version}",org.jline.terminal.impl.ffm;uses:="org.jline.terminal,org.jline.terminal.impl,org.jline.terminal.spi";version="${project.version}",org.jline.terminal.impl.jni.freebsd;uses:="org.jline.terminal,org.jline.terminal.impl.jni,org.jline.terminal.spi";version="${project.version}",org.jline.terminal.impl.jni.linux;uses:="org.jline.terminal,org.jline. terminal.impl.jni,org.jline.terminal.spi";version="${project.version}",org.jline.terminal.impl.jni.osx;uses:="org.jline.terminal,org.jline.terminal.impl.jni,org.jline.terminal.spi";version="${project.version}",org.jline.terminal.impl.jni.solaris;uses:="org.jline.terminal,org.jline.terminal.impl.jni,org.jline.terminal.spi";version="${project.version}",org.jline.terminal.impl.jni.win;uses:="org.jline.terminal,org.jline.terminal.impl,org.jline.terminal.spi,org.jline.utils";version="${project.version}",org.jline.terminal.impl.jni;uses:="org.jline.nativ,org.jline.terminal,org.jline.terminal.impl,org.jline.terminal.spi";version="${project.version}",org.jline.terminal.impl;uses:="org.jline.terminal,org.jline.terminal.spi,org.jline.utils";version="${project.version}",org.jline.terminal.spi;uses:="org.jline.terminal";version="${project.version}",org.jline.ter minal;uses:="org.jline.terminal.spi,org.jline.utils";version="${project.version}",org.jline.utils;uses:="org.jline.terminal";version="${project.version}",org.jline.widget;uses:="org.jline.console,org.jline.keymap,org.jline.reader,org.jline.utils";version="${project.version}""/> + <attribute name="Import-Package" value="com.sun.net.httpserver;resolution:=optional,java.awt.event;resolution:=optional,java.awt.image;resolution:=optional,java.awt;resolution:=optional,java.io;resolution:=optional,java.lang.annotation;resolution:=optional,java.lang.foreign;resolution:=optional,java.lang.invoke;resolution:=optional,java.lang.management;resolution:=optional,java.lang.reflect;resolution:=optional,java.lang.runtime;resolution:=optional,java.lang;resolution:=optional,java.math;resolution:=optional,java.net;resolution:=optional,java.nio.charset;resolution:=optional,java.nio.file.attribute;resolution:=optional,java.nio.file;resolution:=optional,java.nio;resolution:=optional,java.security;resolution:=optional,java.text;resolution:=optional,java.time.format;resolution:=optional,java.time.temporal;resolution:=optional,java.time;resolution:=optional,java.util.concurrent.atomic;resolution:=optional,java.util.concurrent.locks;resolution:=optional,java.util.concurrent;re solution:=optional,java.util.function;resolution:=optional,java.util.regex;resolution:=optional,java.util.stream;resolution:=optional,java.util.zip;resolution:=optional,java.util;resolution:=optional,javax.imageio;resolution:=optional,javax.swing;resolution:=optional,org.apache.sshd.client.auth.keyboard;resolution:=optional,org.apache.sshd.client.channel;resolution:=optional,org.apache.sshd.client.future;resolution:=optional,org.apache.sshd.client.session;resolution:=optional,org.apache.sshd.client;resolution:=optional,org.apache.sshd.common.channel;resolution:=optional,org.apache.sshd.common.config.keys;resolution:=optional,org.apache.sshd.common.keyprovider;resolution:=optional,org.apache.sshd.common.session;resolution:=optional,org.apache.sshd.common.util.io.input;resolution:=optional,org.apache.sshd.common.util.io.output;resolution:=optional,org.apache.sshd.common;resolution:=optional,org.apache.sshd.scp.server;resolution:=optional;version="[2.18,3)",org.apache.sshd.se rver.channel;resolution:=optional,org.apache.sshd.server.command;resolution:=optional,org.apache.sshd.server.keyprovider;resolution:=optional,org.apache.sshd.server.session;resolution:=optional,org.apache.sshd.server.shell;resolution:=optional,org.apache.sshd.server;resolution:=optional,org.apache.sshd.sftp.server;resolution:=optional;version="[2.18,3)",org.slf4j;resolution:=optional;version="[2.0,3)",sun.misc;resolution:=optional"/> <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> <attribute name="JavaPackages-Version" value="${project.version}"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/native/build.xml new/native/build.xml --- old/native/build.xml 2026-07-21 11:17:13.051905625 +0200 +++ new/native/build.xml 2026-06-30 17:22:25.299966834 +0200 @@ -24,11 +24,7 @@ <!-- Defining classpaths --> <!-- ====================================================================== --> - <path id="build.classpath"> - <fileset dir="../lib"> - <include name="**/*.jar"/> - </fileset> - </path> + <path id="build.classpath"/> <!-- ====================================================================== --> <!-- Cleaning up target --> @@ -56,7 +52,9 @@ <src> <pathelement location="${build.srcDir}"/> </src> - <classpath refid="build.classpath"/> + <modulepath> + <path refid="build.classpath"/> + </modulepath> </javac> <copy todir="${build.outputDir}"> <fileset dir="${build.resourceDir}"> @@ -76,7 +74,7 @@ <target name="javadoc" description="Generates the Javadoc of the application"> <javadoc sourcepath="${build.srcDir}" - classpathref="build.classpath" + modulepathref="build.classpath" packagenames="*" destdir="${reporting.outputDirectory}/apidocs" access="protected" @@ -117,6 +115,7 @@ <attribute name="Bundle-SymbolicName" value="org.jline.native"/> <attribute name="Bundle-Version" value="${project.version}"/> <attribute name="Export-Package" value="org.jline.nativ;version="${project.version}""/> + <attribute name="Import-Package" value="java.io,java.lang,java.lang.invoke,java.net,java.nio.charset,java.nio.file,java.util,java.util.concurrent"/> <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> <attribute name="JavaPackages-Version" value="${project.version}"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/picocli/build.xml new/picocli/build.xml --- old/picocli/build.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/picocli/build.xml 2026-06-30 17:22:25.300134862 +0200 @@ -0,0 +1,132 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="jline-picocli" default="package" basedir="."> + + <!-- ====================================================================== --> + <!-- Build environment properties --> + <!-- ====================================================================== --> + + <include file="../common.xml"/> + <property file="build.properties"/> + + <property name="project.artifactId" value="jline-picocli"/> + + <property name="build.finalName" value="${project.artifactId}-${project.version}"/> + <property name="build.dir" value="target"/> + <property name="build.outputDir" value="${build.dir}/classes"/> + <property name="build.srcDir" value="src/main/java"/> + <property name="build.resourceDir" value="src/main/resources"/> + + <property name="reporting.outputDirectory" value="${build.dir}/site"/> + + <!-- ====================================================================== --> + <!-- Defining classpaths --> + <!-- ====================================================================== --> + + <path id="build.classpath"> + <pathelement location="../builtins/target/classes"/> + <pathelement location="../console/target/classes"/> + <pathelement location="../reader/target/classes"/> + <pathelement location="../shell/target/classes"/> + <pathelement location="../style/target/classes"/> + <pathelement location="../terminal/target/classes"/> + <fileset dir="../lib"> + <include name="**/*.jar"/> + </fileset> + </path> + + <!-- ====================================================================== --> + <!-- Cleaning up target --> + <!-- ====================================================================== --> + + <target name="clean" description="Clean the output directory"> + <delete dir="${build.dir}"/> + </target> + + <!-- ====================================================================== --> + <!-- Compilation target --> + <!-- ====================================================================== --> + + <target name="compile" description="Compile the code"> + <mkdir dir="${build.outputDir}"/> + <javac destdir="${build.outputDir}" + nowarn="true" + debug="true" + encoding="utf-8" + optimize="false" + deprecation="true" + release="${compiler.release}" + verbose="false" + fork="false"> + <src> + <pathelement location="${build.srcDir}"/> + </src> + <modulepath> + <path refid="build.classpath"/> + </modulepath> + </javac> + </target> + + <!-- ====================================================================== --> + <!-- Javadoc target --> + <!-- ====================================================================== --> + + <target name="javadoc" description="Generates the Javadoc of the application"> + <javadoc sourcepath="${build.srcDir}" + modulepathref="build.classpath" + packagenames="*" + destdir="${reporting.outputDirectory}/apidocs" + access="protected" + encoding="utf-8" + verbose="false" + version="true" + use="true" + author="true" + splitindex="false" + nodeprecated="false" + nodeprecatedlist="false" + notree="false" + noindex="false" + nohelp="false" + nonavbar="false" + serialwarn="false" + charset="ISO-8859-1" + linksource="false" + breakiterator="false"/> + </target> + + <!-- ====================================================================== --> + <!-- Package target --> + <!-- ====================================================================== --> + + <target name="package" depends="compile" description="Package the application"> + <jar jarfile="${build.dir}/${build.finalName}.jar" + compress="true" + index="false" + basedir="${build.outputDir}" + excludes="**/package.html"> + <manifest> + <attribute name="Automatic-Module-Name" value="org.jline.picocli"/> + <attribute name="Bundle-Description" value="JLine"/> + <attribute name="Bundle-License" value="${project.license.url}"/> + <attribute name="Bundle-ManifestVersion" value="2"/> + <attribute name="Bundle-Name" value="JLine Picocli"/> + <attribute name="Bundle-SymbolicName" value="org.jline.picocli"/> + <attribute name="Bundle-Version" value="${project.version}"/> + <attribute name="Export-Package" value="org.jline.picocli;uses:="org.jline.console,org.jline.reader,org.jline.reader.impl.completer,org.jline.shell,picocli";version="${project.version}""/> + <attribute name="Import-Package" value="java.io,java.lang,java.lang.invoke,java.util,org.jline.console.impl;version="[4.3,5)",org.jline.console;version="[4.3,5)",org.jline.reader.impl.completer;version="[4.3,5)",org.jline.reader;version="[4.3,5)",org.jline.shell;version="[4.3,5)",org.jline.terminal;version="[4.3,5)",org.jline.utils;version="[4.3,5)",picocli"/> + <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> + <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> + <attribute name="JavaPackages-Version" value="${project.version}"/> + <attribute name="Require-Capability" value="osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=${compiler.target}))""/> + </manifest> + </jar> + </target> + + <!-- ====================================================================== --> + <!-- A dummy target for the package named after the type it creates --> + <!-- ====================================================================== --> + + <target name="jar" depends="package" description="Builds the jar for the application"/> + +</project> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prompt/build.xml new/prompt/build.xml --- old/prompt/build.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/prompt/build.xml 2026-06-30 17:22:25.300318831 +0200 @@ -0,0 +1,130 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="jline-prompt" default="package" basedir="."> + + <!-- ====================================================================== --> + <!-- Build environment properties --> + <!-- ====================================================================== --> + + <include file="../common.xml"/> + <property file="build.properties"/> + + <property name="project.artifactId" value="jline-prompt"/> + + <property name="build.finalName" value="${project.artifactId}-${project.version}"/> + <property name="build.dir" value="target"/> + <property name="build.outputDir" value="${build.dir}/classes"/> + <property name="build.srcDir" value="src/main/java"/> + <property name="build.resourceDir" value="src/main/resources"/> + + <property name="reporting.outputDirectory" value="${build.dir}/site"/> + + <!-- ====================================================================== --> + <!-- Defining classpaths --> + <!-- ====================================================================== --> + + <path id="build.classpath"> + <pathelement location="../terminal/target/classes"/> + <pathelement location="../reader/target/classes"/> + <pathelement location="../style/target/classes"/> + <pathelement location="../builtins/target/classes"/> + <fileset dir="../lib"> + <include name="**/*.jar"/> + </fileset> + </path> + + <!-- ====================================================================== --> + <!-- Cleaning up target --> + <!-- ====================================================================== --> + + <target name="clean" description="Clean the output directory"> + <delete dir="${build.dir}"/> + </target> + + <!-- ====================================================================== --> + <!-- Compilation target --> + <!-- ====================================================================== --> + + <target name="compile" description="Compile the code"> + <mkdir dir="${build.outputDir}"/> + <javac destdir="${build.outputDir}" + nowarn="true" + debug="true" + encoding="utf-8" + optimize="false" + deprecation="true" + release="${compiler.release}" + verbose="false" + fork="false"> + <src> + <pathelement location="${build.srcDir}"/> + </src> + <modulepath> + <path refid="build.classpath"/> + </modulepath> + </javac> + </target> + + <!-- ====================================================================== --> + <!-- Javadoc target --> + <!-- ====================================================================== --> + + <target name="javadoc" description="Generates the Javadoc of the application"> + <javadoc sourcepath="${build.srcDir}" + modulepathref="build.classpath" + packagenames="*" + destdir="${reporting.outputDirectory}/apidocs" + access="protected" + encoding="utf-8" + verbose="false" + version="true" + use="true" + author="true" + splitindex="false" + nodeprecated="false" + nodeprecatedlist="false" + notree="false" + noindex="false" + nohelp="false" + nonavbar="false" + serialwarn="false" + charset="ISO-8859-1" + linksource="false" + breakiterator="false"/> + </target> + + <!-- ====================================================================== --> + <!-- Package target --> + <!-- ====================================================================== --> + + <target name="package" depends="compile" description="Package the application"> + <jar jarfile="${build.dir}/${build.finalName}.jar" + compress="true" + index="false" + basedir="${build.outputDir}" + excludes="**/package.html"> + <manifest> + <attribute name="Automatic-Module-Name" value="org.jline.prompt"/> + <attribute name="Bundle-Description" value="JLine Prompt API"/> + <attribute name="Bundle-License" value="${project.license.url}"/> + <attribute name="Bundle-ManifestVersion" value="2"/> + <attribute name="Bundle-Name" value="JLine Prompt"/> + <attribute name="Bundle-SymbolicName" value="org.jline.prompt"/> + <attribute name="Bundle-Version" value="${project.version}"/> + <attribute name="Export-Package" value="org.jline.prompt.examples;version="${project.version}",org.jline.prompt.impl;uses:="org.jline.prompt,org.jline.reader,org.jline.terminal,org.jline.utils";version="${project.version}",org.jline.prompt;uses:="org.jline.reader,org.jline.terminal,org.jline.utils";version="${project.version}""/> + <attribute name="Import-Package" value="java.io,java.lang,java.lang.invoke,java.nio.file,java.util,java.util.function,java.util.stream,org.jline.builtins;version="[4.3,5)",org.jline.keymap;version="[4.3,5)",org.jline.reader;version="[4.3,5)",org.jline.terminal;version="[4.3,5)",org.jline.utils;version="[4.3,5)""/> + <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> + <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> + <attribute name="JavaPackages-Version" value="${project.version}"/> + <attribute name="Require-Capability" value="osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=${compiler.target}))""/> + </manifest> + </jar> + </target> + + <!-- ====================================================================== --> + <!-- A dummy target for the package named after the type it creates --> + <!-- ====================================================================== --> + + <target name="jar" depends="package" description="Builds the jar for the application"/> + +</project> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/reader/build.xml new/reader/build.xml --- old/reader/build.xml 2026-07-21 11:17:26.403091316 +0200 +++ new/reader/build.xml 2026-06-30 17:22:25.300492066 +0200 @@ -26,9 +26,6 @@ <path id="build.classpath"> <pathelement location="../terminal/target/classes"/> <pathelement location="../native/target/classes"/> - <fileset dir="../lib"> - <include name="**/*.jar"/> - </fileset> </path> <!-- ====================================================================== --> @@ -57,7 +54,9 @@ <src> <pathelement location="${build.srcDir}"/> </src> - <classpath refid="build.classpath"/> + <modulepath> + <path refid="build.classpath"/> + </modulepath> </javac> </target> @@ -67,7 +66,7 @@ <target name="javadoc" description="Generates the Javadoc of the application"> <javadoc sourcepath="${build.srcDir}" - classpathref="build.classpath" + modulepathref="build.classpath" packagenames="*" destdir="${reporting.outputDirectory}/apidocs" access="protected" @@ -107,8 +106,8 @@ <attribute name="Bundle-Name" value="JLine Reader"/> <attribute name="Bundle-SymbolicName" value="org.jline.reader"/> <attribute name="Bundle-Version" value="${project.version}"/> - <attribute name="Export-Package" value="org.jline.keymap;uses:="org.jline.terminal,org.jline.utils";version="${project.version}",org.jline.reader.impl.completer;uses:="org.jline.reader,org.jline.terminal";version="${project.version}",org.jline.reader.impl.history;uses:="org.jline.reader";version="${project.version}",org.jline.reader.impl;uses:="org.jline.keymap,org.jline.reader,org.jline.terminal,org.jline.utils";version="${project.version}",org.jline.reader;uses:="org.jline.keymap,org.jline.terminal,org.jline.utils";version="${project.version}""/> - <attribute name="Import-Package" value="org.jline.builtins,org.jline.terminal;version="[3.29,4)",org.jline.utils;version="[3.29,4)""/> + <attribute name="Export-Package" value="org.jline.keymap;uses:="org.jline.terminal,org.jline.utils";version="${project.version}",org.jline.reader.impl.completer;uses:="org.jline.reader";version="${project.version}",org.jline.reader.impl.history;uses:="org.jline.reader";version="${project.version}",org.jline.reader.impl;uses:="org.jline.keymap,org.jline.reader,org.jline.terminal,org.jline.utils";version="${project.version}",org.jline.reader;uses:="org.jline.keymap,org.jline.terminal,org.jline.utils";version="${project.version}""/> + <attribute name="Import-Package" value="java.io,java.lang,java.lang.invoke,java.lang.reflect,java.net,java.nio.file,java.nio.file.attribute,java.time,java.util,java.util.concurrent.atomic,java.util.concurrent.locks,java.util.function,java.util.regex,java.util.stream,org.jline.builtins,org.jline.terminal.impl;version="[4.3,5)",org.jline.terminal;version="[4.3,5)",org.jline.utils;version="[4.3,5)""/> <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> <attribute name="JavaPackages-Version" value="${project.version}"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/remote-ssh/build.xml new/remote-ssh/build.xml --- old/remote-ssh/build.xml 2025-03-21 20:21:04.440616382 +0100 +++ new/remote-ssh/build.xml 2026-06-30 17:22:25.300660287 +0200 @@ -60,7 +60,9 @@ <src> <pathelement location="${build.srcDir}"/> </src> - <classpath refid="build.classpath"/> + <modulepath> + <path refid="build.classpath"/> + </modulepath> </javac> </target> @@ -70,7 +72,7 @@ <target name="javadoc" description="Generates the Javadoc of the application"> <javadoc sourcepath="${build.srcDir}" - classpathref="build.classpath" + modulepathref="build.classpath" packagenames="*" destdir="${reporting.outputDirectory}/apidocs" access="protected" @@ -111,7 +113,7 @@ <attribute name="Bundle-SymbolicName" value="org.jline.remote-ssh"/> <attribute name="Bundle-Version" value="${project.version}"/> <attribute name="Export-Package" value="org.jline.builtins.ssh;uses:="org.apache.sshd.client,org.apache.sshd.server,org.apache.sshd.server.channel,org.apache.sshd.server.command,org.apache.sshd.server.session,org.apache.sshd.server.shell,org.jline.reader,org.jline.terminal";version="${project.version}""/> - <attribute name="Import-Package" value="org.apache.sshd.client.auth.keyboard;resolution:=optional,org.apache.sshd.client.channel;resolution:=optional,org.apache.sshd.client.future;resolution:=optional,org.apache.sshd.client.session;resolution:=optional,org.apache.sshd.client;resolution:=optional,org.apache.sshd.common.channel;resolution:=optional,org.apache.sshd.common.config.keys;resolution:=optional,org.apache.sshd.common.keyprovider;resolution:=optional,org.apache.sshd.common.session;resolution:=optional,org.apache.sshd.common.util.io.input;resolution:=optional,org.apache.sshd.common.util.io.output;resolution:=optional,org.apache.sshd.common;resolution:=optional,org.apache.sshd.scp.server;version="[2.14,3)";resolution:=optional,org.apache.sshd.server.channel;resolution:=optional,org.apache.sshd.server.command;resolution:=optional,org.apache.sshd.server.keyprovider;resolution:=optional,org.apache.sshd.server.session;resolution:=optional,org.apache.sshd.server.she ll;resolution:=optional,org.apache.sshd.server;resolution:=optional,org.apache.sshd.sftp.server;version="[2.14,3)";resolution:=optional,org.jline.builtins;version="[3.29,4)",org.jline.reader;version="[3.29,4)",org.jline.terminal;version="[3.29,4)",org.slf4j;version="[1.7,2)";resolution:=optional"/> + <attribute name="Import-Package" value="java.io,java.lang,java.lang.invoke,java.util,java.util.function,org.apache.sshd.client.auth.keyboard;resolution:=optional,org.apache.sshd.client.channel;resolution:=optional,org.apache.sshd.client.future;resolution:=optional,org.apache.sshd.client.session;resolution:=optional,org.apache.sshd.client;resolution:=optional,org.apache.sshd.common.channel;resolution:=optional,org.apache.sshd.common.config.keys;resolution:=optional,org.apache.sshd.common.keyprovider;resolution:=optional,org.apache.sshd.common.session;resolution:=optional,org.apache.sshd.common.util.io.input;resolution:=optional,org.apache.sshd.common.util.io.output;resolution:=optional,org.apache.sshd.common;resolution:=optional,org.apache.sshd.scp.server;version="[2.18,3)";resolution:=optional,org.apache.sshd.server.channel;resolution:=optional,org.apache.sshd.server.command;resolution:=optional,org.apache.sshd.server.keyprovider;resolution:=optional,org.apache.ssh d.server.session;resolution:=optional,org.apache.sshd.server.shell;resolution:=optional,org.apache.sshd.server;resolution:=optional,org.apache.sshd.sftp.server;version="[2.18,3)";resolution:=optional,org.jline.builtins;version="[4.3,5)",org.jline.reader;version="[4.3,5)",org.jline.terminal;version="[4.3,5)",org.slf4j;version="[2.0,3)";resolution:=optional"/> <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> <attribute name="JavaPackages-Version" value="${project.version}"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/remote-telnet/build.xml new/remote-telnet/build.xml --- old/remote-telnet/build.xml 2026-07-21 11:17:42.547263612 +0200 +++ new/remote-telnet/build.xml 2026-06-30 17:22:25.300831969 +0200 @@ -28,9 +28,6 @@ <pathelement location="../terminal/target/classes"/> <pathelement location="../native/target/classes"/> <pathelement location="../style/target/classes"/> - <fileset dir="../lib"> - <include name="**/*.jar"/> - </fileset> </path> <!-- ====================================================================== --> @@ -59,7 +56,9 @@ <src> <pathelement location="${build.srcDir}"/> </src> - <classpath refid="build.classpath"/> + <modulepath> + <path refid="build.classpath"/> + </modulepath> </javac> </target> @@ -69,7 +68,7 @@ <target name="javadoc" description="Generates the Javadoc of the application"> <javadoc sourcepath="${build.srcDir}" - classpathref="build.classpath" + modulepathref="build.classpath" packagenames="*" destdir="${reporting.outputDirectory}/apidocs" access="protected" @@ -110,7 +109,7 @@ <attribute name="Bundle-SymbolicName" value="org.jline.remote-telnet"/> <attribute name="Bundle-Version" value="${project.version}"/> <attribute name="Export-Package" value="org.jline.builtins.telnet;uses:="org.jline.terminal";version="${project.version}""/> - <attribute name="Import-Package" value="org.jline.builtins;version="[3.29,4)",org.jline.terminal;version="[3.29,4)""/> + <attribute name="Import-Package" value="java.io,java.lang,java.lang.invoke,java.net,java.text,java.util,java.util.concurrent,org.jline.builtins;version="[4.3,5)",org.jline.terminal;version="[4.3,5)""/> <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> <attribute name="JavaPackages-Version" value="${project.version}"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shell/build.xml new/shell/build.xml --- old/shell/build.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/shell/build.xml 2026-06-30 17:22:25.300999718 +0200 @@ -0,0 +1,129 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="jline-shell" default="package" basedir="."> + + <!-- ====================================================================== --> + <!-- Build environment properties --> + <!-- ====================================================================== --> + + <include file="../common.xml"/> + <property file="build.properties"/> + + <property name="project.artifactId" value="jline-shell"/> + + <property name="build.finalName" value="${project.artifactId}-${project.version}"/> + <property name="build.dir" value="target"/> + <property name="build.outputDir" value="${build.dir}/classes"/> + <property name="build.srcDir" value="src/main/java"/> + <property name="build.resourceDir" value="src/main/resources"/> + + <property name="reporting.outputDirectory" value="${build.dir}/site"/> + + <!-- ====================================================================== --> + <!-- Defining classpaths --> + <!-- ====================================================================== --> + + <path id="build.classpath"> + <pathelement location="../reader/target/classes"/> + <pathelement location="../terminal/target/classes"/> + <pathelement location="../native/target/classes"/> + <fileset dir="../lib"> + <include name="**/*.jar"/> + </fileset> + </path> + + <!-- ====================================================================== --> + <!-- Cleaning up target --> + <!-- ====================================================================== --> + + <target name="clean" description="Clean the output directory"> + <delete dir="${build.dir}"/> + </target> + + <!-- ====================================================================== --> + <!-- Compilation target --> + <!-- ====================================================================== --> + + <target name="compile" description="Compile the code"> + <mkdir dir="${build.outputDir}"/> + <javac destdir="${build.outputDir}" + nowarn="true" + debug="true" + encoding="utf-8" + optimize="false" + deprecation="true" + release="${compiler.release}" + verbose="false" + fork="false"> + <src> + <pathelement location="${build.srcDir}"/> + </src> + <modulepath> + <path refid="build.classpath"/> + </modulepath> + </javac> + </target> + + <!-- ====================================================================== --> + <!-- Javadoc target --> + <!-- ====================================================================== --> + + <target name="javadoc" description="Generates the Javadoc of the application"> + <javadoc sourcepath="${build.srcDir}" + modulepathref="build.classpath" + packagenames="*" + destdir="${reporting.outputDirectory}/apidocs" + access="protected" + encoding="utf-8" + verbose="false" + version="true" + use="true" + author="true" + splitindex="false" + nodeprecated="false" + nodeprecatedlist="false" + notree="false" + noindex="false" + nohelp="false" + nonavbar="false" + serialwarn="false" + charset="ISO-8859-1" + linksource="false" + breakiterator="false"/> + </target> + + <!-- ====================================================================== --> + <!-- Package target --> + <!-- ====================================================================== --> + + <target name="package" depends="compile" description="Package the application"> + <jar jarfile="${build.dir}/${build.finalName}.jar" + compress="true" + index="false" + basedir="${build.outputDir}" + excludes="**/package.html"> + <manifest> + <attribute name="Automatic-Module-Name" value="org.jline.shell"/> + <attribute name="Bundle-Description" value="JLine"/> + <attribute name="Bundle-License" value="${project.license.url}"/> + <attribute name="Bundle-ManifestVersion" value="2"/> + <attribute name="Bundle-Name" value="JLine Shell"/> + <attribute name="Bundle-SymbolicName" value="org.jline.shell"/> + <attribute name="Bundle-Version" value="${project.version}"/> + <attribute name="Export-Package" value="org.jline.shell.impl;uses:="org.jline.reader,org.jline.shell,org.jline.terminal,org.jline.utils";version="${project.version}",org.jline.shell.widget;uses:="org.jline.reader,org.jline.shell,org.jline.utils";version="${project.version}",org.jline.shell;uses:="org.jline.reader,org.jline.shell.impl,org.jline.terminal,org.jline.utils";version="${project.version}""/> + <attribute name="Import-Package" value="java.io,java.lang,java.lang.invoke,java.nio.file,java.nio.file.attribute,java.security,java.util,java.util.concurrent,java.util.concurrent.atomic,java.util.function,java.util.regex,java.util.stream,org.jline.keymap;version="[4.3,5)",org.jline.reader.impl.completer;version="[4.3,5)",org.jline.reader.impl;version="[4.3,5)",org.jline.reader;version="[4.3,5)",org.jline.terminal;version="[4.3,5)",org.jline.utils;version="[4.3,5)""/> + <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> + <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> + <attribute name="JavaPackages-Version" value="${project.version}"/> + <attribute name="Require-Capability" value="osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=${compiler.target}))""/> + </manifest> + </jar> + </target> + + <!-- ====================================================================== --> + <!-- A dummy target for the package named after the type it creates --> + <!-- ====================================================================== --> + + <target name="jar" depends="package" description="Builds the jar for the application"/> + +</project> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/style/build.xml new/style/build.xml --- old/style/build.xml 2025-03-21 20:20:47.823314105 +0100 +++ new/style/build.xml 2026-06-30 17:22:25.301172069 +0200 @@ -57,7 +57,9 @@ <src> <pathelement location="${build.srcDir}"/> </src> - <classpath refid="build.classpath"/> + <modulepath> + <path refid="build.classpath"/> + </modulepath> </javac> </target> @@ -67,7 +69,7 @@ <target name="javadoc" description="Generates the Javadoc of the application"> <javadoc sourcepath="${build.srcDir}" - classpathref="build.classpath" + modulepathref="build.classpath" packagenames="*" destdir="${reporting.outputDirectory}/apidocs" access="protected" @@ -107,8 +109,8 @@ <attribute name="Bundle-Name" value="JLine Style"/> <attribute name="Bundle-SymbolicName" value="org.jline.style"/> <attribute name="Bundle-Version" value="${project.version}"/> - <attribute name="Export-Package" value="org.jline.style;uses:="javax.annotation,org.jline.terminal,org.jline.utils";version="${project.version}""/> - <attribute name="Import-Package" value="javax.annotation;resolution:=optional,org.jline.terminal;version="[3.29,4)",org.jline.utils;version="[3.29,4)""/> + <attribute name="Export-Package" value="org.jline.style;uses:="org.jline.terminal,org.jline.utils";version="${project.version}""/> + <attribute name="Import-Package" value="java.io,java.lang,java.lang.annotation,java.lang.invoke,java.lang.reflect,java.util,java.util.concurrent,java.util.function,org.jline.terminal;version="[4.3,5)",org.jline.utils;version="[4.3,5)""/> <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> <attribute name="JavaPackages-Version" value="${project.version}"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/terminal/build.xml new/terminal/build.xml --- old/terminal/build.xml 2026-07-21 11:17:59.955407293 +0200 +++ new/terminal/build.xml 2026-06-30 17:22:25.301352845 +0200 @@ -24,9 +24,6 @@ <path id="build.classpath"> <pathelement location="../native/target/classes"/> - <fileset dir="../lib"> - <include name="**/*.jar"/> - </fileset> </path> <!-- ====================================================================== --> @@ -55,7 +52,9 @@ <src> <pathelement location="${build.srcDir}"/> </src> - <classpath refid="build.classpath"/> + <modulepath> + <path refid="build.classpath"/> + </modulepath> </javac> <copy todir="${build.outputDir}"> <fileset dir="${build.resourceDir}"/> @@ -68,7 +67,7 @@ <target name="javadoc" description="Generates the Javadoc of the application"> <javadoc sourcepath="${build.srcDir}" - classpathref="build.classpath" + modulepathref="build.classpath" packagenames="*" destdir="${reporting.outputDirectory}/apidocs" access="protected" @@ -109,7 +108,7 @@ <attribute name="Bundle-SymbolicName" value="org.jline.terminal"/> <attribute name="Bundle-Version" value="${project.version}"/> <attribute name="Export-Package" value="org.jline.terminal.impl.exec;uses:="org.jline.terminal,org.jline.terminal.impl,org.jline.terminal.spi";version="${project.version}",org.jline.terminal.impl;uses:="org.jline.terminal,org.jline.terminal.spi,org.jline.utils";version="${project.version}",org.jline.terminal.spi;uses:="org.jline.terminal";version="${project.version}",org.jline.terminal;uses:="org.jline.terminal.spi,org.jline.utils";version="${project.version}",org.jline.utils;uses:="org.jline.terminal";version="${project.version}""/> - <attribute name="Import-Package" value="org.jline.nativ;version="[3.29,4)",sun.misc;resolution:=optional"/> + <attribute name="Import-Package" value="java.awt,java.awt.image,java.io,java.lang,java.lang.invoke,java.lang.reflect,java.nio,java.nio.charset,java.security,java.text,java.util,java.util.concurrent,java.util.concurrent.atomic,java.util.concurrent.locks,java.util.function,java.util.regex,java.util.stream,javax.imageio,org.jline.nativ;version="[4.3,5)",sun.misc;resolution:=optional"/> <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> <attribute name="JavaPackages-Version" value="${project.version}"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/terminal-ffm/build.xml new/terminal-ffm/build.xml --- old/terminal-ffm/build.xml 2026-07-21 11:18:12.203322391 +0200 +++ new/terminal-ffm/build.xml 2026-09-23 17:32:15.546628707 +0200 @@ -14,8 +14,11 @@ <property name="build.finalName" value="${project.artifactId}-${project.version}"/> <property name="build.dir" value="target"/> <property name="build.outputDir" value="${build.dir}/classes"/> + <property name="build.outputDirJava22" value="${build.outputDir}/META-INF/versions/22"/> <property name="build.srcDir" value="src/main/java"/> + <property name="build.srcDirJava22" value="src/main/java22"/> <property name="build.resourceDir" value="src/main/resources"/> + <property name="module.name" value="org.jline.terminal.ffm"/> <property name="reporting.outputDirectory" value="${build.dir}/site"/> @@ -26,9 +29,6 @@ <path id="build.classpath"> <pathelement location="../terminal/target/classes"/> <pathelement location="../native/target/classes"/> - <fileset dir="../lib"> - <include name="**/*.jar"/> - </fileset> </path> <!-- ====================================================================== --> @@ -45,6 +45,7 @@ <target name="compile" description="Compile the code"> <mkdir dir="${build.outputDir}"/> + <echo message="Basic build without module-info.java"/> <javac destdir="${build.outputDir}" nowarn="true" debug="true" @@ -57,7 +58,29 @@ <src> <pathelement location="${build.srcDir}"/> </src> - <classpath refid="build.classpath"/> + <classpath> + <path refid="build.classpath"/> + </classpath> + </javac> + <mkdir dir="${build.outputDirJava22}"/> + <echo message="Build only module-info.java"/> + <javac destdir="${build.outputDirJava22}" + nowarn="true" + debug="true" + encoding="utf-8" + optimize="false" + deprecation="true" + release="22" + verbose="false" + fork="false"> + <src> + <pathelement location="${build.srcDirJava22}"/> + </src> + <modulepath> + <path refid="build.classpath"/> + </modulepath> + <compilerarg value="--patch-module"/> + <compilerarg value="${module.name}=${build.outputDir}"/> </javac> <copy todir="${build.outputDir}"> <fileset dir="${build.resourceDir}"/> @@ -69,8 +92,8 @@ <!-- ====================================================================== --> <target name="javadoc" description="Generates the Javadoc of the application"> - <javadoc sourcepath="${build.srcDir}" - classpathref="build.classpath" + <javadoc sourcepath="${build.srcDir}:${build.srcDirJava22}" + modulepathref="build.classpath" packagenames="*" destdir="${reporting.outputDirectory}/apidocs" access="protected" @@ -103,7 +126,7 @@ basedir="${build.outputDir}" excludes="**/package.html"> <manifest> - <attribute name="Automatic-Module-Name" value="org.jline.terminal.ffm"/> + <attribute name="Automatic-Module-Name" value="${module.name}"/> <attribute name="Bundle-Description" value="JLine"/> <attribute name="Bundle-License" value="${project.license.url}"/> <attribute name="Bundle-ManifestVersion" value="2"/> @@ -112,10 +135,11 @@ <attribute name="Bundle-Version" value="${project.version}"/> <attribute name="Export-Package" value="org.jline.terminal.impl.ffm;version="${project.version}""/> <attribute name="Fragment-Host" value="org.jline.terminal"/> - <attribute name="Import-Package" value="java.io,java.lang,java.lang.foreign,java.lang.invoke,java.nio.charset,java.nio.file,java.util,java.util.function,java.util.logging,java.util.stream"/> + <attribute name="Import-Package" value="java.io,java.lang,java.lang.foreign,java.lang.invoke,java.lang.runtime,java.nio.charset,java.nio.file,java.util,java.util.concurrent,java.util.concurrent.atomic,java.util.concurrent.locks,java.util.function,java.util.stream"/> <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> <attribute name="JavaPackages-Version" value="${project.version}"/> + <attribute name="Multi-Release" value="true"/> <attribute name="Require-Capability" value="osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=22))""/> </manifest> </jar> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/terminal-jansi/build.xml new/terminal-jansi/build.xml --- old/terminal-jansi/build.xml 2025-03-21 20:20:14.343594522 +0100 +++ new/terminal-jansi/build.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,130 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<project name="jline-terminal-jansi" default="package" basedir="."> - - <!-- ====================================================================== --> - <!-- Build environment properties --> - <!-- ====================================================================== --> - - <include file="../common.xml"/> - <property file="build.properties"/> - - <property name="project.artifactId" value="jline-terminal-jansi"/> - - <property name="build.finalName" value="${project.artifactId}-${project.version}"/> - <property name="build.dir" value="target"/> - <property name="build.outputDir" value="${build.dir}/classes"/> - <property name="build.srcDir" value="src/main/java"/> - <property name="build.resourceDir" value="src/main/resources"/> - - <property name="reporting.outputDirectory" value="${build.dir}/site"/> - - <!-- ====================================================================== --> - <!-- Defining classpaths --> - <!-- ====================================================================== --> - - <path id="build.classpath"> - <pathelement location="../terminal/target/classes"/> - <pathelement location="../native/target/classes"/> - <fileset dir="../lib"> - <include name="**/*.jar"/> - </fileset> - </path> - - <!-- ====================================================================== --> - <!-- Cleaning up target --> - <!-- ====================================================================== --> - - <target name="clean" description="Clean the output directory"> - <delete dir="${build.dir}"/> - </target> - - <!-- ====================================================================== --> - <!-- Compilation target --> - <!-- ====================================================================== --> - - <target name="compile" description="Compile the code"> - <mkdir dir="${build.outputDir}"/> - <javac destdir="${build.outputDir}" - nowarn="true" - debug="true" - encoding="utf-8" - optimize="false" - deprecation="true" - release="${compiler.release}" - verbose="false" - fork="false"> - <src> - <pathelement location="${build.srcDir}"/> - </src> - <classpath refid="build.classpath"/> - </javac> - <copy todir="${build.outputDir}"> - <fileset dir="${build.resourceDir}"/> - </copy> - </target> - - <!-- ====================================================================== --> - <!-- Javadoc target --> - <!-- ====================================================================== --> - - <target name="javadoc" description="Generates the Javadoc of the application"> - <javadoc sourcepath="${build.srcDir}" - classpathref="build.classpath" - packagenames="*" - destdir="${reporting.outputDirectory}/apidocs" - access="protected" - encoding="utf-8" - verbose="false" - version="true" - use="true" - author="true" - splitindex="false" - nodeprecated="false" - nodeprecatedlist="false" - notree="false" - noindex="false" - nohelp="false" - nonavbar="false" - serialwarn="false" - charset="ISO-8859-1" - linksource="false" - breakiterator="false"/> - </target> - - <!-- ====================================================================== --> - <!-- Package target --> - <!-- ====================================================================== --> - - <target name="package" depends="compile" description="Package the application"> - <jar jarfile="${build.dir}/${build.finalName}.jar" - compress="true" - index="false" - basedir="${build.outputDir}" - excludes="**/package.html"> - <manifest> - <attribute name="Automatic-Module-Name" value="org.jline.terminal.jansi"/> - <attribute name="Bundle-Description" value="JLine"/> - <attribute name="Bundle-License" value="${project.license.url}"/> - <attribute name="Bundle-ManifestVersion" value="2"/> - <attribute name="Bundle-Name" value="JLine JANSI Terminal"/> - <attribute name="Bundle-SymbolicName" value="org.jline.terminal-jansi"/> - <attribute name="Bundle-Version" value="${project.version}"/> - <attribute name="Export-Package" value="org.jline.terminal.impl.jansi.freebsd;uses:="org.fusesource.jansi.internal,org.jline.terminal.impl.jansi";version="${project.version}",org.jline.terminal.impl.jansi.linux;uses:="org.fusesource.jansi.internal,org.jline.terminal.impl.jansi";version="${project.version}",org.jline.terminal.impl.jansi.osx;uses:="org.fusesource.jansi.internal,org.jline.terminal.impl.jansi";version="${project.version}",org.jline.terminal.impl.jansi.solaris;uses:="org.fusesource.jansi.internal,org.jline.terminal.impl.jansi";version="${project.version}",org.jline.terminal.impl.jansi.win;version="${project.version}",org.jline.terminal.impl.jansi;uses:="org.fusesource.jansi.internal";version="${project.version}""/> - <attribute name="Fragment-Host" value="org.jline.terminal"/> - <attribute name="Import-Package" value="org.fusesource.jansi.internal;version="[1.6,3)",org.fusesource.jansi;version="[1.12,3)""/> - <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> - <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> - <attribute name="JavaPackages-Version" value="${project.version}"/> - <attribute name="Require-Capability" value="osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=${compiler.target}))""/> - </manifest> - </jar> - </target> - - <!-- ====================================================================== --> - <!-- A dummy target for the package named after the type it creates --> - <!-- ====================================================================== --> - - <target name="jar" depends="package" description="Builds the jar for the application"/> - -</project> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/terminal-jna/build.xml new/terminal-jna/build.xml --- old/terminal-jna/build.xml 2025-03-21 20:20:08.311597360 +0100 +++ new/terminal-jna/build.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,130 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<project name="jline-terminal-jna" default="package" basedir="."> - - <!-- ====================================================================== --> - <!-- Build environment properties --> - <!-- ====================================================================== --> - - <include file="../common.xml"/> - <property file="build.properties"/> - - <property name="project.artifactId" value="jline-terminal-jna"/> - - <property name="build.finalName" value="${project.artifactId}-${project.version}"/> - <property name="build.dir" value="target"/> - <property name="build.outputDir" value="${build.dir}/classes"/> - <property name="build.srcDir" value="src/main/java"/> - <property name="build.resourceDir" value="src/main/resources"/> - - <property name="reporting.outputDirectory" value="${build.dir}/site"/> - - <!-- ====================================================================== --> - <!-- Defining classpaths --> - <!-- ====================================================================== --> - - <path id="build.classpath"> - <pathelement location="../terminal/target/classes"/> - <pathelement location="../native/target/classes"/> - <fileset dir="../lib"> - <include name="**/*.jar"/> - </fileset> - </path> - - <!-- ====================================================================== --> - <!-- Cleaning up target --> - <!-- ====================================================================== --> - - <target name="clean" description="Clean the output directory"> - <delete dir="${build.dir}"/> - </target> - - <!-- ====================================================================== --> - <!-- Compilation target --> - <!-- ====================================================================== --> - - <target name="compile" description="Compile the code"> - <mkdir dir="${build.outputDir}"/> - <javac destdir="${build.outputDir}" - nowarn="true" - debug="true" - encoding="utf-8" - optimize="false" - deprecation="true" - release="${compiler.release}" - verbose="false" - fork="false"> - <src> - <pathelement location="${build.srcDir}"/> - </src> - <classpath refid="build.classpath"/> - </javac> - <copy todir="${build.outputDir}"> - <fileset dir="${build.resourceDir}"/> - </copy> - </target> - - <!-- ====================================================================== --> - <!-- Javadoc target --> - <!-- ====================================================================== --> - - <target name="javadoc" description="Generates the Javadoc of the application"> - <javadoc sourcepath="${build.srcDir}" - classpathref="build.classpath" - packagenames="*" - destdir="${reporting.outputDirectory}/apidocs" - access="protected" - encoding="utf-8" - verbose="false" - version="true" - use="true" - author="true" - splitindex="false" - nodeprecated="false" - nodeprecatedlist="false" - notree="false" - noindex="false" - nohelp="false" - nonavbar="false" - serialwarn="false" - charset="ISO-8859-1" - linksource="false" - breakiterator="false"/> - </target> - - <!-- ====================================================================== --> - <!-- Package target --> - <!-- ====================================================================== --> - - <target name="package" depends="compile" description="Package the application"> - <jar jarfile="${build.dir}/${build.finalName}.jar" - compress="true" - index="false" - basedir="${build.outputDir}" - excludes="**/package.html"> - <manifest> - <attribute name="Automatic-Module-Name" value="org.jline.terminal.jna"/> - <attribute name="Bundle-Description" value="JLine"/> - <attribute name="Bundle-License" value="${project.license.url}"/> - <attribute name="Bundle-ManifestVersion" value="2"/> - <attribute name="Bundle-Name" value="JLine JNA Terminal"/> - <attribute name="Bundle-SymbolicName" value="org.jline.terminal-jna"/> - <attribute name="Bundle-Version" value="${project.version}"/> - <attribute name="Export-Package" value="org.jline.terminal.impl.jna.freebsd;uses:="com.sun.jna,org.jline.terminal.impl.jna";version="${project.version}",org.jline.terminal.impl.jna.linux;uses:="com.sun.jna,org.jline.terminal.impl.jna";version="${project.version}",org.jline.terminal.impl.jna.osx;uses:="com.sun.jna,org.jline.terminal.impl.jna";version="${project.version}",org.jline.terminal.impl.jna.solaris;uses:="com.sun.jna,org.jline.terminal.impl.jna";version="${project.version}",org.jline.terminal.impl.jna.win;uses:="com.sun.jna";version="${project.version}",org.jline.terminal.impl.jna;version="${project.version}""/> - <attribute name="Fragment-Host" value="org.jline.terminal"/> - <attribute name="Import-Package" value="com.sun.jna.ptr;version="[5.13,6)",com.sun.jna.win32;version="[5.13,6)",com.sun.jna;version="[5.13,6)""/> - <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> - <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> - <attribute name="JavaPackages-Version" value="${project.version}"/> - <attribute name="Require-Capability" value="osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=${compiler.target}))""/> - </manifest> - </jar> - </target> - - <!-- ====================================================================== --> - <!-- A dummy target for the package named after the type it creates --> - <!-- ====================================================================== --> - - <target name="jar" depends="package" description="Builds the jar for the application"/> - -</project> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/terminal-jni/build.xml new/terminal-jni/build.xml --- old/terminal-jni/build.xml 2026-07-21 11:18:28.555185243 +0200 +++ new/terminal-jni/build.xml 2026-06-30 17:22:25.301807471 +0200 @@ -26,9 +26,6 @@ <path id="build.classpath"> <pathelement location="../native/target/classes"/> <pathelement location="../terminal/target/classes"/> - <fileset dir="../lib"> - <include name="**/*.jar"/> - </fileset> </path> <!-- ====================================================================== --> @@ -57,7 +54,9 @@ <src> <pathelement location="${build.srcDir}"/> </src> - <classpath refid="build.classpath"/> + <modulepath> + <path refid="build.classpath"/> + </modulepath> </javac> <copy todir="${build.outputDir}"> <fileset dir="${build.resourceDir}"/> @@ -70,7 +69,7 @@ <target name="javadoc" description="Generates the Javadoc of the application"> <javadoc sourcepath="${build.srcDir}" - classpathref="build.classpath" + modulepathref="build.classpath" packagenames="*" destdir="${reporting.outputDirectory}/apidocs" access="protected" @@ -110,9 +109,9 @@ <attribute name="Bundle-Name" value="JLine JNI Terminal"/> <attribute name="Bundle-SymbolicName" value="org.jline.terminal-jni"/> <attribute name="Bundle-Version" value="${project.version}"/> - <attribute name="Export-Package" value="org.jline.terminal.impl.jni.freebsd;uses:="org.jline.nativ,org.jline.terminal.impl.jni";version="${project.version}",org.jline.terminal.impl.jni.linux;uses:="org.jline.nativ,org.jline.terminal.impl.jni";version="${project.version}",org.jline.terminal.impl.jni.osx;uses:="org.jline.nativ,org.jline.terminal.impl.jni";version="${project.version}",org.jline.terminal.impl.jni.solaris;uses:="org.jline.nativ,org.jline.terminal.impl.jni";version="${project.version}",org.jline.terminal.impl.jni.win;version="${project.version}",org.jline.terminal.impl.jni;uses:="org.jline.nativ";version="${project.version}""/> + <attribute name="Export-Package" value="org.jline.terminal.impl.jni.freebsd;uses:="org.jline.terminal.impl.jni";version="${project.version}",org.jline.terminal.impl.jni.linux;uses:="org.jline.terminal.impl.jni";version="${project.version}",org.jline.terminal.impl.jni.osx;uses:="org.jline.terminal.impl.jni";version="${project.version}",org.jline.terminal.impl.jni.solaris;uses:="org.jline.terminal.impl.jni";version="${project.version}",org.jline.terminal.impl.jni.win;version="${project.version}",org.jline.terminal.impl.jni;uses:="org.jline.nativ";version="${project.version}""/> <attribute name="Fragment-Host" value="org.jline.terminal"/> - <attribute name="Import-Package" value="org.jline.nativ;version="[3.29,4)""/> + <attribute name="Import-Package" value="java.io,java.lang,java.lang.invoke,java.nio.charset,java.util,java.util.function,org.jline.nativ;version="[4.3,5)""/> <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> <attribute name="JavaPackages-Version" value="${project.version}"/>
