[plexus-compiler] Fix FTBFS by adding ignoreOptionalProblems function

[Stanislav Ochotnicky]

commit 1c0fc43b52f502b69be1b54f7b2df07a103b5202
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Wed Aug 8 11:10:34 2012 +0200

    Fix FTBFS by adding ignoreOptionalProblems function
    
    - Use new pom_ macros instead of patches

 0001-Remove-aspecj-support.patch             |   24 ------------------------
 generate_tarball.sh                          |   16 ++++++++++++++++
 plexus-compiler-1.5.2-JikesCompiler.patch    |   12 ------------
 plexus-compiler-ignoreOptionalProblems.patch |   18 ++++++++++++++++++
 plexus-compiler.spec                         |   11 ++++++++---
 5 files changed, 42 insertions(+), 39 deletions(-)
---
diff --git a/generate_tarball.sh b/generate_tarball.sh
new file mode 100644
index 0000000..fc193f7
--- /dev/null
+++ b/generate_tarball.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+baseurl="https://github.com/sonatype/plexus-compiler"
+
+
+dname=$(basename ${baseurl})
+version=`grep Version: *spec | sed -e 's/Version:\s*\(.*\)/\1/'`
+echo $version
+
+git clone "${baseurl}.git"
+
+GIT_DIR="${dname}/.git" git archive --prefix "${dname}-${version}/" \
+    ${dname}-${version} | xz > ${dname}-${version}.tar.xz
+
+
+
diff --git a/plexus-compiler-ignoreOptionalProblems.patch b/plexus-compiler-ignoreOptionalProblems.patch
new file mode 100644
index 0000000..a7b9877
--- /dev/null
+++ b/plexus-compiler-ignoreOptionalProblems.patch
@@ -0,0 +1,18 @@
+diff --git a/plexus-compilers/plexus-compiler-eclipse/src/main/java/org/codehaus/plexus/compiler/eclipse/EclipseJavaCompiler.java b/plexus-compilers/plexus-compiler-eclipse/src/main/java/org/codehaus/plexus/compiler/eclipse/EclipseJavaCompiler.java
+index 49d890d..b6952b9 100644
+--- a/plexus-compilers/plexus-compiler-eclipse/src/main/java/org/codehaus/plexus/compiler/eclipse/EclipseJavaCompiler.java
++++ b/plexus-compilers/plexus-compiler-eclipse/src/main/java/org/codehaus/plexus/compiler/eclipse/EclipseJavaCompiler.java
+@@ -404,6 +404,13 @@ public class EclipseJavaCompiler
+ 
+             return result;
+         }
++
++        // added in recent JDT versions
++        public boolean ignoreOptionalProblems() 
++        {
++            return false;
++        }
++
+     }
+ 
+     private class EclipseCompilerINameEnvironment
diff --git a/plexus-compiler.spec b/plexus-compiler.spec
index 550328e..838abd1 100644
--- a/plexus-compiler.spec
+++ b/plexus-compiler.spec
@@ -34,7 +34,7 @@
 
 Name:       plexus-compiler
 Version:    1.9.1
-Release:    2%{?dist}
+Release:    3%{?dist}
 Epoch:      0
 Summary:    Compiler call initiators for Plexus
 License:    MIT
@@ -44,7 +44,7 @@ URL:        http://plexus.codehaus.org/
 # wget  https://github.com/sonatype/plexus-compiler/tarball/plexus-compiler-1.8.3
 Source0:    sonatype-plexus-compiler-plexus-compiler-1.9.1-0-%{githash}.tar.gz
 
-Patch0:     0001-Remove-aspecj-support.patch
+Patch0:     plexus-compiler-ignoreOptionalProblems.patch
 
 BuildArch:      noarch
 BuildRequires:  maven
@@ -90,9 +90,10 @@ API documentation for %{name}.
 %setup -q -n sonatype-plexus-compiler-%{dirhash}
 %patch0 -p1
 
+%pom_disable_module plexus-compiler-aspectj plexus-compilers/pom.xml
 
 # don't build/install compiler-test module, it needs maven2 test harness
-sed -i 's:<module>plexus-compiler-test</module>::' pom.xml
+%pom_disable_module plexus-compiler-test
 
 %build
 mvn-rpmbuild -e \
@@ -172,6 +173,10 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Wed Aug  8 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0:1.9.1-3
+- Fix FTBFS by adding ignoreOptionalProblems function
+- Use new pom_ macros instead of patches
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.9.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild