diff --git a/.beust-jcommander.metadata b/.beust-jcommander.metadata index c8dfea9..be40653 100644 --- a/.beust-jcommander.metadata +++ b/.beust-jcommander.metadata @@ -1 +1 @@ -13dab46979d9f268d8e2aa1406f84a448096dbde SOURCES/beust-jcommander-1.78.tar.gz +bb98ddabee03d9e9adafb94e3c378fa4484f50cd SOURCES/beust-jcommander-1.82.tar.gz diff --git a/.gitignore b/.gitignore index 9d5ca89..acf3c49 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/beust-jcommander-1.78.tar.gz +SOURCES/beust-jcommander-1.82.tar.gz diff --git a/SOURCES/beust-jcommander.pom b/SOURCES/beust-jcommander.pom deleted file mode 100644 index f36c4ad..0000000 --- a/SOURCES/beust-jcommander.pom +++ /dev/null @@ -1,277 +0,0 @@ - - - - 4.0.0 - com.beust - jcommander - jar - JCommander - @VERSION@ - A Java framework to parse command line options with annotations. - http://beust.com/jcommander - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - scm:git:git@github.com:cbeust/jcommander.git - scm:git:git@github.com:cbeust/jcommander.git - git@github.com:cbeust/jcommander.git - - - - - jcenter - bintray - http://jcenter.bintray.com - - - - - - - sonatype-nexus-staging - Nexus Staging Repository - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - - Cedric Beust - - - - - org.sonatype.oss - oss-parent - 3 - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.1 - - 1.8 - 1.8 - UTF-8 - - - - - - org.apache.maven.plugins - maven-resources-plugin - 2.4.1 - - UTF-8 - - - - - - org.apache.felix - maven-bundle-plugin - 2.1.0 - - - bundle-manifest - process-classes - - manifest - - - - <_versionpolicy>$(@) - - - - - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.3.1 - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.10 - - false - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.7 - - *.internal - - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.apache.felix - - maven-bundle-plugin - - - [2.1.0,) - - - manifest - - - - - - - - - - - - - - - - - org.testng - testng - 6.8.21 - jar - test - - - jcommander - com.beust - - - - - - - - - - license - - - - com.mycila.maven-license-plugin - maven-license-plugin - 1.7.0 - - false -
src/main/license/license-header.txt
- - src/** - pom.xml - - - **/.git/** - - **/target/** - - false - - - - - check - - - - - - - - - - - sign - - - - maven-gpg-plugin - 1.4 - - - sign-artifacts - verify - - sign - - - - - - - - - - diff --git a/SOURCES/jcommander-1.82.pom b/SOURCES/jcommander-1.82.pom new file mode 100644 index 0000000..23b2d25 --- /dev/null +++ b/SOURCES/jcommander-1.82.pom @@ -0,0 +1,37 @@ + + + + + + + + 4.0.0 + com.beust + jcommander + 1.82 + jcommander + Command line parsing library for Java + https://jcommander.org + + + Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + + + + + cbeust + Cedric Beust + cedric@beust.com + + + + scm:git:git://github.com/cbeust/jcommander.git + https://github.com/cbeust/jcommander + + + Github + https://github.com/cbeust/jcommander/issues + + diff --git a/SPECS/beust-jcommander.spec b/SPECS/beust-jcommander.spec index e2ed2fe..bbee018 100644 --- a/SPECS/beust-jcommander.spec +++ b/SPECS/beust-jcommander.spec @@ -1,24 +1,29 @@ +%bcond_with bootstrap + Name: beust-jcommander -Version: 1.78 -Release: 2%{?dist} +Version: 1.82 +Release: 19%{?dist} Summary: Java framework for parsing command line parameters -License: ASL 2.0 +License: Apache-2.0 URL: http://jcommander.org/ BuildArch: noarch +ExclusiveArch: %{java_arches} noarch # ./generate-tarball.sh Source0: %{name}-%{version}.tar.gz -# Adapted from earlier version that still shipped poms. It uses kobalt for building now -Source1: %{name}.pom +Source1: https://repo1.maven.org/maven2/com/beust/jcommander/%{version}/jcommander-%{version}.pom # Cleaned up bundled jars whose licensing cannot be easily verified Source2: generate-tarball.sh -Patch0: 0001-ParseValues-NullPointerException-patch.patch +Patch: 0001-ParseValues-NullPointerException-patch.patch +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: maven-local BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:) BuildRequires: mvn(org.testng:testng) +%endif %description JCommander is a very small Java framework that makes it trivial to @@ -28,30 +33,106 @@ parse command line parameters (with annotations). Summary: API documentation for %{name} %description javadoc -This package contains the %{summary}. +API documentation for %{name}. %prep -%setup -q -%patch0 -p1 - +%autosetup -p1 chmod -x license.txt + cp -p %SOURCE1 pom.xml -sed -i 's/@VERSION@/%{version}/g' pom.xml +%pom_xpath_set "pom:project/pom:version" "%{version}" + +# maven-surefire-plugin requires explicit version >= 4.7 +%pom_add_dep org.testng:testng:4.7:test + +%mvn_file : %{name} %build -%mvn_file : %{name} %mvn_build %install %mvn_install %files -f .mfiles -%doc license.txt notice.md README.markdown +%license license.txt notice.md +%doc README.markdown %files javadoc -f .mfiles-javadoc -%doc license.txt notice.md +%license license.txt notice.md %changelog +* Fri Nov 29 2024 Mikolaj Izdebski - 1.82-18 +- Update javapackages test plan to f42 + +* Wed Jul 17 2024 Fedora Release Engineering - 1.82-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri May 31 2024 Mikolaj Izdebski - 1.82-10 +- Switch to a newer patch macro syntax + +* Tue Feb 27 2024 Jiri Vanek - 1.82-9 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 1.82-8 +- bump of release for for java-21-openjdk as system jdk + +* Tue Jan 23 2024 Fedora Release Engineering - 1.82-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 1.82-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Tue Oct 31 2023 Mikolaj Izdebski - 1.82-5 +- Fix license directory permissions +- Resolves: rhbz#2144648 + +* Fri Sep 01 2023 Mikolaj Izdebski - 1.82-4 +- Convert License tag to SPDX format + +* Wed Jul 19 2023 Fedora Release Engineering - 1.82-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Jan 18 2023 Fedora Release Engineering - 1.82-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Sep 07 2022 Marian Koncek - 1.82-1 +- Update to upstream version 1.82 + +* Wed Jul 20 2022 Fedora Release Engineering - 1.78-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 05 2022 Jiri Vanek - 1.78-9 +- Rebuilt for java-17-openjdk as system jdk + +* Wed Jan 19 2022 Fedora Release Engineering - 1.78-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jul 21 2021 Fedora Release Engineering - 1.78-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 1.78-6 +- Bootstrap build +- Non-bootstrap build + +* Tue Jan 26 2021 Fedora Release Engineering - 1.78-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 1.78-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 1.78-3 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Tue Jun 09 2020 Fedora Release Engineering - 1.78-3 +- skipped tests as they require user input with jdk11, changed way of javadoc generation + +* Tue Jan 28 2020 Fedora Release Engineering - 1.78-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Nov 09 2019 Fabio Valentini - 1.78-1 +- Update to version 1.78. +- Remove unnecessary parent from POM file. + * Tue Nov 05 2019 Mikolaj Izdebski - 1.78-2 - Mass rebuild for javapackages-tools 201902 @@ -61,9 +142,15 @@ sed -i 's/@VERSION@/%{version}/g' pom.xml * Thu Aug 15 2019 Marian Koncek - 1.75-1 - Update to upstream version 1.75 +* Wed Jul 24 2019 Fedora Release Engineering - 1.71-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri May 24 2019 Mikolaj Izdebski - 1.71-6 - Mass rebuild for javapackages-tools 201901 +* Thu Jan 31 2019 Fedora Release Engineering - 1.71-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Mon Jul 30 2018 Michael Simacek - 1.71-5 - Repack the tarball without binaries