Fix symlinks in lib/core

This commit is contained in:
Mikolaj Izdebski 2015-10-28 22:31:25 +01:00
parent 94d6ed635b
commit 8f3de13e44
2 changed files with 45 additions and 1 deletions

View File

@ -0,0 +1,38 @@
From a2f918fe86c91e1a76d198e824118d5ba474808c Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Wed, 28 Oct 2015 22:26:44 +0100
Subject: [PATCH] Copy core dependencies to lib/core in assembly
---
xmvn-core/pom.xml | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/xmvn-core/pom.xml b/xmvn-core/pom.xml
index e792f6a..b0ef6b5 100644
--- a/xmvn-core/pom.xml
+++ b/xmvn-core/pom.xml
@@ -128,6 +128,21 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeScope>runtime</includeScope>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
--
2.4.3

View File

@ -8,7 +8,7 @@
Name: xmvn Name: xmvn
Version: 2.5.0 Version: 2.5.0
Release: 1%{?dist} Release: 2%{?dist}
Summary: Local Extensions for Apache Maven Summary: Local Extensions for Apache Maven
License: ASL 2.0 License: ASL 2.0
URL: http://mizdebsk.fedorapeople.org/xmvn URL: http://mizdebsk.fedorapeople.org/xmvn
@ -16,6 +16,8 @@ BuildArch: noarch
Source0: https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.xz Source0: https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.xz
Patch0: 0001-Copy-core-dependencies-to-lib-core-in-assembly.patch
BuildRequires: maven >= 3.3 BuildRequires: maven >= 3.3
BuildRequires: maven-local BuildRequires: maven-local
BuildRequires: beust-jcommander BuildRequires: beust-jcommander
@ -154,6 +156,7 @@ This package provides %{summary}.
%prep %prep
%setup -q %setup -q
%patch0 -p1
%mvn_package ":xmvn{,-it}" __noinstall %mvn_package ":xmvn{,-it}" __noinstall
@ -294,6 +297,9 @@ cp -P %{_datadir}/maven/bin/m2.conf %{buildroot}%{_datadir}/%{name}/bin/
%doc LICENSE NOTICE %doc LICENSE NOTICE
%changelog %changelog
* Wed Oct 28 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.5.0-2
- Fix symlinks in lib/core
* Wed Oct 28 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.5.0-1 * Wed Oct 28 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.5.0-1
- Update to upstream version 2.5.0 - Update to upstream version 2.5.0