[janino] Update to 2.7.8

[gil]

commit c727b10fe64e374d0243fe598f5b4509337cfd2f
Author: gil <puntogil at libero.it>
Date:   Mon Feb 9 19:42:23 2015 +0100

    Update to 2.7.8

 .gitignore                     |    5 +
 commons-compiler-2.6.1.pom     |   24 ----
 commons-compiler-jdk-2.6.1.pom |   36 ------
 janino-2.6.1-poms.patch        |  100 ---------------
 janino-2.6.1.pom               |   34 -----
 janino-parent-2.6.1.pom        |  265 ----------------------------------------
 janino.spec                    |   41 ++++---
 sources                        |    6 +-
 8 files changed, 35 insertions(+), 476 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index da21297..5ea8f42 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,7 @@
 janino-2.5.15.zip
 /janino-2.6.1.zip
+/commons-compiler-2.7.8.pom
+/commons-compiler-jdk-2.7.8.pom
+/janino-2.7.8.pom
+/janino-2.7.8.zip
+/janino-parent-2.7.8.pom
diff --git a/janino.spec b/janino.spec
index 2309e71..b9cb458 100644
--- a/janino.spec
+++ b/janino.spec
@@ -28,30 +28,23 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 Name:          janino
-Version:       2.6.1
-Release:       21%{?dist}
+Version:       2.7.8
+Release:       1%{?dist}
 Summary:       An embedded Java compiler
 License:       BSD
 URL:           http://docs.codehaus.org/display/JANINO/Home
-Source0:       http://dist.codehaus.org/%{name}/%{name}-%{version}.zip
+Source0:       http://janino.net/download/%{name}-%{version}.zip
 Source1:       http://repo1.maven.org/maven2/org/codehaus/%{name}/%{name}-parent/%{version}/%{name}-parent-%{version}.pom
 Source2:       http://repo1.maven.org/maven2/org/codehaus/%{name}/commons-compiler/%{version}/commons-compiler-%{version}.pom
 Source3:       http://repo1.maven.org/maven2/org/codehaus/%{name}/commons-compiler-jdk/%{version}/commons-compiler-jdk-%{version}.pom
 Source4:       http://repo1.maven.org/maven2/org/codehaus/%{name}/%{name}/%{version}/%{name}-%{version}.pom
-# remove org.codehaus.mojo findbugs-maven-plugin 1.1.1, javancss-maven-plugin 2.0, jdepend-maven-plugin 2.0-beta-2
-# change artifactId ant-nodeps in ant
-Patch0:        %{name}-%{version}-poms.patch
-
-BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: codehaus-parent
 
 BuildRequires: ant
+BuildRequires: codehaus-parent
 BuildRequires: junit
 
-#BuildRequires: buildnumber-maven-plugin
 BuildRequires: maven-local
 BuildRequires: maven-enforcer-plugin
-BuildRequires: maven-source-plugin
 
 BuildArch:     noarch
 
@@ -59,7 +52,7 @@ BuildArch:     noarch
 Janino is a super-small, super-fast Java compiler. Not only can it compile
 a set of source files to a set of class files like the JAVAC tool, but also
 can it compile a Java expression, block, class body or source file in
-memory, load the bytecode and execute it directly in the same JVM. Janino
+memory, load the byte-code and execute it directly in the same JVM. Janino
 is not intended to be a development tool, but an embedded compiler for
 run-time compilation purposes, e.g. expression evaluators or "server pages"
 engines like JSP.
@@ -95,17 +88,30 @@ cp -p %{SOURCE2} commons-compiler/pom.xml
 cp -p %{SOURCE3} commons-compiler-jdk/pom.xml
 cp -p %{SOURCE4} %{name}/pom.xml
 
-# RHBZ #842604
-sed -i 's#<source>1.2</source>#<source>1.5</source>#' pom.xml
-sed -i 's#<target>1.1</target>#<target>1.5</target>#' pom.xml
+%pom_xpath_set "pom:dependencyManagement/pom:dependencies/pom:dependency[pom:groupId = 'org.apache.ant']/pom:artifactId" ant
+%pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId = 'org.apache.ant']/pom:artifactId" ant %{name}
 
-%patch0 -p1
+# RHBZ#842604
+%pom_xpath_set "pom:build/pom:plugins/pom:plugin[pom:artifactId = 'maven-compiler-plugin']/pom:configuration/pom:source" 1.6
+%pom_xpath_set "pom:build/pom:plugins/pom:plugin[pom:artifactId = 'maven-compiler-plugin']/pom:configuration/pom:target" 1.6
+
+sed -i '/de.unkrig.commons.nullanalysis/d' \
+ commons-compiler-jdk/src/org/codehaus/commons/compiler/jdk/package-info.java \
+ commons-compiler-jdk/src/org/codehaus/commons/io/package-info.java
+sed -i '/NotNullByDefault/d' \
+ commons-compiler-jdk/src/org/codehaus/commons/compiler/jdk/package-info.java \
+ commons-compiler-jdk/src/org/codehaus/commons/io/package-info.java
 
 perl -pi -e 's/\r$//g' new_bsd_license.txt README.txt
 
 # Cannot run program "svn"
 %pom_remove_plugin :buildnumber-maven-plugin
 
+%pom_remove_plugin :maven-clean-plugin
+%pom_remove_plugin :maven-deploy-plugin
+%pom_remove_plugin :maven-site-plugin
+%pom_remove_plugin :maven-source-plugin
+
 %build
 
 %mvn_build
@@ -122,6 +128,9 @@ perl -pi -e 's/\r$//g' new_bsd_license.txt README.txt
 %license new_bsd_license.txt
 
 %changelog
+* Mon Feb 09 2015 gil cattaneo <puntogil at libero.it> 2.7.8-1
+- Update to 2.7.8
+
 * Fri Feb 06 2015 gil cattaneo <puntogil at libero.it> 2.6.1-21
 - introduce license macro
 
diff --git a/sources b/sources
index ab354af..2ff548d 100644
--- a/sources
+++ b/sources
@@ -1 +1,5 @@
-bd1f9d38b8329017e469503baf53cf5b  janino-2.6.1.zip
+314103de070d8d5965abe8f4c8d0ce95  commons-compiler-2.7.8.pom
+582b5e349034bc8deafc4ff3ba3562fd  commons-compiler-jdk-2.7.8.pom
+2d5aa87b178ab41ce9af0e69c920a6c2  janino-2.7.8.pom
+f1e64fffecbf02babcecc011f0061d52  janino-2.7.8.zip
+d074359cf02a6c130dc519350a1f9c60  janino-parent-2.7.8.pom