Define maven-3.6 install repository

This commit is contained in:
Mikolaj Izdebski 2019-06-10 11:41:06 +02:00
parent 67b04ef870
commit 27c82b2e8c
3 changed files with 41 additions and 2 deletions

View File

@ -1,7 +1,7 @@
From 2311bfd80763c32937901ee5c638bbdc68a6357a Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 26 Apr 2019 00:50:00 +0200
Subject: [PATCH] Move python modules under java-utils directory
Subject: [PATCH 1/2] Move python modules under java-utils directory
---
depgenerators/javadoc.req | 2 ++

View File

@ -0,0 +1,34 @@
From ef93d0816c49e1e2c1239b82ec9c7a5f862e962e Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 10 Jun 2019 11:37:08 +0200
Subject: [PATCH 2/2] Define maven-3.6 install repository
---
configs/configuration.xml | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/configs/configuration.xml b/configs/configuration.xml
index b6288fea..e0b790ed 100644
--- a/configs/configuration.xml
+++ b/configs/configuration.xml
@@ -135,5 +135,17 @@
</repositories>
</configuration>
</repository>
+ <repository>
+ <id>install-maven-3.6</id>
+ <type>compound</type>
+ <properties>
+ <namespace>maven-3.6</namespace>
+ </properties>
+ <configuration>
+ <repositories>
+ <repository>base-install</repository>
+ </repositories>
+ </configuration>
+ </repository>
</repositories>
</configuration>
--
2.21.0

View File

@ -14,7 +14,7 @@
Name: javapackages-tools
Version: 5.3.0
Release: 6%{?dist}
Release: 7%{?dist}
Summary: Macros and scripts for Java packaging support
@ -23,6 +23,7 @@ URL: https://github.com/fedora-java/javapackages
Source0: https://github.com/fedora-java/javapackages/archive/%{version}.tar.gz
Patch0: 0001-Move-python-modules-under-java-utils-directory.patch
Patch1: 0002-Define-maven-3.6-install-repository.patch
BuildArch: noarch
@ -114,6 +115,7 @@ This package provides non-essential macros and scripts to support Java packaging
%prep
%setup -q -n javapackages-%{version}
%patch0 -p1
%patch1 -p1
sed -i '/^manpage /d' build
sed -i '/${mandir}/d' install
@ -155,6 +157,9 @@ rm -rf %{buildroot}%{_mandir}/man7/gradle_build.7
%files -n ivy-local -f files-ivy
%changelog
* Mon Jun 10 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.3.0-7
- Define maven-3.6 install repository
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.3.0-6
- Mass rebuild for javapackages-tools 201901