Build against proper plexus-compiler

This commit is contained in:
Michal Srb 2013-03-04 17:32:55 +01:00
parent d7d25f2767
commit f200eda528
2 changed files with 4 additions and 47 deletions

View File

@ -1,43 +0,0 @@
From 9a4756bfc63ed777a1326bd40345a4209564d3d8 Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb@redhat.com>
Date: Mon, 4 Mar 2013 14:19:19 +0100
Subject: [PATCH] Build against newer version of plexus-compiler
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 58b2c49..dd77b84 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,7 +138,7 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-compiler-api</artifactId>
+ <artifactId>plexus-compiler-api-temp</artifactId>
<version>${plexusCompilerVersion}</version>
<exclusions>
<exclusion>
@@ -149,7 +149,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-compiler-manager</artifactId>
+ <artifactId>plexus-compiler-manager-temp</artifactId>
<version>${plexusCompilerVersion}</version>
<exclusions>
<exclusion>
@@ -160,7 +160,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-compiler-javac</artifactId>
+ <artifactId>plexus-compiler-javac-temp</artifactId>
<version>${plexusCompilerVersion}</version>
<scope>runtime</scope>
<exclusions>
--
1.8.1.2

View File

@ -1,13 +1,12 @@
Name: maven-compiler-plugin
Version: 3.0
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Maven Compiler Plugin
Group: Development/Libraries
License: ASL 2.0
URL: http://maven.apache.org/plugins/maven-compiler-plugin
Source0: http://repo1.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
Patch0: 0001-Build-against-newer-version-of-plexus-compiler.patch
BuildArch: noarch
@ -37,8 +36,6 @@ API documentation for %{name}.
%prep
%setup -q
%patch0 -p1
%build
%mvn_build -f
@ -52,6 +49,9 @@ API documentation for %{name}.
%doc LICENSE NOTICE
%changelog
* Tue Mar 05 2013 Michal Srb <msrb@redhat.com> - 3.0-2
- Build against proper plexus-compiler
* Tue Jan 15 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0-1
- Update to upstream version 3.0
- Build with xmvn