From 76ca0ef3f00a97e3ea2139c0a2ff8c7cefc9de6ab1e83e0c53d437ff7d8e3589 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sat, 30 Sep 2017 16:37:21 +0000 Subject: [PATCH 01/11] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jline?expand=0&rev=22 --- jline.changes | 1 + jline.spec | 3 +++ 2 files changed, 4 insertions(+) diff --git a/jline.changes b/jline.changes index e55ad83..92f3902 100644 --- a/jline.changes +++ b/jline.changes @@ -5,6 +5,7 @@ Wed Sep 27 16:55:31 UTC 2017 - fstrba@suse.com java-devel provider - Specify java source and target level 1.6: fixes build with jdk9 +- BuildIgnore provides of timezone-java to avoid build cycles ------------------------------------------------------------------- Fri Jun 9 09:35:59 UTC 2017 - tchvatal@suse.com diff --git a/jline.spec b/jline.spec index 2579a9f..26ba54d 100644 --- a/jline.spec +++ b/jline.spec @@ -34,6 +34,9 @@ BuildRequires: unzip BuildRequires: xml-commons-resolver #!BuildIgnore: antlr #!BuildIgnore: antlr-java +#!BuildIgnore: timezone-java +#!BuildIgnore: tzdata-java +#!BuildIgnore: tzdata-java8 BuildArch: noarch %description From 4f9403b882d824926da0daa7890ffe9615ca5895b4eebe0b5a7b986f5065440f Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 2 Oct 2017 14:07:57 +0000 Subject: [PATCH 02/11] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jline?expand=0&rev=23 --- jline.changes | 1 - jline.spec | 3 --- 2 files changed, 4 deletions(-) diff --git a/jline.changes b/jline.changes index 92f3902..e55ad83 100644 --- a/jline.changes +++ b/jline.changes @@ -5,7 +5,6 @@ Wed Sep 27 16:55:31 UTC 2017 - fstrba@suse.com java-devel provider - Specify java source and target level 1.6: fixes build with jdk9 -- BuildIgnore provides of timezone-java to avoid build cycles ------------------------------------------------------------------- Fri Jun 9 09:35:59 UTC 2017 - tchvatal@suse.com diff --git a/jline.spec b/jline.spec index 26ba54d..2579a9f 100644 --- a/jline.spec +++ b/jline.spec @@ -34,9 +34,6 @@ BuildRequires: unzip BuildRequires: xml-commons-resolver #!BuildIgnore: antlr #!BuildIgnore: antlr-java -#!BuildIgnore: timezone-java -#!BuildIgnore: tzdata-java -#!BuildIgnore: tzdata-java8 BuildArch: noarch %description From 86c4d2a2e813a473b73392a801d0bba45bdab03cd02d5ac979b1c36a982f52fe Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 17 May 2018 20:04:20 +0000 Subject: [PATCH 03/11] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jline?expand=0&rev=24 --- jline.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jline.spec b/jline.spec index 2579a9f..7c17005 100644 --- a/jline.spec +++ b/jline.spec @@ -1,7 +1,7 @@ # # spec file for package jline # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed From 3397930719f9f51d4a04cf111e8d2eb8d4e9cdc1501af0a334815f498ec503b2 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 7 Feb 2019 08:06:17 +0000 Subject: [PATCH 04/11] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jline?expand=0&rev=25 --- jline.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jline.spec b/jline.spec index 7c17005..2579a9f 100644 --- a/jline.spec +++ b/jline.spec @@ -1,7 +1,7 @@ # # spec file for package jline # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed From 5551280fb287b0e05fab80b10607fbeae325328ef58e96373b89246cb1db70fb Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 12 Feb 2019 10:08:46 +0000 Subject: [PATCH 05/11] Accepting request 673605 from home:fstrba:maven OBS-URL: https://build.opensuse.org/request/show/673605 OBS-URL: https://build.opensuse.org/package/show/Java:packages/jline?expand=0&rev=26 --- CatalogManager.properties | 61 ----------- jline-0.9.94.pom | 221 -------------------------------------- jline-0.9.94.zip | 3 - jline-2.14.6.tar.gz | 3 + jline-build.xml | 209 +++++++++++++++++++---------------- jline.spec | 127 +++++++++++++--------- 6 files changed, 197 insertions(+), 427 deletions(-) delete mode 100644 CatalogManager.properties delete mode 100644 jline-0.9.94.pom delete mode 100644 jline-0.9.94.zip create mode 100644 jline-2.14.6.tar.gz diff --git a/CatalogManager.properties b/CatalogManager.properties deleted file mode 100644 index 6bca415..0000000 --- a/CatalogManager.properties +++ /dev/null @@ -1,61 +0,0 @@ -######################################################################## -# CatalogManager provides an interface to the catalog properties. -# Properties can come from two places: from system properties or -# from a CatalogManager.properties file. This class provides a -# transparent interface to both, with system properties preferred -# over property file values. - -####################################################################### -# Catalog Files: -# The semicolon-delimited list of catalog files. -# Example: catalogs=./xcatalog;/share/doctypes/catalog - -catalogs=/etc/xml/catalog;/etc/sgml/catalog - -####################################################################### -# Relative Catalogs: -# If false, relative catalog URIs are made absolute with respect to the -# base URI of the CatalogManager.properties file. This setting only -# applies to catalog URIs obtained from the catalogs property in the -# CatalogManager.properties file -# Example: relative-catalogs = [yes|no] - -relative-catalogs=yes - -####################################################################### -# Verbosity: -# If non-zero, the Catalog classes will print informative and debugging -# messages. The higher the number, the more messages. -# Example: verbosity = [0..99] - -verbosity=0 - -####################################################################### -# Prefer: -# Which identifier is preferred, "public" or "system"? -# Example: xml.catalog.prefer = [public|system] - -prefer=system - -####################################################################### -# Static-catalog: -# Should a single catalog be constructed for all parsing, or should a -# different catalog be created for each parser? -# Example: static-catalog = [yes|no] - -static-catalog=yes - -####################################################################### -# Allow-oasis-xml-catalog-pi -# If the source document contains "oasis-xml-catalog" processing -# instructions, should they be used? -# Example: allow-oasis-xml-catalog-pi = [yes|no] - -allow-oasis-xml-catalog-pi=yes - -####################################################################### -# catalog-class-name -# If you're using the convenience classes -# org.apache.xml.resolver.tools.*, this setting allows you to specify -# an alternate class name to use for the underlying catalog. -# Example: catalog-class-name=org.apache.xml.resolver.Resolver diff --git a/jline-0.9.94.pom b/jline-0.9.94.pom deleted file mode 100644 index 3050761..0000000 --- a/jline-0.9.94.pom +++ /dev/null @@ -1,221 +0,0 @@ - - - - - 4.0.0 - jline - jline - jar - JLine - 0.9.94 - JLine is a java library for reading and editing user input in console applications. It features tab-completion, command history, password masking, customizable keybindings, and pass-through handlers to use to chain to other console applications. - http://jline.sourceforge.net - - sourceforge - http://sourceforge.net/tracker/?group_id=64033&atid=506056 - - 2002 - - - JLine users - https://lists.sourceforge.net/lists/listinfo/jline-users - jline-users@lists.sourceforge.net - http://sourceforge.net/mailarchive/forum.php?forum=jline-users - - - - - - mprudhom - Marc Prud'hommeaux - mwp1@cornell.edu - - - - - BSD - LICENSE.txt - - - - scm:cvs:pserver:anonymous@jline.cvs.sourceforge.net:/cvsroot/jline:jline - scm:cvs:ext:${maven.username}@jline.cvs.sourceforge.net:/cvsroot/jline:jline - http://jline.cvs.sourceforge.net/jline - - - - junit - junit - 3.8.1 - compile - - - - - - - maven-surefire-plugin - - - false - false - - - - maven-compiler-plugin - - 1.3 - 1.3 - - - - maven-site-plugin - - ../site-staging - - - - maven-assembly-plugin - - - src/assembly/assembly.xml - - - - - - - - - Maven Snapshots - http://snapshots.repository.codehaus.org - true - false - - - - - - - org.codehaus.mojo - jxr-maven-plugin - - true - - - - org.apache.maven.plugins - maven-javadoc-plugin - - true - true - - http://java.sun.com/j2se/1.5.0/docs/api - - - - - maven-pmd-plugin - - - maven-project-info-reports-plugin - - - - - - - project-team - mailing-list - issue-tracking - license - scm - - - - - - org.codehaus.mojo - surefire-report-maven-plugin - - - - - - jline - scp://shell.sourceforge.net/home/groups/j/jl/jline/htdocs/m2repo - - - jline - scp://shell.sourceforge.net/home/groups/j/jl/jline/htdocs/m2snapshot - - - jline - jline - scpexe://shell.sourceforge.net/home/groups/j/jl/jline/htdocs/ - - - diff --git a/jline-0.9.94.zip b/jline-0.9.94.zip deleted file mode 100644 index 024afee..0000000 --- a/jline-0.9.94.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:61488e908c3afa80833f262ba17df6199f3ea858862fd354e04aebc7433c1ed6 -size 771980 diff --git a/jline-2.14.6.tar.gz b/jline-2.14.6.tar.gz new file mode 100644 index 0000000..67340b0 --- /dev/null +++ b/jline-2.14.6.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c6205afb214288cd8ef53f1ea1243ba9388c84b55c929f0b9e6cee7757c6efac +size 116599 diff --git a/jline-build.xml b/jline-build.xml index da9f4df..fba4d6b 100644 --- a/jline-build.xml +++ b/jline-build.xml @@ -1,104 +1,133 @@ - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + - + - - - + + + + + + + + - + - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ================================= WARNING ================================ - Junit isn't present in your $ANT_HOME/lib directory. Tests not executed. - ========================================================================== - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jline.spec b/jline.spec index 2579a9f..4c6ca15 100644 --- a/jline.spec +++ b/jline.spec @@ -1,7 +1,7 @@ # # spec file for package jline # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,75 +12,98 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: jline -Version: 0.9.94 +Version: 2.14.6 Release: 0 -Summary: Java library for reading and editing user input in console applications -License: BSD-3-Clause +Summary: JLine is a Java library for handling console input +License: BSD-2-Clause Group: Development/Libraries/Java -Url: http://jline.sourceforge.net/ -Source0: http://download.sourceforge.net/sourceforge/jline/jline-0.9.94.zip -Source1: CatalogManager.properties -Source2: jline-build.xml -Source3: jline-0.9.94.pom +URL: https://github.com/jline/jline2 +Source0: https://github.com/jline/jline2/archive/jline-%{version}.tar.gz +Source1: %{name}-build.xml BuildRequires: ant -BuildRequires: java-devel -BuildRequires: javapackages-tools -BuildRequires: unzip -BuildRequires: xml-commons-resolver -#!BuildIgnore: antlr -#!BuildIgnore: antlr-java +BuildRequires: fdupes +BuildRequires: hawtjni-runtime +BuildRequires: jansi +BuildRequires: jansi-native +BuildRequires: javapackages-local +BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:) +Requires: mvn(org.fusesource.jansi:jansi) +Requires: mvn(org.sonatype.oss:oss-parent:pom:) BuildArch: noarch %description -JLine is a java library for reading and editing user input in console -applications. It features tab-completion, command history, password -masking, customizable keybindings, and pass-through handlers to use to -chain to other console applications. +JLine is a Java library for handling console input. It is similar +in functionality to BSD editline and GNU readline. People familiar +with the readline/editline capabilities for modern shells (such as +bash and tcsh) will find most of the command editing features of +JLine to be familiar. -%package demo -Summary: Java library for reading and editing user input in console applications -Group: Development/Libraries/Java +%package javadoc +Summary: Javadocs for %{name} +Group: Documentation/HTML -%description demo -JLine is a java library for reading and editing user input in console -applications. It features tab-completion, command history, password -masking, customizable keybindings, and pass-through handlers to use to -chain to other console applications. +%description javadoc +This package contains the API documentation for %{name}. %prep -# BEWARE: The jar file META-INF is not under the subdir -%setup -q -c -cp -pr %{name}-%{version}/* . -rm -r %{name}-%{version} -find -type f -name '*.jar' | xargs -t rm -# Use locally installed DTDs -mkdir -p build -cp -p %{SOURCE1} build/CatalogManager.properties -cp -p %{SOURCE2} src/build.xml -perl -p -i -e 's|^.*javax.swing;resolution:=optional,org.fusesource.jansi,!org.fusesource.jansi.internal" + +# Be sure to export jline.internal, but not org.fusesource.jansi. +# See https://bugzilla.redhat.com/show_bug.cgi?id=1317551 +%pom_xpath_set "pom:build/pom:plugins/pom:plugin[pom:artifactId = 'maven-bundle-plugin']/pom:executions/pom:execution/pom:configuration/pom:instructions/pom:Export-Package" "jline.*;-noimport:=true" + +# For some reason these directories do not exist, failing compilation due to -Werror +mkdir -p target/generated-sources/annotations +mkdir -p target/generated-test-sources/test-annotations + +# nondeterministic +find -name TerminalFactoryTest.java -delete %build -mkdir -p native -# Use locally installed DTDs -export CLASSPATH=`pwd`/build -cd src/ -export CLASSPATH=`pwd`/target/classes:`pwd`/target/test-classes -export OPT_JAR_LIST=: -ant -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 jar +build-jar-repository -s lib jansi jansi-native hawtjni/hawtjni-runtime +%ant package javadoc %install -# jars -install -d -m 755 %{buildroot}%{_javadir} -install -p -m 644 src/target/jline.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar -(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done) +# jar +install -dm 0755 %{buildroot}%{_javadir}/%{name} +install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar +# pom +install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} +install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom +%add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar +# javadoc +install -dm 0755 %{buildroot}%{_javadocdir}/%{name} +cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ +%fdupes -s %{buildroot}%{_javadocdir} -%files -%{_javadir}/%{name}.jar -%{_javadir}/%{name}-%{version}.jar +%files -f .mfiles + +%files javadoc +%{_javadocdir}/%{name} %changelog From 9bb9cf703da95c277018ebb89da27a5168101c74b2890a020e07297953e3828a Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 12 Feb 2019 10:14:12 +0000 Subject: [PATCH 06/11] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jline?expand=0&rev=27 --- jline.spec | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/jline.spec b/jline.spec index 4c6ca15..a727b3f 100644 --- a/jline.spec +++ b/jline.spec @@ -19,8 +19,8 @@ Name: jline Version: 2.14.6 Release: 0 -Summary: JLine is a Java library for handling console input -License: BSD-2-Clause +Summary: Java library for reading and editing user input in console applications +License: BSD-3-Clause Group: Development/Libraries/Java URL: https://github.com/jline/jline2 Source0: https://github.com/jline/jline2/archive/jline-%{version}.tar.gz @@ -37,11 +37,10 @@ Requires: mvn(org.sonatype.oss:oss-parent:pom:) BuildArch: noarch %description -JLine is a Java library for handling console input. It is similar -in functionality to BSD editline and GNU readline. People familiar -with the readline/editline capabilities for modern shells (such as -bash and tcsh) will find most of the command editing features of -JLine to be familiar. +JLine is a java library for reading and editing user input in console +applications. It features tab-completion, command history, password +masking, customizable keybindings, and pass-through handlers to use to +chain to other console applications. %package javadoc Summary: Javadocs for %{name} From 2765538b362916a55912a0f966bd2b7468918fde2428ffb8cc5a101a81d2a485 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 12 Feb 2019 10:17:12 +0000 Subject: [PATCH 07/11] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jline?expand=0&rev=28 --- jline.spec | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/jline.spec b/jline.spec index a727b3f..9f67c48 100644 --- a/jline.spec +++ b/jline.spec @@ -51,7 +51,7 @@ This package contains the API documentation for %{name}. %prep %setup -q -n jline2-jline-%{version} -ln -s %{SOURCE1} build.xml +cp %{SOURCE1} build.xml mkdir -p lib # Remove maven-shade-plugin usage @@ -76,13 +76,6 @@ mkdir -p lib # See https://bugzilla.redhat.com/show_bug.cgi?id=1317551 %pom_xpath_set "pom:build/pom:plugins/pom:plugin[pom:artifactId = 'maven-bundle-plugin']/pom:executions/pom:execution/pom:configuration/pom:instructions/pom:Export-Package" "jline.*;-noimport:=true" -# For some reason these directories do not exist, failing compilation due to -Werror -mkdir -p target/generated-sources/annotations -mkdir -p target/generated-test-sources/test-annotations - -# nondeterministic -find -name TerminalFactoryTest.java -delete - %build build-jar-repository -s lib jansi jansi-native hawtjni/hawtjni-runtime %ant package javadoc From 88dfbd7ad75b2fe38101ef9815a966d348047b59b5d1b99902310fb7c872d793 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 12 Feb 2019 10:18:18 +0000 Subject: [PATCH 08/11] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jline?expand=0&rev=29 --- jline.spec | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/jline.spec b/jline.spec index 9f67c48..d4c11ee 100644 --- a/jline.spec +++ b/jline.spec @@ -65,17 +65,6 @@ mkdir -p lib %pom_remove_plugin :maven-enforcer-plugin %pom_remove_plugin :maven-javadoc-plugin -# Makes the build fail on deprecation warnings from jansi -%pom_xpath_remove 'pom:arg[text()="-Werror"]' - -# Do not import non-existing internal package -%pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId = 'maven-bundle-plugin']/pom:executions/pom:execution/pom:configuration/pom:instructions/pom:Import-Package" -%pom_xpath_inject "pom:build/pom:plugins/pom:plugin[pom:artifactId = 'maven-bundle-plugin']/pom:executions/pom:execution/pom:configuration/pom:instructions" "javax.swing;resolution:=optional,org.fusesource.jansi,!org.fusesource.jansi.internal" - -# Be sure to export jline.internal, but not org.fusesource.jansi. -# See https://bugzilla.redhat.com/show_bug.cgi?id=1317551 -%pom_xpath_set "pom:build/pom:plugins/pom:plugin[pom:artifactId = 'maven-bundle-plugin']/pom:executions/pom:execution/pom:configuration/pom:instructions/pom:Export-Package" "jline.*;-noimport:=true" - %build build-jar-repository -s lib jansi jansi-native hawtjni/hawtjni-runtime %ant package javadoc From 2f8a33ed80d821ef8a5eef2127a6a9701c353454fbe40b0dcba038a68473369d Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 12 Feb 2019 10:20:32 +0000 Subject: [PATCH 09/11] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jline?expand=0&rev=30 --- jline.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jline.spec b/jline.spec index d4c11ee..20c6171 100644 --- a/jline.spec +++ b/jline.spec @@ -32,6 +32,8 @@ BuildRequires: jansi BuildRequires: jansi-native BuildRequires: javapackages-local BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:) +#!BuildIgnore: antlr +#!BuildIgnore: antlr-java Requires: mvn(org.fusesource.jansi:jansi) Requires: mvn(org.sonatype.oss:oss-parent:pom:) BuildArch: noarch @@ -67,7 +69,7 @@ mkdir -p lib %build build-jar-repository -s lib jansi jansi-native hawtjni/hawtjni-runtime -%ant package javadoc +%{ant} package javadoc %install # jar From 41d53f5f009f8f2b10a3193183ba88f19291e47d81710dbc4ee81bc15a3cbf30 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 12 Feb 2019 10:27:50 +0000 Subject: [PATCH 10/11] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jline?expand=0&rev=31 --- jline.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/jline.spec b/jline.spec index 20c6171..2f2e346 100644 --- a/jline.spec +++ b/jline.spec @@ -32,8 +32,7 @@ BuildRequires: jansi BuildRequires: jansi-native BuildRequires: javapackages-local BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:) -#!BuildIgnore: antlr -#!BuildIgnore: antlr-java +#!BuildIgnore: ant-antlr Requires: mvn(org.fusesource.jansi:jansi) Requires: mvn(org.sonatype.oss:oss-parent:pom:) BuildArch: noarch From ff0b0c7aa4cc1c1919912e6e09a7e421cdf23426c6a6d8cd2afd9baba37f7089 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 5 Mar 2019 15:19:08 +0000 Subject: [PATCH 11/11] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jline?expand=0&rev=32 --- jline.changes | 26 ++++++++++++++++++++++++++ jline.spec | 4 ++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/jline.changes b/jline.changes index e55ad83..368ab31 100644 --- a/jline.changes +++ b/jline.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Tue Mar 5 15:08:16 UTC 2019 - Fridrich Strba + +- Upgrade to version 2.14.6 + * NOT backward compatible with jline 1.x + * Depend on jansi 2.9+ + * #277: Allow setting max history-size. 'FileHistory' allows + delayed init (to allow setMaxSize to take effect) and + 'ConsoleReader' exposes ability to read inputrc settings. + * Ability to control terminal encoding + * Backward history searching + * Handle EOF / Ctrl-D on unsupported terminals + * Distinguish carriage return from newline + * Correcting Manifest to make jline work as a bundle in OSGi + * Handle TERM=dumb as an UnsupportedTerminal + * Updated license headers to be consistent BSD version + * Added support for vi keymap. Most major vi features should work. + * The "jline.esc.timeout" configuration option (in your + $HOME/.jline.rc) controls the number of millisesconds that + jline will wait after seeing an ESC key to see if another + character arrives. + * The JVM shutdown hook that restores the terminal settings when + the JVM exits (jline.shutdownhook) is now turned on by default. +- Generate and customize the ant build file in order to be able + to build without maven. + ------------------------------------------------------------------- Wed Sep 27 16:55:31 UTC 2017 - fstrba@suse.com diff --git a/jline.spec b/jline.spec index 2f2e346..9bb758d 100644 --- a/jline.spec +++ b/jline.spec @@ -31,10 +31,8 @@ BuildRequires: hawtjni-runtime BuildRequires: jansi BuildRequires: jansi-native BuildRequires: javapackages-local -BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:) #!BuildIgnore: ant-antlr Requires: mvn(org.fusesource.jansi:jansi) -Requires: mvn(org.sonatype.oss:oss-parent:pom:) BuildArch: noarch %description @@ -66,6 +64,8 @@ mkdir -p lib %pom_remove_plugin :maven-enforcer-plugin %pom_remove_plugin :maven-javadoc-plugin +%pom_remove_parent + %build build-jar-repository -s lib jansi jansi-native hawtjni/hawtjni-runtime %{ant} package javadoc