pool/picocli
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1090690 from home:urbic:branches:Java:packages

Browse Source 
- Upgrade to version 4.7.3
  * full changes from previous versions are in
    https://github.com/remkop/picocli/blob/v4.7.3/RELEASE-NOTES.md
- Package artifacts: picocli-{codegen,shell-jline2}
- JPMS: package module discriptors when building with java >= 9
- Take POMs from Maven Central

OBS-URL: https://build.opensuse.org/request/show/1090690
OBS-URL: https://build.opensuse.org/package/show/Java:packages/picocli?expand=0&rev=6
This commit is contained in:
Fridrich Strba 2023-06-05 16:42:10 +00:00 committed by Git OBS Bridge
parent d35c01c22f
commit 1d6a7efb8b
8 changed files with 245 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
picocli-4.7.3.pom Normal file
View File

@ -0,0 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>info.picocli</groupId>
<artifactId>picocli</artifactId>
<version>4.7.3</version>
<name>picocli</name>
<description>Java command line parser with both an annotations API and a programmatic API. Usage help with ANSI styles and colors. Autocomplete. Nested subcommands. Easily included as source to avoid adding a dependency.</description>
<url>https://picocli.info</url>
<inceptionYear>2018</inceptionYear>
<licenses>
<license>
<name>The Apache Software License, version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
<developers>
<developer>
<id>rpopma</id>
<name>Remko Popma</name>
<email>rpopma@apache.org</email>
</developer>
</developers>
<scm>
<connection>scm:git:https://github.com/remkop/picocli.git</connection>
<developerConnection>scm:git:ssh://github.com:remkop/picocli.git</developerConnection>
<url>https://github.com/remkop/picocli/tree/master</url>
</scm>
</project>

84
picocli-build.xml
View File

@ -9,18 +9,20 @@
<property file="build.properties"/>
<property name="project.artifactId" value="picocli"/>
<property name="project.version" value="4.6.2"/>
<property name="project.version" value="[UNKNOWN]"/>
<property name="compiler.source" value="1.8"/>
<property name="compiler.source" value="8"/>
<property name="javadoc.source" value="8"/>
<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"/>
<property name="jline2.jar" location="[UNKNOWN]"/>
<!-- ====================================================================== -->
<!-- Cleaning up target -->
<!-- ====================================================================== -->
@ -35,6 +37,8 @@
<target name="compile" description="Compile the code">
<mkdir dir="${build.outputDir}"/>
<mkdir dir="picocli-codegen/${build.outputDir}"/>
<mkdir dir="picocli-shell-jline2/${build.outputDir}"/>
<javac destdir="${build.outputDir}"
nowarn="false"
debug="true"
@ -43,11 +47,50 @@
target="${compiler.target}"
verbose="false"
fork="false"
source="${compiler.source}">
source="${compiler.source}"
encoding="UTF-8"
createMissingPackageInfoClass="false">
<src>
<pathelement location="${build.srcDir}"/>
</src>
</javac>
<javac destdir="picocli-codegen/${build.outputDir}"
nowarn="false"
debug="true"
optimize="false"
deprecation="true"
target="${compiler.target}"
verbose="false"
fork="false"
source="${compiler.source}"
encoding="UTF-8"
createMissingPackageInfoClass="false">
<src>
<pathelement location="picocli-codegen/${build.srcDir}"/>
</src>
<modulepath>
<pathelement location="${build.outputDir}"/>
</modulepath>
</javac>
<javac destdir="picocli-shell-jline2/${build.outputDir}"
nowarn="false"
debug="true"
optimize="false"
deprecation="true"
target="${compiler.target}"
verbose="false"
fork="false"
source="${compiler.source}"
encoding="UTF-8"
createMissingPackageInfoClass="false">
<src>
<pathelement location="picocli-shell-jline2/${build.srcDir}"/>
</src>
<modulepath>
<pathelement location="${build.outputDir}"/>
<pathelement location="${jline2.jar}"/>
</modulepath>
</javac>
</target>
<!-- ====================================================================== -->
@ -55,11 +98,10 @@
<!-- ====================================================================== -->
<target name="javadoc" description="Generates the Javadoc of the application">
<javadoc sourcepath="${build.srcDir}"
<javadoc
packagenames="*"
destdir="${reporting.outputDirectory}/apidocs"
access="protected"
source="${compiler.source}"
verbose="false"
version="true"
use="true"
@ -72,9 +114,20 @@
nohelp="false"
nonavbar="false"
serialwarn="false"
charset="ISO-8859-1"
encoding="UTF-8"
charset="UTF-8"
linksource="false"
breakiterator="false"/>
breakiterator="false"
source="${javadoc.source}"
>
<sourcepath>
<pathelement location="${build.srcDir}"/>
<pathelement location="picocli-codegen/${build.srcDir}"/>
</sourcepath>
<classpath>
<pathelement location="${build.outputDir}"/>
</classpath>
</javadoc>
</target>
<!-- ====================================================================== -->
@ -82,11 +135,24 @@
<!-- ====================================================================== -->
<target name="package" depends="compile" description="Package the application">
<jar jarfile="${build.dir}/${build.finalName}.jar"
<jar jarfile="${build.dir}/${project.artifactId}-${project.version}.jar"
compress="true"
index="false"
basedir="${build.outputDir}"
excludes="**/package.html"/>
<jar jarfile="${build.dir}/${project.artifactId}-codegen-${project.version}.jar"
compress="true"
index="false"
basedir="picocli-codegen/${build.outputDir}"
excludes="**/package.html">
<service type="javax.annotation.processing.Processor"
provider="picocli.codegen.aot.graalvm.processor.NativeImageConfigGeneratorProcessor"/>
</jar>
<jar jarfile="${build.dir}/${project.artifactId}-shell-jline2-${project.version}.jar"
compress="true"
index="false"
basedir="picocli-shell-jline2/${build.outputDir}"
excludes="**/package.html"/>
</target>
<!-- ====================================================================== -->

