SHA256
1
0
forked from pool/jline

Accepting request 681810 from Java:packages

Upgrade to 2.14.6

OBS-URL: https://build.opensuse.org/request/show/681810
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jline?expand=0&rev=22
This commit is contained in:
Stephan Kulow 2019-03-10 08:32:21 +00:00 committed by Git OBS Bridge
commit 8489abb944
7 changed files with 199 additions and 421 deletions

View File

@ -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

View File

@ -1,221 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
To build, you need to have Maven 2 installed.
To compile, run:
mvn compile
To run tests, run:
mvn test
To run one particular test, e.g. TestSomeTest, run:
mvn test -Dtest=TestSomeTest
To build the jars, run:
mvn package
To create and upload a release, run:
mvn deploy
To build the site and upload it, run:
mvn site:deploy
To perform a complete release, run:
mvn clean compile package site assembly:assembly deploy site:deploy
To actually upload the artifact to sourceforge, it must be manually ftp'd:
lftp ftp://upload.sourceforge.net/incoming/ -e 'put target/jline-VERSION.zip'
To make a bundle and request that ibilio upload it, do:
mvn source:jar javadoc:jar repository:bundle-create
scp target/jline-VERSION-bundle.jar shell.sourceforge.net:/home/groups/j/jl/jline/htdocs
Make a request like at http://jira.codehaus.org/browse/MAVENUPLOAD-1003
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
<packaging>jar</packaging>
<name>JLine</name>
<version>0.9.94</version>
<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.</description>
<url>http://jline.sourceforge.net</url>
<issueManagement>
<system>sourceforge</system>
<url>http://sourceforge.net/tracker/?group_id=64033&amp;atid=506056</url>
</issueManagement>
<inceptionYear>2002</inceptionYear>
<mailingLists>
<mailingList>
<name>JLine users</name>
<subscribe>https://lists.sourceforge.net/lists/listinfo/jline-users</subscribe>
<post>jline-users@lists.sourceforge.net</post>
<archive>http://sourceforge.net/mailarchive/forum.php?forum=jline-users</archive>
</mailingList>
</mailingLists>
<developers>
<developer>
<id>mprudhom</id>
<name>Marc Prud'hommeaux</name>
<email>mwp1@cornell.edu</email>
</developer>
</developers>
<licenses>
<license>
<name>BSD</name>
<url>LICENSE.txt</url>
</license>
</licenses>
<scm>
<connection>scm:cvs:pserver:anonymous@jline.cvs.sourceforge.net:/cvsroot/jline:jline</connection>
<developerConnection>scm:cvs:ext:${maven.username}@jline.cvs.sourceforge.net:/cvsroot/jline:jline</developerConnection>
<url>http://jline.cvs.sourceforge.net/jline</url>
</scm>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<plugins>
<!--
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jalopy-maven-plugin</artifactId>
<version>1.0-SNAPSHOT</version>
<configuration>
<fileFormat>UNIX</fileFormat>
<convention>codestyle.xml</convention>
</configuration>
<executions>
<execution>
<goals>
<goal>format</goal>
</goals>
</execution>
</executions>
</plugin>
-->
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<!-- <testFailureIgnore>true</testFailureIgnore> -->
<useFile>false</useFile>
<trimStackTrace>false</trimStackTrace>
</configuration>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.3</source>
<target>1.3</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
<configuration>
<stagingDirectory>../site-staging</stagingDirectory>
</configuration>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
<descriptor>src/assembly/assembly.xml</descriptor>
</descriptors>
</configuration>
</plugin>
</plugins>
</build>
<pluginRepositories>
<pluginRepository>
<id>Maven Snapshots</id>
<url>http://snapshots.repository.codehaus.org</url>
<snapshots><enabled>true</enabled></snapshots>
<releases><enabled>false</enabled></releases>
</pluginRepository>
</pluginRepositories>
<reporting>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jxr-maven-plugin</artifactId>
<configuration>
<aggregate>true</aggregate>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<aggregate>true</aggregate>
<linksource>true</linksource>
<links>
<link>http://java.sun.com/j2se/1.5.0/docs/api</link>
</links>
</configuration>
</plugin>
<plugin>
<artifactId>maven-pmd-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
<reportSets>
<reportSet>
<reports>
<!-- <report>dependencies</report> -->
<!-- <report>cim</report> -->
<!-- <report>cobertura</report> -->
<report>project-team</report>
<report>mailing-list</report>
<report>issue-tracking</report>
<report>license</report>
<report>scm</report>
</reports>
</reportSet>
</reportSets>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>surefire-report-maven-plugin</artifactId>
</plugin>
</plugins>
</reporting>
<distributionManagement>
<repository>
<id>jline</id>
<url>scp://shell.sourceforge.net/home/groups/j/jl/jline/htdocs/m2repo</url>
</repository>
<snapshotRepository>
<id>jline</id>
<url>scp://shell.sourceforge.net/home/groups/j/jl/jline/htdocs/m2snapshot</url>
</snapshotRepository>
<site>
<id>jline</id>
<name>jline</name>
<url>scpexe://shell.sourceforge.net/home/groups/j/jl/jline/htdocs/</url>
</site>
</distributionManagement>
</project>

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:61488e908c3afa80833f262ba17df6199f3ea858862fd354e04aebc7433c1ed6
size 771980

