rpms/maven
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Make JDK bindings work with different Maven version suffixes

Browse Source
This commit is contained in:
Mikolaj Izdebski 2023-12-13 07:54:33 +01:00
parent 57e61541d1
commit b6199561fa
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
0001-Adapt-mvn-script.patch
View File

@ -33,7 +33,7 @@ index a3004f917..9b118717e 100755
fi fi
+ if [ -z "$JAVA_HOME" ] ; then + if [ -z "$JAVA_HOME" ] ; then
+ . /etc/java/maven.conf + . /etc/java/maven@{maven_version_suffix}.conf
+ fi + fi
+ +
if [ -f "$HOME/.mavenrc" ] ; then if [ -f "$HOME/.mavenrc" ] ; then

22
maven.spec
View File

@ -7,7 +7,7 @@
Name: maven Name: maven
Epoch: 1 Epoch: 1
Version: 3.9.6 Version: 3.9.6
Release: 1%{?dist} Release: 2%{?dist}
Summary: Java project management and project comprehension tool Summary: Java project management and project comprehension tool
# maven itself is Apache-2.0 # maven itself is Apache-2.0
# bundled slf4j is MIT # bundled slf4j is MIT
@ -170,6 +170,7 @@ find -name 'pom.xml' -exec sed -i 's/\r//' {} +
%patch -P 1 -p1 %patch -P 1 -p1
%patch -P 2 -p1 %patch -P 2 -p1
%patch -P 3 -p1 %patch -P 3 -p1
sed -i "s/@{maven_version_suffix}/%{?maven_version_suffix}/" apache-maven/src/bin/mvn
# not really used during build, but a precaution # not really used during build, but a precaution
find -name '*.jar' -not -path '*/test/*' -delete find -name '*.jar' -not -path '*/test/*' -delete
@ -261,10 +262,10 @@ ln -s %{homedir}/bin/mvnDebug.1.gz %{buildroot}%{_mandir}/man1/mvnDebug%{maven_v
# JDK bindings # JDK bindings
install -d -m 755 %{buildroot}%{_javaconfdir}/ install -d -m 755 %{buildroot}%{_javaconfdir}/
echo JAVA_HOME=%{_jvmlibdir}/jre-1.8.0-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk8 echo JAVA_HOME=%{_jvmlibdir}/jre-1.8.0-openjdk >%{buildroot}%{_javaconfdir}/maven%{?maven_version_suffix}.conf-openjdk8
echo JAVA_HOME=%{_jvmlibdir}/jre-11-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk11 echo JAVA_HOME=%{_jvmlibdir}/jre-11-openjdk >%{buildroot}%{_javaconfdir}/maven%{?maven_version_suffix}.conf-openjdk11
echo JAVA_HOME=%{_jvmlibdir}/jre-17-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk17 echo JAVA_HOME=%{_jvmlibdir}/jre-17-openjdk >%{buildroot}%{_javaconfdir}/maven%{?maven_version_suffix}.conf-openjdk17
echo JAVA_HOME=%{_jvmlibdir}/jre-21-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk21 echo JAVA_HOME=%{_jvmlibdir}/jre-21-openjdk >%{buildroot}%{_javaconfdir}/maven%{?maven_version_suffix}.conf-openjdk21
%post %post
@ -302,18 +303,21 @@ if [[ $1 -eq 0 ]]; then update-alternatives --remove mvn %{homedir}/bin/mvn; fi
%endif %endif
%files openjdk8 %files openjdk8
%config %{_javaconfdir}/maven.conf-openjdk8 %config %{_javaconfdir}/maven%{?maven_version_suffix}.conf-openjdk8
%files openjdk11 %files openjdk11
%config %{_javaconfdir}/maven.conf-openjdk11 %config %{_javaconfdir}/maven%{?maven_version_suffix}.conf-openjdk11
%files openjdk17 %files openjdk17
%config %{_javaconfdir}/maven.conf-openjdk17 %config %{_javaconfdir}/maven%{?maven_version_suffix}.conf-openjdk17
%files openjdk21 %files openjdk21
%config %{_javaconfdir}/maven.conf-openjdk21 %config %{_javaconfdir}/maven%{?maven_version_suffix}.conf-openjdk21
%changelog %changelog
* Wed Dec 13 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.9.6-2
- Make JDK bindings work with different Maven version suffixes
* Mon Dec 04 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.9.6-1 * Mon Dec 04 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.9.6-1
- Update to upstream version 3.9.6 - Update to upstream version 3.9.6