39
picocli-codegen-4.7.3.pom Normal file
View File

@ -0,0 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>info.picocli</groupId>
<artifactId>picocli-codegen</artifactId>
<version>4.7.3</version>
<name>picocli-codegen</name>
<description>Picocli Code Generation - Tools to generate documentation, configuration, source code and other files from a picocli model.</description>
<url>https://picocli.info</url>
<inceptionYear>2018</inceptionYear>
<licenses>
<license>
<name>The Apache Software License, version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
<developers>
<developer>
<id>rpopma</id>
<name>Remko Popma</name>
<email>rpopma@apache.org</email>
</developer>
</developers>
<scm>
<connection>scm:git:https://github.com/remkop/picocli.git</connection>
<developerConnection>scm:git:ssh://github.com:remkop/picocli.git</developerConnection>
<url>https://github.com/remkop/picocli/tree/master</url>
</scm>
<dependencies>
<dependency>
<groupId>info.picocli</groupId>
<artifactId>picocli</artifactId>
<version>4.7.3</version>
<scope>compile</scope>
</dependency>
</dependencies>
</project>

45
picocli-shell-jline2-4.7.3.pom Normal file
View File

@ -0,0 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>info.picocli</groupId>
<artifactId>picocli-shell-jline2</artifactId>
<version>4.7.3</version>
<name>picocli-shell-jline2</name>
<description>Picocli Shell JLine2 - easily build interactive shell applications with JLine 2 and picocli.</description>
<url>https://picocli.info</url>
<inceptionYear>2018</inceptionYear>
<licenses>
<license>
<name>The Apache Software License, version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
<developers>
<developer>
<id>rpopma</id>
<name>Remko Popma</name>
<email>rpopma@apache.org</email>
</developer>
</developers>
<scm>
<connection>scm:git:https://github.com/remkop/picocli.git</connection>
<developerConnection>scm:git:ssh://github.com:remkop/picocli.git</developerConnection>
<url>https://github.com/remkop/picocli/tree/master</url>
</scm>
<dependencies>
<dependency>
<groupId>info.picocli</groupId>
<artifactId>picocli</artifactId>
<version>4.7.3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
<version>2.14.6</version>
<scope>compile</scope>
</dependency>
</dependencies>
</project>