BIN
jline-2.14.6.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -1,104 +1,133 @@
<project name="jline" default="jar" basedir="."> <?xml version="1.0" encoding="UTF-8"?>
<property file="${user.home}/.m2/maven.properties"/>
<property name="maven.build.output" value="target/classes"/> <project name="jline" default="package" basedir=".">
<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"/> <!-- Build environment properties -->
<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 file="build.properties"/>
</property>
<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"> <path id="build.classpath">
<fileset dir="${maven.repo.local}"> <fileset dir="lib">
<include name="junit/junit/3.8.1/junit-3.8.1.jar"/> <include name="**/*.jar"/>
</fileset> </fileset>
</path> </path>
<!-- ====================================================================== -->
<!-- Cleaning up target -->
<!-- ====================================================================== -->
<target name="clean" description="Clean the output directory"> <target name="clean" description="Clean the output directory">
<delete dir="${maven.build.directory}"/> <delete dir="${build.dir}"/>
</target> </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> <src>
<pathelement location="src/main/java"/> <pathelement location="${build.srcDir}"/>
</src> </src>
<classpath refid="build.classpath"/> <classpath refid="build.classpath"/>
</javac> </javac>
<copy todir="${maven.build.output}"> <copy todir="${build.outputDir}">
<fileset dir="src/main/resources"/> <fileset dir="${build.resourceDir}">
</copy> <include name="**/*"/>
</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> </fileset>
</batchtest> </copy>
</junit>
</target> </target>
<target name="test-junit-present">
<available classname="junit.framework.Test" property="junit.present"/> <!-- ====================================================================== -->
</target> <!-- Javadoc target -->
<target name="junit-present" depends="test-junit-present" unless="junit.present"> <!-- ====================================================================== -->
<echo>================================= WARNING ================================</echo>
<echo> Junit isn&apos;t present in your $ANT_HOME/lib directory. Tests not executed. </echo> <target name="javadoc" description="Generates the Javadoc of the application">
<echo>==========================================================================</echo> <javadoc sourcepath="${build.srcDir}"
</target> packagenames="*"
<target name="test-offline"> destdir="${reporting.outputDirectory}/apidocs"
<condition property="maven.mode.offline"> access="protected"
<equals arg1="${build.sysclasspath}" arg2="only"/> source="${compiler.source}"
</condition> verbose="false"
</target> version="true"
<target name="get-deps" depends="test-offline" description="Download all dependencies" unless="maven.mode.offline"> use="true"
<mkdir dir="${maven.repo.local}"/> author="true"
<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"/> splitindex="false"
<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"/> nodeprecated="false"
</target> nodeprecatedlist="false"
<target name="javadoc" description="o Generate javadoc" depends="get-deps"> notree="false"
<mkdir dir="${javadocdir}"> noindex="false"
</mkdir> nohelp="false"
<tstamp> nonavbar="false"
<format pattern="2002-yyyy" property="year"> serialwarn="false"
</format> encoding="UTF-8"
</tstamp> linksource="false"
<property name="copyright" value="Copyright &amp;copy; ThoughtWorks, Inc. All Rights Reserved."> breakiterator="false">
</property> <classpath refid="build.classpath"/>
<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> </javadoc>
</target> </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:=&quot;jline.internal&quot;;version=&quot;${project.version}&quot;,jline.console;uses:=&quot;jline,jline.console.completer,jline.console.history&quot;;version=&quot;${project.version}&quot;,jline.console.completer;uses:=&quot;jline.console&quot;;version=&quot;${project.version}&quot;,jline.console.history;version=&quot;${project.version}&quot;,jline.console.internal;version=&quot;${project.version}&quot;,jline.internal;version=&quot;${project.version}&quot;"/>
<attribute name="Import-Package" value="org.fusesource.jansi;version=&quot;[1.17,2)&quot;,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:=&quot;(&amp;(osgi.ee=JavaSE)(version=${compiler.target}))&quot;"/>
</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> </project>

