diff --git a/picocli-4.7.3.pom b/picocli-4.7.3.pom
new file mode 100644
index 0000000..dba2a32
--- /dev/null
+++ b/picocli-4.7.3.pom
@@ -0,0 +1,31 @@
+
+
+ 4.0.0
+ info.picocli
+ picocli
+ 4.7.3
+ picocli
+ 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.
+ https://picocli.info
+ 2018
+
+
+ The Apache Software License, version 2.0
+ http://www.apache.org/licenses/LICENSE-2.0.txt
+ repo
+
+
+
+
+ rpopma
+ Remko Popma
+ rpopma@apache.org
+
+
+
+ scm:git:https://github.com/remkop/picocli.git
+ scm:git:ssh://github.com:remkop/picocli.git
+ https://github.com/remkop/picocli/tree/master
+
+
diff --git a/picocli-build.xml b/picocli-build.xml
index a04b685..fd96dab 100644
--- a/picocli-build.xml
+++ b/picocli-build.xml
@@ -9,18 +9,20 @@
-
+
-
+
-
+
+
+
@@ -35,6 +37,7 @@
+
+ source="${compiler.source}"
+ encoding="UTF-8"
+ createMissingPackageInfoClass="false">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -55,11 +154,10 @@
-
+ breakiterator="false"
+ source="${compiler.source}"
+ >
+
+
+
+
+
+
+
+
@@ -82,11 +191,24 @@
-
+
+
+
+
diff --git a/picocli-codegen-4.7.3.pom b/picocli-codegen-4.7.3.pom
new file mode 100644
index 0000000..f36f0a6
--- /dev/null
+++ b/picocli-codegen-4.7.3.pom
@@ -0,0 +1,39 @@
+
+
+ 4.0.0
+ info.picocli
+ picocli-codegen
+ 4.7.3
+ picocli-codegen
+ Picocli Code Generation - Tools to generate documentation, configuration, source code and other files from a picocli model.
+ https://picocli.info
+ 2018
+
+
+ The Apache Software License, version 2.0
+ http://www.apache.org/licenses/LICENSE-2.0.txt
+ repo
+
+
+
+
+ rpopma
+ Remko Popma
+ rpopma@apache.org
+
+
+
+ scm:git:https://github.com/remkop/picocli.git
+ scm:git:ssh://github.com:remkop/picocli.git
+ https://github.com/remkop/picocli/tree/master
+
+
+
+ info.picocli
+ picocli
+ 4.7.3
+ compile
+
+
+
diff --git a/picocli-shell-jline2-4.7.3.pom b/picocli-shell-jline2-4.7.3.pom
new file mode 100644
index 0000000..ca38c1b
--- /dev/null
+++ b/picocli-shell-jline2-4.7.3.pom
@@ -0,0 +1,45 @@
+
+
+ 4.0.0
+ info.picocli
+ picocli-shell-jline2
+ 4.7.3
+ picocli-shell-jline2
+ Picocli Shell JLine2 - easily build interactive shell applications with JLine 2 and picocli.
+ https://picocli.info
+ 2018
+
+
+ The Apache Software License, version 2.0
+ http://www.apache.org/licenses/LICENSE-2.0.txt
+ repo
+
+
+
+
+ rpopma
+ Remko Popma
+ rpopma@apache.org
+
+
+
+ scm:git:https://github.com/remkop/picocli.git
+ scm:git:ssh://github.com:remkop/picocli.git
+ https://github.com/remkop/picocli/tree/master
+
+
+
+ info.picocli
+ picocli
+ 4.7.3
+ compile
+
+
+ jline
+ jline
+ 2.14.6
+ compile
+
+
+
diff --git a/picocli.changes b/picocli.changes
index 66c060b..2ae6eae 100644
--- a/picocli.changes
+++ b/picocli.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Mon Jun 5 17:59:16 UTC 2023 - Fridrich Strba
+
+- 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
+
+- 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
diff --git a/picocli.spec b/picocli.spec
index e6b5fe9..3532a96 100644
--- a/picocli.spec
+++ b/picocli.spec
@@ -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,15 @@ 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: java-devel >= 9
BuildRequires: javapackages-local
+BuildRequires: jline >= 2
BuildArch: noarch
%description
@@ -36,6 +41,29 @@ 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 codegen
+Summary: Picocli Code Generation
+Group: Development/Libraries/Java
+
+%description codegen
+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.
+
+Tools to generate documentation, configuration, source code and other files
+from a picocli model.
+
+%package shell-jline2
+Summary: Picocli Shell JLine2
+Group: Development/Libraries/Java
+
+%description shell-jline2
+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 2 and picocli.
+
%package javadoc
Summary: Javadoc for %{name}
Group: Documentation/HTML
@@ -44,31 +72,43 @@ 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
%build
-%ant jar javadoc
+%{ant} \
+ -Dproject.version=%{version} \
+ -Djline2.jar=$(find-jar jline/jline) \
+ 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 -f codegen
+%add_maven_depmap %{name}/%{name}-shell-jline2.pom %{name}/%{name}-shell-jline2.jar -f shell-jline2
+
#javadoc
-install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
+install -dm0755 %{buildroot}%{_javadocdir}/%{name}
cp -r target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
%fdupes -s %{buildroot}%{_javadocdir}
@@ -76,6 +116,10 @@ cp -r target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
%license LICENSE
%doc README.md
+%files codegen -f .mfiles-codegen
+
+%files shell-jline2 -f .mfiles-shell-jline2
+
%files javadoc
%{_javadocdir}/%{name}
%license LICENSE
diff --git a/v4.6.2.tar.gz b/v4.6.2.tar.gz
deleted file mode 100644
index e50c307..0000000
--- a/v4.6.2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ef2daf12243bfee9d581e61a72a9f861b811f5659568d7284aec3c1866d8a385
-size 13488726
diff --git a/v4.7.3.tar.gz b/v4.7.3.tar.gz
new file mode 100644
index 0000000..2686fbc
--- /dev/null
+++ b/v4.7.3.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:80ac00b3e60b0c267072d033823f608a5978b28e0809e88896c5bb5a5c5c17e6
+size 57408450