10
picocli.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Thu Jun 1 11:46:11 UTC 2023 - Anton Shvetz <shvetz.anton@gmail.com>
- Upgrade to version 4.7.3
* full changes from previous versions are in
https://github.com/remkop/picocli/blob/v4.7.3/RELEASE-NOTES.md
- Package artifacts: picocli-{codegen,shell-jline2}
- JPMS: package module discriptors when building with java >= 9
- Take POMs from Maven Central
-------------------------------------------------------------------
Fri Jun 24 09:48:56 UTC 2022 - Fridrich Strba <fstrba@suse.com>

57
picocli.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package picocli
#
# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,7 +17,7 @@
Name: picocli
Version: 4.6.2
Version: 4.7.3
Release: 0
Summary: Tiny Command Line Interface
License: Apache-2.0
@ -25,10 +25,14 @@ Group: Development/Libraries/Java
URL: https://picocli.info/
Source0: https://github.com/remkop/%{name}/archive/v%{version}.tar.gz
Source1: %{name}-build.xml
Source2: https://repo1.maven.org/maven2/info/%{name}/%{name}/%{version}/%{name}-%{version}.pom
Source3: https://repo1.maven.org/maven2/info/%{name}/%{name}-codegen/%{version}/%{name}-codegen-%{version}.pom
Source4: https://repo1.maven.org/maven2/info/%{name}/%{name}-shell-jline2/%{version}/%{name}-shell-jline2-%{version}.pom
BuildRequires: ant
BuildRequires: aqute-bnd
BuildRequires: fdupes
BuildRequires: javapackages-local
BuildRequires: mvn(jline:jline)
BuildArch: noarch
%description
@ -44,31 +48,54 @@ Group: Documentation/HTML
This package contains the API documentation for %{name}.
%prep
%setup -q -n %{name}-%{version}
%pom_xpath_set pom:project/pom:version %{version}
%setup -q
cp %{SOURCE1} build.xml
%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
mv src/main/java9/module-info.java src/main/java
mv picocli-codegen/src/main/java9/module-info.java picocli-codegen/src/main/java
mv picocli-shell-jline2/src/main/java9/module-info.java picocli-shell-jline2/src/main/java
%else
sed -i -e 's/\<modulepath\>/classpath/g' build.xml
%endif
%build
%ant jar javadoc
%{ant} \
-Dproject.version=%{version} \
-Djline2.jar=$(find-jar jline/jline) \
%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
-Dcompiler.source=9 \
%endif
jar javadoc
# Convert to OSGi bundle
bnd wrap \
--bsn %{name} \
--version %{version} \
--output target/%{name}-%{version}.bar \
--properties bnd.bnd \
target/%{name}-%{version}.jar
--bsn %{name} \
--version %{version} \
--output target/%{name}-%{version}.bar \
--properties bnd.bnd \
target/%{name}-%{version}.jar
mv target/%{name}-%{version}.bar target/%{name}-%{version}.jar
%install
#jar
install -dm 0755 %{buildroot}%{_javadir}/%{name}
install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar
install -dm0755 %{buildroot}%{_javadir}/%{name}
install -pm0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar
install -pm0644 target/%{name}-codegen-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}-codegen.jar
install -pm0644 target/%{name}-shell-jline2-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}-shell-jline2.jar
#pom
install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom
install -dm0755 %{buildroot}%{_mavenpomdir}/%{name}
install -pm0644 %{SOURCE2} %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom
install -pm0644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/%{name}/%{name}-codegen.pom
install -pm0644 %{SOURCE4} %{buildroot}%{_mavenpomdir}/%{name}/%{name}-shell-jline2.pom
%add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar
%add_maven_depmap %{name}/%{name}-codegen.pom %{name}/%{name}-codegen.jar
%add_maven_depmap %{name}/%{name}-shell-jline2.pom %{name}/%{name}-shell-jline2.jar
#javadoc
install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
install -dm0755 %{buildroot}%{_javadocdir}/%{name}
cp -r target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
%fdupes -s %{buildroot}%{_javadocdir}

BIN
v4.6.2.tar.gz (Stored with Git LFS)
View File

Binary file not shown.

3
v4.7.3.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:80ac00b3e60b0c267072d033823f608a5978b28e0809e88896c5bb5a5c5c17e6
size 57408450