View File

@ -1,3 +1,29 @@
-------------------------------------------------------------------
Tue Mar 5 15:08:16 UTC 2019 - Fridrich Strba <fstrba@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.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Sep 27 16:55:31 UTC 2017 - fstrba@suse.com Wed Sep 27 16:55:31 UTC 2017 - fstrba@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package jline # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # 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) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # 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 Name: jline
Version: 0.9.94 Version: 2.14.6
Release: 0 Release: 0
Summary: Java library for reading and editing user input in console applications Summary: Java library for reading and editing user input in console applications
License: BSD-3-Clause License: BSD-3-Clause
Group: Development/Libraries/Java Group: Development/Libraries/Java
Url: http://jline.sourceforge.net/ URL: https://github.com/jline/jline2
Source0: http://download.sourceforge.net/sourceforge/jline/jline-0.9.94.zip Source0: https://github.com/jline/jline2/archive/jline-%{version}.tar.gz
Source1: CatalogManager.properties Source1: %{name}-build.xml
Source2: jline-build.xml
Source3: jline-0.9.94.pom
BuildRequires: ant BuildRequires: ant
BuildRequires: java-devel BuildRequires: fdupes
BuildRequires: javapackages-tools BuildRequires: hawtjni-runtime
BuildRequires: unzip BuildRequires: jansi
BuildRequires: xml-commons-resolver BuildRequires: jansi-native
#!BuildIgnore: antlr BuildRequires: javapackages-local
#!BuildIgnore: antlr-java #!BuildIgnore: ant-antlr
Requires: mvn(org.fusesource.jansi:jansi)
BuildArch: noarch BuildArch: noarch
%description %description
@ -42,45 +41,51 @@ applications. It features tab-completion, command history, password
masking, customizable keybindings, and pass-through handlers to use to masking, customizable keybindings, and pass-through handlers to use to
chain to other console applications. chain to other console applications.
%package demo %package javadoc
Summary: Java library for reading and editing user input in console applications Summary: Javadocs for %{name}
Group: Development/Libraries/Java Group: Documentation/HTML
%description demo %description javadoc
JLine is a java library for reading and editing user input in console This package contains the API documentation for %{name}.
applications. It features tab-completion, command history, password
masking, customizable keybindings, and pass-through handlers to use to
chain to other console applications.
%prep %prep
# BEWARE: The jar file META-INF is not under the subdir %setup -q -n jline2-jline-%{version}
%setup -q -c cp %{SOURCE1} build.xml
cp -pr %{name}-%{version}/* . mkdir -p lib
rm -r %{name}-%{version}
find -type f -name '*.jar' | xargs -t rm # Remove maven-shade-plugin usage
# Use locally installed DTDs %pom_remove_plugin "org.apache.maven.plugins:maven-shade-plugin"
mkdir -p build # Remove animal sniffer plugin in order to reduce deps
cp -p %{SOURCE1} build/CatalogManager.properties %pom_remove_plugin "org.codehaus.mojo:animal-sniffer-maven-plugin"
cp -p %{SOURCE2} src/build.xml
perl -p -i -e 's|^.*<attribute name="Class-Path".*||' build.xml # 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 %build
mkdir -p native build-jar-repository -s lib jansi jansi-native hawtjni/hawtjni-runtime
# Use locally installed DTDs %{ant} package javadoc
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
%install %install
# jars # jar
install -d -m 755 %{buildroot}%{_javadir} install -dm 0755 %{buildroot}%{_javadir}/%{name}
install -p -m 644 src/target/jline.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar
(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done) # 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 %files -f .mfiles
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar %files javadoc
%{_javadocdir}/%{name}
%changelog %changelog