Accepting request 1219749 from Java:packages

4.7.6 OBS-URL: https://build.opensuse.org/request/show/1219749 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/picocli?expand=0&rev=11
2024-10-31 15:09:43 +00:00 · 2024-10-31 15:09:43 +00:00 · 9c8a017cad
commit 9c8a017cad
parent 29224bbfa2 2581635ba0
14 changed files with 500 additions and 11 deletions
--- a/4
+++ b/4
@ -0,0 +1,4 @@
+<multibuild>
+  <package>picocli-extras</package>
+</multibuild>
+
--- a/4
+++ b/4
@ -1,8 +1,8 @@
 <services>
 	<service name="tar_scm" mode="disabled">
 		<param name="scm">git</param>
-		<param name="url">https://github.com/remkop/picocli.git</param>
-		<param name="revision">v4.7.5</param>
+		<param name="url">https://github.com/fridrich/picocli.git</param>
+		<param name="revision">b3a163247a5237690d6ad1b4de28070bdf1e6001</param>
 		<param name="match-tag">v*</param>
 		<param name="versionformat">@PARENT_TAG@</param>
 		<param name="versionrewrite-pattern">v(.*)</param>
--- a/picocli-4.7.5.tar.xz
+++ b/picocli-4.7.5.tar.xz
--- a/picocli-4.7.6.pom
+++ b/picocli-4.7.6.pom
@ -4,7 +4,7 @@
  <modelVersion>4.0.0</modelVersion>
  <groupId>info.picocli</groupId>
  <artifactId>picocli</artifactId>
-  <version>4.7.5</version>
+  <version>4.7.6</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>
--- a/picocli-4.7.6.tar.xz
+++ b/picocli-4.7.6.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1d7a081d1b799f4d3636f953031460c393b1ffdcd5deb78f5afc1cff13f1d042
+size 908040
--- a/picocli-codegen-4.7.6.pom
+++ b/picocli-codegen-4.7.6.pom
@ -4,7 +4,7 @@
  <modelVersion>4.0.0</modelVersion>
  <groupId>info.picocli</groupId>
  <artifactId>picocli-codegen</artifactId>
-  <version>4.7.5</version>
+  <version>4.7.6</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>
@ -32,7 +32,7 @@
    <dependency>
      <groupId>info.picocli</groupId>
      <artifactId>picocli</artifactId>
-      <version>4.7.5</version>
+      <version>4.7.6</version>
      <scope>compile</scope>
    </dependency>
  </dependencies>
