Hello community, here is the log from the commit of package jline for openSUSE:Factory checked in at 2019-03-10 09:32:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jline (Old) and /work/SRC/openSUSE:Factory/.jline.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jline" Sun Mar 10 09:32:21 2019 rev:22 rq:681810 version:2.14.6 Changes: -------- --- /work/SRC/openSUSE:Factory/jline/jline.changes 2017-09-29 11:52:07.558387730 +0200 +++ /work/SRC/openSUSE:Factory/.jline.new.28833/jline.changes 2019-03-10 09:32:28.700218627 +0100 @@ -1,0 +2,26 @@ +Tue Mar 5 15:08:16 UTC 2019 - Fridrich Strba <fst...@suse.com> + +- 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. + +------------------------------------------------------------------- Old: ---- CatalogManager.properties jline-0.9.94.pom jline-0.9.94.zip New: ---- jline-2.14.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jline.spec ++++++ --- /var/tmp/diff_new_pack.DCFeB1/_old 2019-03-10 09:32:31.512217922 +0100 +++ /var/tmp/diff_new_pack.DCFeB1/_new 2019-03-10 09:32:31.552217912 +0100 @@ -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,28 +12,27 @@ # 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 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 +#!BuildIgnore: ant-antlr +Requires: mvn(org.fusesource.jansi:jansi) BuildArch: noarch %description @@ -42,45 +41,51 @@ masking, customizable keybindings, and pass-through handlers to use to chain to other console applications. -%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|^.*<attribute name="Class-Path".*||' build.xml +%setup -q -n jline2-jline-%{version} +cp %{SOURCE1} build.xml +mkdir -p lib + +# Remove maven-shade-plugin usage +%pom_remove_plugin "org.apache.maven.plugins:maven-shade-plugin" +# Remove animal sniffer plugin in order to reduce deps +%pom_remove_plugin "org.codehaus.mojo:animal-sniffer-maven-plugin" + +# Remove unavailable and unneeded deps +%pom_xpath_remove "pom:build/pom:extensions" +%pom_remove_plugin :maven-site-plugin +%pom_remove_plugin :maven-enforcer-plugin +%pom_remove_plugin :maven-javadoc-plugin + +%pom_remove_parent %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) - -%files -%{_javadir}/%{name}.jar -%{_javadir}/%{name}-%{version}.jar +# 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 -f .mfiles + +%files javadoc +%{_javadocdir}/%{name} %changelog ++++++ jline-build.xml ++++++ --- /var/tmp/diff_new_pack.DCFeB1/_old 2019-03-10 09:32:31.880217829 +0100 +++ /var/tmp/diff_new_pack.DCFeB1/_new 2019-03-10 09:32:31.892217826 +0100 @@ -1,104 +1,133 @@ -<project name="jline" default="jar" basedir="."> - <property file="${user.home}/.m2/maven.properties"/> - <property name="maven.build.output" value="target/classes"/> - <property name="maven.build.directory" value="target"/> - <property name="maven.build.final.name" value="jline"/> - <property name="maven.test.reports" value="${maven.build.directory}/test-reports"/> - <property name="maven.test.output" value="target/test-classes"/> - <property name="maven.repo.local" value="${user.home}/.m2/repository"/> - <property name="javadocdir" value="target/site/apidocs"> - </property> +<?xml version="1.0" encoding="UTF-8"?> + +<project name="jline" default="package" basedir="."> + + <!-- ====================================================================== --> + <!-- Build environment properties --> + <!-- ====================================================================== --> + + <property file="build.properties"/> + + <property name="project.groupId" value="jline"/> + <property name="project.artifactId" value="jline"/> + <property name="project.name" value="JLine"/> + <property name="project.version" value="2.14.6"/> + + <property name="compiler.source" value="1.6"/> + <property name="compiler.target" value="${compiler.source}"/> + + <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"> - <fileset dir="${maven.repo.local}"> - <include name="junit/junit/3.8.1/junit-3.8.1.jar"/> + <fileset dir="lib"> + <include name="**/*.jar"/> </fileset> </path> + + <!-- ====================================================================== --> + <!-- Cleaning up target --> + <!-- ====================================================================== --> + <target name="clean" description="Clean the output directory"> - <delete dir="${maven.build.directory}"/> + <delete dir="${build.dir}"/> </target> - <target name="compile" depends="get-deps" description="Compile the code"> - <mkdir dir="${maven.build.output}"/> - <javac destdir="${maven.build.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false"> + + <!-- ====================================================================== --> + <!-- Compilation target --> + <!-- ====================================================================== --> + + <target name="compile" description="Compile the code"> + <mkdir dir="${build.outputDir}"/> + <javac destdir="${build.outputDir}" + nowarn="true" + debug="true" + optimize="false" + deprecation="true" + encoding="UTF-8" + target="${compiler.target}" + verbose="false" + fork="true" + source="${compiler.source}"> <src> - <pathelement location="src/main/java"/> + <pathelement location="${build.srcDir}"/> </src> <classpath refid="build.classpath"/> </javac> - <copy todir="${maven.build.output}"> - <fileset dir="src/main/resources"/> + <copy todir="${build.outputDir}"> + <fileset dir="${build.resourceDir}"> + <include name="**/*"/> + </fileset> </copy> </target> - <target name="jar" depends="compile,test" description="Clean the JAR"> - <jar jarfile="${maven.build.directory}/${maven.build.final.name}.jar" basedir="${maven.build.output}" excludes="**/package.html"/> - </target> - <target name="compile-tests" depends="junit-present, compile" description="Compile the test code" if="junit.present"> - <mkdir dir="${maven.test.output}"/> - <javac destdir="${maven.test.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false"> - <src> - <pathelement location="src/test/java"/> - </src> - <classpath> - <path refid="build.classpath"/> - <pathelement location="${maven.build.output}"/> - </classpath> - </javac> - <copy todir="${maven.test.output}"> - <fileset dir="src/test/resources"/> - </copy> - </target> - <target name="test" depends="junit-present, compile-tests" if="junit.present" description="Run the test cases"> - <mkdir dir="${maven.test.reports}"/> - <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir="."> - <sysproperty key="basedir" value="."/> - <formatter type="xml"/> - <formatter type="plain" usefile="false"/> - <classpath> - <path refid="build.classpath"/> - <pathelement location="${maven.build.output}"/> - <pathelement location="${maven.test.output}"/> - </classpath> - <batchtest todir="${maven.test.reports}"> - <fileset dir="src/test/java"> - <include name="**/*Test.java"/> - <exclude name="**/*Abstract*Test.java"/> - </fileset> - </batchtest> - </junit> - </target> - <target name="test-junit-present"> - <available classname="junit.framework.Test" property="junit.present"/> - </target> - <target name="junit-present" depends="test-junit-present" unless="junit.present"> - <echo>================================= WARNING ================================</echo> - <echo> Junit isn't present in your $ANT_HOME/lib directory. Tests not executed. </echo> - <echo>==========================================================================</echo> - </target> - <target name="test-offline"> - <condition property="maven.mode.offline"> - <equals arg1="${build.sysclasspath}" arg2="only"/> - </condition> - </target> - <target name="get-deps" depends="test-offline" description="Download all dependencies" unless="maven.mode.offline"> - <mkdir dir="${maven.repo.local}"/> - <get src="http://jline.sourceforge.net/m2repo/junit/junit/3.8.1/junit-3.8.1.jar"; dest="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true"/> - <get src="http://repo1.maven.org/maven2/junit/junit/3.8.1/junit-3.8.1.jar"; dest="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true"/> - </target> - <target name="javadoc" description="o Generate javadoc" depends="get-deps"> - <mkdir dir="${javadocdir}"> - </mkdir> - <tstamp> - <format pattern="2002-yyyy" property="year"> - </format> - </tstamp> - <property name="copyright" value="Copyright &copy; ThoughtWorks, Inc. All Rights Reserved."> - </property> - <property name="title" value="QDox 1.5 API"> - </property> - <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/main/java" packagenames="jline.*"> - <classpath> - <path refid="build.classpath"> - </path> - </classpath> + + <!-- ====================================================================== --> + <!-- Javadoc target --> + <!-- ====================================================================== --> + + <target name="javadoc" description="Generates the Javadoc of the application"> + <javadoc sourcepath="${build.srcDir}" + packagenames="*" + destdir="${reporting.outputDirectory}/apidocs" + access="protected" + source="${compiler.source}" + verbose="false" + version="true" + use="true" + author="true" + splitindex="false" + nodeprecated="false" + nodeprecatedlist="false" + notree="false" + noindex="false" + nohelp="false" + nonavbar="false" + serialwarn="false" + encoding="UTF-8" + linksource="false" + breakiterator="false"> + <classpath refid="build.classpath"/> </javadoc> </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="Bundle-ManifestVersion" value="2"/> + <attribute name="Bundle-Name" value="${project.name}"/> + <attribute name="Bundle-SymbolicName" value="${project.artifactId}"/> + <attribute name="Bundle-Version" value="${project.version}"/> + <attribute name="Export-Package" value="jline;uses:="jline.internal";version="${project.version}",jline.console;uses:="jline,jline.console.completer,jline.console.history";version="${project.version}",jline.console.completer;uses:="jline.console";version="${project.version}",jline.console.history;version="${project.version}",jline.console.internal;version="${project.version}",jline.internal;version="${project.version}""/> + <attribute name="Import-Package" value="org.fusesource.jansi;version="[1.17,2)",javax.swing;resolution:=optional"/> + <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>
