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

import maven-3.6.2-9.module+el8.8.0+18043+17ecf8f0

Browse Source
This commit is contained in:
CentOS Sources 2023-02-04 08:22:54 +00:00 committed by root
parent e734e6f4cf
commit f8f1154704
2 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
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_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
fi
+ . /etc/java/maven.conf
+ if [ -z "$JAVA_HOME" ] ; then
+ . /etc/java/maven.conf
+ fi
+
if [ -f "$HOME/.mavenrc" ] ; then
. "$HOME/.mavenrc"

28
SPECS/maven.spec
View File

@ -5,7 +5,7 @@
Name: maven
Epoch: 1
Version: 3.6.2
Release: 7%{?dist}
Release: 9%{?dist}
Summary: Java project management and project comprehension tool
# maven itself is ASL 2.0
# bundled slf4j is MIT
@ -77,6 +77,8 @@ Requires: %{?module_prefix}%{name}-lib = %{epoch}:%{version}-%{release}
Requires: %{?module_prefix}%{name}-jdk-binding
Suggests: %{?module_prefix}%{name}-openjdk11 = %{epoch}:%{version}-%{release}
Requires: which
%if 0%{?fedora}
Requires(post): (alternatives if fedora-release >= 30 else chkconfig)
Requires(postun): (alternatives if fedora-release >= 30 else chkconfig)
@ -115,7 +117,8 @@ Summary: OpenJDK 8 binding for Maven
RemovePathPostfixes: -openjdk8
Provides: maven-jdk-binding = %{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
%description -n %{?module_prefix}%{name}-openjdk8
@ -126,7 +129,8 @@ Summary: OpenJDK 11 binding for Maven
RemovePathPostfixes: -openjdk11
Provides: maven-jdk-binding = %{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
%description -n %{?module_prefix}%{name}-openjdk11
@ -137,7 +141,8 @@ Summary: OpenJDK 17 binding for Maven
RemovePathPostfixes: -openjdk17
Provides: maven-jdk-binding = %{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
%description -n %{?module_prefix}%{name}-openjdk17
@ -247,9 +252,9 @@ ln -s %{homedir}/bin/mvnDebug.1.gz %{buildroot}%{_mandir}/man1/mvnDebug%{maven_v
# JDK bindings
install -d -m 755 %{buildroot}%{_javaconfdir}/
echo JAVA_HOME=%{_jvmlibdir}/java-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}/java-17-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk17
echo JAVA_HOME=%{_jvmlibdir}/jre-1.8.0-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk8
echo JAVA_HOME=%{_jvmlibdir}/jre-11-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk11
echo JAVA_HOME=%{_jvmlibdir}/jre-17-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk17
%post -n %{?module_prefix}%{name}
@ -298,6 +303,15 @@ update-alternatives --install %{_bindir}/mvn mvn %{homedir}/bin/mvn %{?maven_alt
%changelog
* Thu Feb 02 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.2-9
- Turn hard dependency on java-devel into a weak dependencny
- Add missing Requires on which
- Resolves: rhbz#2129825, rhbz#2008121
* Wed Jan 25 2023 Marian Koncek <mkoncek@redhat.com> - 1:3.6.2-8
- Do not override JAVA_HOME set by user
- Resolves: rhbz#2164351
* Tue Nov 16 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.2-7
- Add maven-openjdk17
- Resolves: rhbz#1991521