--- a/picocli-extras-build.xml
+++ b/picocli-extras-build.xml
@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="picocli-extras" default="package" basedir=".">
+
+  <!-- ====================================================================== -->
+  <!-- Build environment properties                                           -->
+  <!-- ====================================================================== -->
+
+  <property file="build.properties"/>
+
+  <property name="project.artifactId" value="picocli"/>
+  <property name="project.version" value="[UNKNOWN]"/>
+
+  <property name="compiler.release" value="8"/>
+  <property name="compiler.source" value="1.${compiler.release}"/>
+  <property name="compiler.target" value="${compiler.source}"/>
+
+  <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.srcDir9" value="src/main/java9"/>
+  <property name="build.resourceDir" value="src/main/resources"/>
+  <property name="reporting.outputDirectory" value="${build.dir}/site"/>
+
+  <property name="jline3.jar" location="[UNKNOWN]"/>
+  <property name="picocli.jar" location ="[UNKNOWN]"/>
+
+  <!-- ====================================================================== -->
+  <!-- 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}"/>
+    <!-- Build all except module-info.java with source/target 8 -->
+    <mkdir dir="${project.artifactId}-shell-jline3/${build.outputDir}"/>
+    <javac destdir="${project.artifactId}-shell-jline3/${build.outputDir}"
+           nowarn="false"
+           debug="true"
+           optimize="false"
+           deprecation="true"
+           release="${compiler.release}"
+           target="${compiler.target}"
+           verbose="false"
+           fork="false"
+           source="${compiler.source}"
+           encoding="UTF-8"
+           createMissingPackageInfoClass="false">
+      <src>
+        <pathelement location="${project.artifactId}-shell-jline3/${build.srcDir}"/>
+      </src>
+      <classpath>
+        <pathelement location="${picocli.jar}"/>
+        <pathelement location="${jline3.jar}"/>
+      </classpath>
+    </javac>
+    <!-- Build module-info.java with release 9 -->
+    <javac destdir="${project.artifactId}-shell-jline3/${build.outputDir}"
+           nowarn="false"
+           debug="true"
+           optimize="false"
+           deprecation="true"
+           release="9"
+           verbose="false"
+           fork="false"
+           encoding="UTF-8"
+           createMissingPackageInfoClass="false">
+      <src>
+        <pathelement location="${project.artifactId}-shell-jline3/${build.srcDir9}"/>
+      </src>
+      <modulepath>
+        <pathelement location="${picocli.jar}"/>
+        <pathelement location="${jline3.jar}"/>
+      </modulepath>
+    </javac>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Javadoc target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="javadoc" description="Generates the Javadoc of the application">
+    <javadoc packagenames="*"
+             destdir="${reporting.outputDirectory}/apidocs"
+             access="protected"
+             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"
+             charset="UTF-8"
+             linksource="false"
+             breakiterator="false"
+             source="${compiler.source}">
+      <sourcepath>
+        <pathelement location="${project.artifactId}-shell-jline3/${build.srcDir}"/>
+      </sourcepath>
+      <classpath>
+        <pathelement location="${picocli.jar}"/>
+        <pathelement location="${jline3.jar}"/>
+      </classpath>
+    </javadoc>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Package target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="package" depends="compile" description="Package the application">
+    <jar jarfile="${build.dir}/${project.artifactId}-shell-jline3-${project.version}.jar"
+         compress="true"
+         index="false"
+         basedir="${project.artifactId}-shell-jline3/${build.outputDir}"
+         excludes="**/package.html"/>
+  </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>
--- a/picocli-extras.changes
+++ b/picocli-extras.changes
@ -0,0 +1,153 @@
+-------------------------------------------------------------------
+Thu Oct 31 00:22:20 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Update to version 4.7.6
+  * Enhancements
+    + PropertiesDefaultProvider should try to load properties from
+      classpath (last).
+    + Change log level from WARN to INFO when bean not found in
+      ApplicationContext.
+    + Don't show hidden commands in JLine3 command description.
+    + Use ... vararg instead of array parameter to match overridden
+      method signature.
+  * Bugfixes:
+    + defaultValue should not be applied in addition to
+      user-specified value for options with a custom
+      IParameterConsumer.
+    + Fix NPE in jline3 Example.jar as ConfigurationPath cannot be
+      null anymore.
+    + fix bug for Optional<T> arguments with initial value.
+    + @Option-annotated setter method not invoked with default value
+      when used in mixin for both command and subcommand.
+    + Custom type converter for primitive boolean options should not
+      be ignored.
+  * BUILD fixes:
+    + fix errorprone TruthSelfEquals warnings
+    + Fix broken build.
+    + Fix .gitattributes related CR/LF problems.
+    + Add Error Prone.
+  * CLEAN fix:
+    + Remove unused extra format arguments.
+  * DOC fixes:
+    + Fix a few typos in CommandLine's JavaDoc.
+    + Clarify documentation for negatable options.
+    + Clarify that ParseResult passed to IExecutionExceptionHandler
+      is the top-level parse result, not the parse result of the
+      subcommand that failed.
+- Due to a bug in the upstream github repository, fetch sources from
+  our private fork until https://github.com/remkop/picocli/pull/2347
+  gets integrated upstream
+
+-------------------------------------------------------------------
+Wed Oct 30 22:45:12 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Create a second spec file picocli-extras to be able to build
+  the picocli-shell-jline3 artifact without build cycles
+
+-------------------------------------------------------------------
+Wed Oct  2 15:59:18 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Spec file cleanup
+
+-------------------------------------------------------------------
+Mon Apr 29 11:53:54 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- The binaries are compatible with java 1.8
+
+-------------------------------------------------------------------
+Sun Sep 10 10:27:31 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Reproducible builds: Do not create timestamps with bnd wrap
+
+-------------------------------------------------------------------
+Sun Aug 27 06:46:38 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Update to version 4.7.5
+  * Enhancements:
+    + Java 22 update: improve logic for detecting if the output
+      stream is connected to a terminal.
+    + Mask parameters in trace log when echo=false for interactive
+      options and positional parameters.
+  * Bugfixes:
+    + Fix positional parameters bug with late-resolved arity
+      variable.
+    + Don't generate auto-complete for hidden attributes in
+      picocli.shell.jline3.PicoCommand.
+    + ArgGroup with exclusive=false and multiplicity=1 should
+      require at least one option; fix regression and refine
+      solution introduced in [#1848][#2030].
+  * DOC fixes:
+    + Improve GraalVM documentation: add
+      graalvm-native-image-plugin.
+    + Commit html files with LF line-endings.
+- Removed patch:
+  * revert-version.patch
+    + not needed any more
+
+-------------------------------------------------------------------
+Sat Aug 26 05:11:45 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Fetch sources from upstream repository, since our pull request
+  https://github.com/remkop/picocli/pull/2045 has been integrated
+
+-------------------------------------------------------------------
+Tue Jun 13 12:49:00 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Update to version 4.7.4
+  * Fixes:
+    + API: Add setter for name in
+      picocli.shell.jline3.PicocliCommands.
+    + Enhancement: Improved feedback on mistyped subcommands
+    + Enhancement: prevent
+      java.nio.charset.UnsupportedCharsetException: cp0 on windows,
+      and fall back to the default charset if the charset provided
+      by System property sun.stdout.encoding is invalid
+    + Bugfix: Option "mapFallbackValue" ignored when inherited to
+      subcommand
+    + Bugfix: fix issue with required options in ArgGroup becoming
+      optional when combined with DefaultValueProvider
+- Fetch sources using source service: this allows filter out
+  binaries with spurious legal status and which we don't use for
+  build
+- Due to a bug in the upstream github repository, fetch sources from
+  our private fork until https://github.com/remkop/picocli/pull/2045
+  gets integrated upstream
+- Added patch:
+  * revert-version.patch
+    + revert a version change between our fixed code and the
+      upstream tag
+
+-------------------------------------------------------------------
+Mon Jun  5 17:59:16 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Require java 9 for build so that we can build the module-info.java
+  always
+- Build all classes with source/target 8 and the module-info.java
+  with release 9, which makes the jars usable with java 8 and higher
+
+-------------------------------------------------------------------
+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>
+
+- Build picocli using ant to avoid cycles
+
+-------------------------------------------------------------------
+Tue Jan 18 08:15:11 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to version 4.6.2
+  * full changes from previous versions are in
+    https://github.com/remkop/picocli/blob/v4.6.2/RELEASE-NOTES.md
+
+-------------------------------------------------------------------
+Fri Nov  8 09:48:24 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Initial packaging of picocli 4.0.4
--- a/picocli-extras.spec
+++ b/picocli-extras.spec
@ -0,0 +1,99 @@
+#
+# spec file for package picocli-extras
+#
+# Copyright (c) 2024 SUSE LLC
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
+#
+
+
+# The automatic requires would be java-headless >= 9, but the
+# binaries are java 8 compatible
+%define __requires_exclude java-headless
+%global base_name picocli
+Name:           %{base_name}-extras
+Version:        4.7.6
+Release:        0
+Summary:        Tiny Command Line Interface
+License:        Apache-2.0
+Group:          Development/Libraries/Java
+URL:            https://picocli.info/
+Source0:        %{base_name}-%{version}.tar.xz
+Source1:        %{name}-build.xml
+Source2:        https://repo1.maven.org/maven2/info/%{base_name}/%{base_name}-shell-jline3/%{version}/%{base_name}-shell-jline3-%{version}.pom
+BuildRequires:  ant
+BuildRequires:  fdupes
+BuildRequires:  java-devel >= 9
+BuildRequires:  javapackages-local >= 6
+BuildRequires:  jline3
+BuildRequires:  picocli
+Requires:       java-headless >= 1.8
+BuildArch:      noarch
+
+%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.
+
+%package -n %{base_name}-shell-jline3
+Summary:        Picocli Shell JLine3
+Group:          Development/Libraries/Java
+Requires:       java-headless >= 1.8
+
+%description -n %{base_name}-shell-jline3
+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.
+
+Library to build interactive shell applications with JLine 3 and picocli.
+
+%package javadoc
+Summary:        Javadoc for %{name}
+Group:          Documentation/HTML
+
+%description javadoc
+This package contains the API documentation for %{name}.
+
+%prep
+%setup -q -n %{base_name}-%{version}
+cp %{SOURCE1} build.xml
+
+%build
+%{ant} \
+	-Dproject.version=%{version} \
+	-Djline3.jar=$(find-jar jline3/jline) \
+    -Dpicocli.jar=$(find-jar picocli/picocli) \
+	jar javadoc
+
+%install
+#jar
+install -dm0755 %{buildroot}%{_javadir}/%{base_name}
+install -pm0644 target/%{base_name}-shell-jline3-%{version}.jar %{buildroot}%{_javadir}/%{base_name}/%{base_name}-shell-jline3.jar
+
+#pom
+install -dm0755 %{buildroot}%{_mavenpomdir}/%{base_name}
+%{mvn_install_pom} %{SOURCE2} %{buildroot}%{_mavenpomdir}/%{base_name}/%{base_name}-shell-jline3.pom
+
+%add_maven_depmap %{base_name}/%{base_name}-shell-jline3.pom %{base_name}/%{base_name}-shell-jline3.jar -f shell-jline3
+
+#javadoc
+install -dm0755 %{buildroot}%{_javadocdir}/%{name}
+cp -r target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
+%fdupes -s %{buildroot}%{_javadocdir}
+
+%files -n %{base_name}-shell-jline3 -f .mfiles-shell-jline3
+
+%files javadoc
+%{_javadocdir}/%{name}
+%license LICENSE
+
+%changelog
--- a/picocli-shell-jline2-4.7.6.pom
+++ b/picocli-shell-jline2-4.7.6.pom
@ -4,7 +4,7 @@
  <modelVersion>4.0.0</modelVersion>
  <groupId>info.picocli</groupId>
  <artifactId>picocli-shell-jline2</artifactId>
-  <version>4.7.5</version>
+  <version>4.7.6</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>
@ -32,7 +32,7 @@
    <dependency>
      <groupId>info.picocli</groupId>
      <artifactId>picocli</artifactId>
-      <version>4.7.5</version>
+      <version>4.7.6</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
--- a/picocli-shell-jline3-4.7.6.pom
+++ b/picocli-shell-jline3-4.7.6.pom
@ -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-jline3</artifactId>
+  <version>4.7.6</version>
+  <name>picocli-shell-jline3</name>
+  <description>Picocli Shell JLine3 - easily build interactive shell applications with JLine 3 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.6</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jline</groupId>
+      <artifactId>jline</artifactId>
+      <version>3.26.1</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+</project>
--- a/picocli.changes
+++ b/picocli.changes
@ -1,3 +1,49 @@
+-------------------------------------------------------------------
+Thu Oct 31 00:22:20 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Update to version 4.7.6
+  * Enhancements
+    + PropertiesDefaultProvider should try to load properties from
+      classpath (last).
+    + Change log level from WARN to INFO when bean not found in
+      ApplicationContext.
+    + Don't show hidden commands in JLine3 command description.
+    + Use ... vararg instead of array parameter to match overridden
+      method signature.
+  * Bugfixes:
+    + defaultValue should not be applied in addition to
+      user-specified value for options with a custom
+      IParameterConsumer.
+    + Fix NPE in jline3 Example.jar as ConfigurationPath cannot be
+      null anymore.
+    + fix bug for Optional<T> arguments with initial value.
+    + @Option-annotated setter method not invoked with default value
+      when used in mixin for both command and subcommand.
+    + Custom type converter for primitive boolean options should not
+      be ignored.
+  * BUILD fixes:
+    + fix errorprone TruthSelfEquals warnings
+    + Fix broken build.
+    + Fix .gitattributes related CR/LF problems.
+    + Add Error Prone.
+  * CLEAN fix:
+    + Remove unused extra format arguments.
+  * DOC fixes:
+    + Fix a few typos in CommandLine's JavaDoc.
+    + Clarify documentation for negatable options.
+    + Clarify that ParseResult passed to IExecutionExceptionHandler
+      is the top-level parse result, not the parse result of the
+      subcommand that failed.
+- Due to a bug in the upstream github repository, fetch sources from
+  our private fork until https://github.com/remkop/picocli/pull/2347
+  gets integrated upstream
+
+-------------------------------------------------------------------
+Wed Oct 30 22:45:12 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Create a second spec file picocli-extras to be able to build
+  the picocli-shell-jline3 artifact without build cycles
+
 -------------------------------------------------------------------
 Wed Oct  2 15:59:18 UTC 2024 - Fridrich Strba <fstrba@suse.com>

--- a/picocli.spec
+++ b/picocli.spec
@ -20,7 +20,7 @@
 # binaries are java 8 compatible
 %define __requires_exclude java-headless
 Name:           picocli
-Version:        4.7.5
+Version:        4.7.6
 Release:        0
 Summary:        Tiny Command Line Interface
 License:        Apache-2.0
--- a/pre_checkin.sh
+++ b/pre_checkin.sh
@ -0,0 +1,4 @@
+#!/bin/sh
+cp picocli.changes picocli-extras.changes
+osc service runall format_spec_file
+