Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package picocli for openSUSE:Factory checked in at 2023-06-07 23:07:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/picocli (Old) and /work/SRC/openSUSE:Factory/.picocli.new.15902 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "picocli" Wed Jun 7 23:07:20 2023 rev:4 rq:1091134 version:4.7.3 Changes: -------- --- /work/SRC/openSUSE:Factory/picocli/picocli.changes 2022-06-25 10:24:17.918676874 +0200 +++ /work/SRC/openSUSE:Factory/.picocli.new.15902/picocli.changes 2023-06-07 23:07:55.151516575 +0200 @@ -1,0 +2,18 @@ +Mon Jun 5 17:59:16 UTC 2023 - Fridrich Strba <[email protected]> + +- 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 <[email protected]> + +- 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 + +------------------------------------------------------------------- Old: ---- v4.6.2.tar.gz New: ---- picocli-4.7.3.pom picocli-codegen-4.7.3.pom picocli-shell-jline2-4.7.3.pom v4.7.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ picocli.spec ++++++ --- /var/tmp/diff_new_pack.mffuIP/_old 2023-06-07 23:07:57.643531046 +0200 +++ /var/tmp/diff_new_pack.mffuIP/_new 2023-06-07 23:07:57.699531371 +0200 @@ -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 @@ 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 @@ 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,12 +72,15 @@ 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} \ @@ -61,14 +92,23 @@ %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 @@ %license LICENSE %doc README.md +%files codegen -f .mfiles-codegen + +%files shell-jline2 -f .mfiles-shell-jline2 + %files javadoc %{_javadocdir}/%{name} %license LICENSE ++++++ picocli-4.7.3.pom ++++++ <?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>[email protected]</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> ++++++ picocli-build.xml ++++++ --- /var/tmp/diff_new_pack.mffuIP/_old 2023-06-07 23:07:58.191534228 +0200 +++ /var/tmp/diff_new_pack.mffuIP/_new 2023-06-07 23:07:58.219534390 +0200 @@ -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="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.srcDir9" value="src/main/java9"/> <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,7 @@ <target name="compile" description="Compile the code"> <mkdir dir="${build.outputDir}"/> + <!-- Build all except module-info.java with source/target 8 --> <javac destdir="${build.outputDir}" nowarn="false" debug="true" @@ -43,11 +46,107 @@ 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> + <!-- Build module-info.java with release 9 --> + <javac destdir="${build.outputDir}" + nowarn="false" + debug="true" + optimize="false" + deprecation="true" + release="9" + verbose="false" + fork="false" + encoding="UTF-8" + createMissingPackageInfoClass="false"> + <src> + <pathelement location="${build.srcDir9}"/> + </src> + </javac> + <!-- Build all except module-info.java with source/target 8 --> + <mkdir dir="picocli-codegen/${build.outputDir}"/> + <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> + <classpath> + <pathelement location="${build.outputDir}"/> + </classpath> + </javac> + <!-- Build module-info.java with release 9 --> + <javac destdir="picocli-codegen/${build.outputDir}" + nowarn="false" + debug="true" + optimize="false" + deprecation="true" + release="9" + verbose="false" + fork="false" + encoding="UTF-8" + createMissingPackageInfoClass="false"> + <src> + <pathelement location="picocli-codegen/${build.srcDir9}"/> + </src> + <include name="**/module-info.java"/> + <modulepath> + <pathelement location="${build.outputDir}"/> + </modulepath> + </javac> + <!-- Build all except module-info.java with source/target 8 --> + <mkdir dir="picocli-shell-jline2/${build.outputDir}"/> + <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> + <classpath> + <pathelement location="${build.outputDir}"/> + <pathelement location="${jline2.jar}"/> + </classpath> + </javac> + <!-- Build module-info.java with release 9 --> + <javac destdir="picocli-shell-jline2/${build.outputDir}" + nowarn="false" + debug="true" + optimize="false" + deprecation="true" + release="9" + verbose="false" + fork="false" + encoding="UTF-8" + createMissingPackageInfoClass="false"> + <src> + <pathelement location="picocli-shell-jline2/${build.srcDir9}"/> + </src> + <modulepath> + <pathelement location="${build.outputDir}"/> + <pathelement location="${jline2.jar}"/> + </modulepath> + </javac> </target> <!-- ====================================================================== --> @@ -55,11 +154,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 +170,20 @@ nohelp="false" nonavbar="false" serialwarn="false" - charset="ISO-8859-1" + encoding="UTF-8" + charset="UTF-8" linksource="false" - breakiterator="false"/> + breakiterator="false" + source="${compiler.source}" + > + <sourcepath> + <pathelement location="${build.srcDir}"/> + <pathelement location="picocli-codegen/${build.srcDir}"/> + </sourcepath> + <classpath> + <pathelement location="${build.outputDir}"/> + </classpath> + </javadoc> </target> <!-- ====================================================================== --> @@ -82,11 +191,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> <!-- ====================================================================== --> ++++++ picocli-codegen-4.7.3.pom ++++++ <?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>[email protected]</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> ++++++ picocli-shell-jline2-4.7.3.pom ++++++ <?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>[email protected]</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> ++++++ v4.6.2.tar.gz -> v4.7.3.tar.gz ++++++ /work/SRC/openSUSE:Factory/picocli/v4.6.2.tar.gz /work/SRC/openSUSE:Factory/.picocli.new.15902/v4.7.3.tar.gz differ: char 12, line 1
