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

import maven-3.6.3-15.el9

Browse Source
This commit is contained in:
CentOS Sources 2023-05-09 05:25:07 +00:00 committed by Stepan Oksanichenko
parent d677353c17
commit c11ad35c68
2 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SOURCES/0001-Adapt-mvn-script.patch
View File

@ -20,11 +20,13 @@ index a554c6617..739501af4 100755
# MAVEN_OPTS (Optional) Java runtime options used when Maven is executed. # MAVEN_OPTS (Optional) Java runtime options used when Maven is executed.
# MAVEN_SKIP_RC (Optional) Flag to disable loading of mavenrc files. # MAVEN_SKIP_RC (Optional) Flag to disable loading of mavenrc files.
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
@@ -33,12 +33,16 @@ if [ -z "$MAVEN_SKIP_RC" ] ; then @@ -33,12 +33,18 @@ if [ -z "$MAVEN_SKIP_RC" ] ; then
. /etc/mavenrc . /etc/mavenrc
fi fi
+ if [ -z "$JAVA_HOME" ] ; then
+ . /etc/java/maven.conf + . /etc/java/maven.conf
+ fi
+ +
if [ -f "$HOME/.mavenrc" ] ; then if [ -f "$HOME/.mavenrc" ] ; then
. "$HOME/.mavenrc" . "$HOME/.mavenrc"

31
SPECS/maven.spec
View File

@ -7,7 +7,7 @@
Name: maven Name: maven
Epoch: 1 Epoch: 1
Version: 3.6.3 Version: 3.6.3
Release: 14%{?dist} Release: 15%{?dist}
Summary: Java project management and project comprehension tool Summary: Java project management and project comprehension tool
# maven itself is ASL 2.0 # maven itself is ASL 2.0
# bundled slf4j is MIT # bundled slf4j is MIT
@ -82,6 +82,8 @@ Requires: %{name}-lib = %{epoch}:%{version}-%{release}
Requires: %{name}-jdk-binding = %{epoch}:%{version}-%{release} Requires: %{name}-jdk-binding = %{epoch}:%{version}-%{release}
Suggests: %{name}-openjdk11 = %{epoch}:%{version}-%{release} Suggests: %{name}-openjdk11 = %{epoch}:%{version}-%{release}
Requires: which
Requires(post): alternatives Requires(post): alternatives
Requires(postun): alternatives Requires(postun): alternatives
@ -110,7 +112,8 @@ Summary: OpenJDK 8 binding for Maven
RemovePathPostfixes: -openjdk8 RemovePathPostfixes: -openjdk8
Provides: maven-jdk-binding = %{epoch}:%{version}-%{release} Provides: maven-jdk-binding = %{epoch}:%{version}-%{release}
Requires: maven = %{epoch}:%{version}-%{release} Requires: maven = %{epoch}:%{version}-%{release}
Requires: java-1.8.0-openjdk-devel Requires: java-1.8.0-openjdk-headless
Recommends: java-1.8.0-openjdk-devel
Conflicts: maven-jdk-binding Conflicts: maven-jdk-binding
%description openjdk8 %description openjdk8
@ -121,7 +124,8 @@ Summary: OpenJDK 11 binding for Maven
RemovePathPostfixes: -openjdk11 RemovePathPostfixes: -openjdk11
Provides: maven-jdk-binding = %{epoch}:%{version}-%{release} Provides: maven-jdk-binding = %{epoch}:%{version}-%{release}
Requires: maven = %{epoch}:%{version}-%{release} Requires: maven = %{epoch}:%{version}-%{release}
Requires: java-11-openjdk-devel Requires: java-11-openjdk-headless
Recommends: java-11-openjdk-devel
Conflicts: maven-jdk-binding Conflicts: maven-jdk-binding
%description openjdk11 %description openjdk11
@ -132,7 +136,8 @@ Summary: OpenJDK 17 binding for Maven
RemovePathPostfixes: -openjdk17 RemovePathPostfixes: -openjdk17
Provides: maven-jdk-binding = %{epoch}:%{version}-%{release} Provides: maven-jdk-binding = %{epoch}:%{version}-%{release}
Requires: maven = %{epoch}:%{version}-%{release} Requires: maven = %{epoch}:%{version}-%{release}
Requires: java-17-openjdk-devel Requires: java-17-openjdk-headless
Recommends: java-17-openjdk-devel
Conflicts: maven-jdk-binding Conflicts: maven-jdk-binding
%description openjdk17 %description openjdk17
@ -242,9 +247,9 @@ 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}/java-1.8.0-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk8 echo JAVA_HOME=%{_jvmlibdir}/jre-1.8.0-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk8
echo JAVA_HOME=%{_jvmlibdir}/java-11-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk11 echo JAVA_HOME=%{_jvmlibdir}/jre-11-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk11
echo JAVA_HOME=%{_jvmlibdir}/java-17-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk17 echo JAVA_HOME=%{_jvmlibdir}/jre-17-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk17
%post %post
@ -291,6 +296,18 @@ if [[ $1 -eq 0 ]]; then update-alternatives --remove mvn %{homedir}/bin/mvn; fi
%config %{_javaconfdir}/maven.conf-openjdk17 %config %{_javaconfdir}/maven.conf-openjdk17
%changelog %changelog
* Tue Jan 31 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.3-15
- Add missing Requires on which
- Resolves: rhbz#2165596
* Mon Jan 30 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.3-15
- Turn hard dependency on java-devel into a weak dependencny
- Resolves: rhbz#2165593
* Thu Dec 01 2022 Marián Konček <mkoncek@redhat.com> - 1:3.6.3-15
- Do not override JAVA_HOME set by user
- Resolves: rhbz#2096431
* Fri Sep 24 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.3-14 * Fri Sep 24 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.3-14
- Add OpenJDK 17 binding - Add OpenJDK 17 binding