Skip to content

Commit cba2a2e

Browse files
Update beust-jcommander to version 2.0 (#10630)
1 parent 063095b commit cba2a2e

5 files changed

Lines changed: 13 additions & 72 deletions

File tree

SPECS-EXTENDED/beust-jcommander/0001-ParseValues-NullPointerException-patch.patch

Lines changed: 0 additions & 61 deletions
This file was deleted.

SPECS-EXTENDED/beust-jcommander/beust-jcommander-build.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
<property name="build.srcDir.0" value="src/main/java"/>
2424
<property name="build.resourceDir.0" value="src/main/resources"/>
2525

26-
<property name="compiler.source" value="1.7"/>
27-
<property name="compiler.target" value="1.7"/>
26+
<property name="compiler.source" value="8"/>
27+
<property name="compiler.target" value="8"/>
2828

2929
<property name="reporting.outputDirectory" value="${build.dir}/site"/>
3030

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"Signatures": {
3-
"beust-jcommander-1.78.tar.gz": "8c4300d857a5a27b1183c2f45dffa8eebdafa3fb629bf5026f26e8d17fb9a625",
4-
"beust-jcommander-build.xml": "9113464bee854acba51596ffce8497a546157bd019b251149b06ad7ab6930d5e",
3+
"beust-jcommander-2.0.tar.gz": "411c32939e8bc6abc636d33ae1d48ed9a657074389f912e97fdecca7fef4513a",
4+
"beust-jcommander-build.xml": "408eeb9a216d986c858c15dc4ccd02dce9ca8cada594c902e5ff110329a2b40f",
55
"beust-jcommander.pom": "38550ab84a095de67fad9913b35ab3fd449824cfe0a0028448f2e513b602e529"
66
}
7-
}
7+
}

SPECS-EXTENDED/beust-jcommander/beust-jcommander.spec

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Distribution: Azure Linux
2020

2121
%global short_name jcommander
2222
Name: beust-%{short_name}
23-
Version: 1.78
23+
Version: 2.0
2424
Release: 1%{?dist}
2525
Summary: Java framework for parsing command line parameters
2626
License: Apache-2.0
@@ -30,7 +30,6 @@ Source0: https://github.com/cbeust/%{short_name}/archive/%{version}.tar.g
3030
# Adapted from earlier version that still shipped poms. It uses kobalt for building now
3131
Source1: %{name}.pom
3232
Source2: %{name}-build.xml
33-
Patch0: 0001-ParseValues-NullPointerException-patch.patch
3433
BuildRequires: ant
3534
BuildRequires: fdupes
3635
BuildRequires: java-devel >= 1.8
@@ -52,9 +51,8 @@ Group: Development/Libraries/Java
5251
This package contains the %{summary}.
5352

5453
%prep
55-
%setup -q -n %{name}-%{version}
54+
%setup -q -n %{short_name}-%{version}
5655
rm -rf gradle* kobalt* lib
57-
%patch 0 -p1
5856

5957
chmod -x license.txt
6058
cp -p %{SOURCE1} pom.xml
@@ -90,6 +88,10 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
9088
%{_javadocdir}/%{name}
9189

9290
%changelog
91+
* Thu Oct 03 2024 Kevin Lockwood <v-klockwood@microsoft.com> - 2.0-1
92+
- Catch up to upstream
93+
- License Verified
94+
9395
* Thu Nov 12 2020 Joe Schmitt <joschmit@microsoft.com> - 1.78-1
9496
- Initial CBL-Mariner import from openSUSE Tumbleweed (license: same as "License" tag).
9597
- Use javapackages-local-bootstrap to avoid build cycle.

cgmanifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1077,8 +1077,8 @@
10771077
"type": "other",
10781078
"other": {
10791079
"name": "beust-jcommander",
1080-
"version": "1.78",
1081-
"downloadUrl": "https://github.com/cbeust/jcommander/archive/1.78.tar.gz"
1080+
"version": "2.0",
1081+
"downloadUrl": "https://github.com/cbeust/jcommander/archive/2.0.tar.gz"
10821082
}
10831083
}
10841084
},

0 commit comments

Comments
 (0)