diff --git a/.gitignore b/.gitignore index 8a5dacc..bb5fe93 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,5 @@ /beust-jcommander-1.71.tar.gz /beust-jcommander-1.75.tar.gz /beust-jcommander-1.78.tar.gz +/beust-jcommander-1.82.tar.gz +/jcommander-1.82.pom diff --git a/beust-jcommander.pom b/beust-jcommander.pom deleted file mode 100644 index d34ebbe..0000000 --- a/beust-jcommander.pom +++ /dev/null @@ -1,271 +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.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/beust-jcommander.spec b/beust-jcommander.spec index 9206a93..1d91409 100644 --- a/beust-jcommander.spec +++ b/beust-jcommander.spec @@ -1,8 +1,8 @@ %bcond_with bootstrap Name: beust-jcommander -Version: 1.78 -Release: 10%{?dist} +Version: 1.82 +Release: 1%{?dist} Summary: Java framework for parsing command line parameters License: ASL 2.0 URL: http://jcommander.org/ @@ -11,8 +11,7 @@ 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 @@ -40,24 +39,31 @@ This package contains the %{summary}. %setup -q %patch0 -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 -%build %mvn_file : %{name} + +%build %mvn_build %install %mvn_install %files -f .mfiles -%doc license.txt notice.md README.markdown +%attr(0644,root,root) %license license.txt notice.md +%doc README.markdown %files javadoc -f .mfiles-javadoc -%doc license.txt notice.md +%license license.txt notice.md %changelog +* 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 diff --git a/sources b/sources index 0be1842..82431ad 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (beust-jcommander-1.78.tar.gz) = 618367d1644bf0423c3184bd4a6be73571c1b2de243bb7dad4e72d5a3023bf30116c0e5337088e0e4d1f42f24ba94b0fddaedcd3e54613c335d068edeaddfaef +SHA512 (beust-jcommander-1.82.tar.gz) = f0d13c021429476120ece6a252695dc7b05af41e7bf2535afed6e0e1cadedaea5300a90e0b7f77b413d1f3a049cbd57f96f322ab5d9dcb022ad2ad4c46bc235a +SHA512 (jcommander-1.82.pom) = bf24086ad1466ca1c2c9ad4a5a1dc8e8161a1831117b2a8c91c417101252d4526c83e0a7ab5878ff6e8163901127e9e6cf3457a0d1f7746de4bd6d5fea1d0e8e