Skip to content

Commit 16c03af

Browse files
authored
fixed regexp build failure caused by javac version 6 not being supported (#13073)
1 parent 02f535b commit 16c03af

2 files changed

Lines changed: 9 additions & 5 deletions

File tree

SPECS-EXTENDED/regexp/regexp.spec

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ Distribution: Azure Linux
2323
%define section free
2424
Name: regexp
2525
Version: 1.5
26-
Release: 23%{?dist}
26+
Release: 24%{?dist}
2727
Summary: Simple regular expressions API
2828
License: Apache-2.0
2929
Group: Development/Libraries/Java
30-
Url: http://jakarta.apache.org/%{name}/
31-
Source0: http://www.apache.org/dist/jakarta/regexp/jakarta-regexp-%{version}.tar.gz
30+
Url: https://jakarta.apache.org/%{name}/
31+
Source0: https://archive.apache.org/dist/jakarta/regexp/source/jakarta-regexp-%{version}.tar.gz
3232
Source1: regexp-%{version}.pom
3333
BuildRequires: ant
3434
BuildRequires: ant >= 1.6
@@ -58,7 +58,7 @@ find . -type f -name "*.jar" | xargs -t rm
5858
export OPT_JAR_LIST=:
5959
export CLASSPATH=
6060
mkdir lib
61-
ant -Djakarta-site2.dir=. -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 jar
61+
ant -Djakarta-site2.dir=. -Dant.build.javac.source=1.7 -Dant.build.javac.target=1.7 jar
6262

6363
%install
6464
# jars
@@ -79,6 +79,10 @@ install -p -m 0644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
7979
%{_datadir}/maven-metadata/%{name}.xml*
8080

8181
%changelog
82+
* Fri Mar 21 2025 Aninda Pradhan <v-anipradhan@microsoft.com> - 1.5-24
83+
- Fixed build failure caused by javac source & target version 6 not being supported.
84+
- License Verified
85+
8286
* Thu Oct 14 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.5-23
8387
- Converting the 'Release' tag to the '[number].[distribution]' format.
8488

cgmanifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26034,7 +26034,7 @@
2603426034
"other": {
2603526035
"name": "regexp",
2603626036
"version": "1.5",
26037-
"downloadUrl": "http://www.apache.org/dist/jakarta/regexp/jakarta-regexp-1.5.tar.gz"
26037+
"downloadUrl": "https://archive.apache.org/dist/jakarta/regexp/source/jakarta-regexp-1.5.tar.gz"
2603826038
}
2603926039
}
2604026040
},

0 commit comments

Comments
 (0)