[maven-compiler-plugin/update-to-version-3.x] Update to version 3.0
Michal Srb
msrb at fedoraproject.org
Mon Mar 4 14:57:34 UTC 2013
commit d7d25f27672bc02e14f85f86a226cb7b5d59b476
Author: Michal Srb <msrb at redhat.com>
Date: Mon Mar 4 15:53:12 2013 +0100
Update to version 3.0
- use modified artifactIds for plexus-compiler
...-against-newer-version-of-plexus-compiler.patch | 43 ++++++++++++++++++++
maven-compiler-plugin.spec | 5 ++-
2 files changed, 47 insertions(+), 1 deletions(-)
---
diff --git a/0001-Build-against-newer-version-of-plexus-compiler.patch b/0001-Build-against-newer-version-of-plexus-compiler.patch
new file mode 100644
index 0000000..492c05d
--- /dev/null
+++ b/0001-Build-against-newer-version-of-plexus-compiler.patch
@@ -0,0 +1,43 @@
+From 9a4756bfc63ed777a1326bd40345a4209564d3d8 Mon Sep 17 00:00:00 2001
+From: Michal Srb <msrb at 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
+
diff --git a/maven-compiler-plugin.spec b/maven-compiler-plugin.spec
index 10ff67e..e9f8c01 100644
--- a/maven-compiler-plugin.spec
+++ b/maven-compiler-plugin.spec
@@ -7,11 +7,12 @@ 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
BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: xmvn >= 0.2.4
+BuildRequires: maven-local
BuildRequires: maven-plugin-plugin
BuildRequires: maven-shared-incremental
BuildRequires: maven-surefire-provider-junit
@@ -36,6 +37,8 @@ API documentation for %{name}.
%prep
%setup -q
+%patch0 -p1
+
%build
%mvn_build -f
More information about the scm-commits
mailing list