[apache-commons-jci] Update to 1.1
gil
gil at fedoraproject.org
Mon Feb 9 19:48:21 UTC 2015
commit 7cb17e8be115d1c82c6f57aea37595d267c67da4
Author: gil <puntogil at libero.it>
Date: Mon Feb 9 20:47:53 2015 +0100
Update to 1.1
.gitignore | 1 +
apache-commons-jci-1.0-ExtendedDump.patch | 11 ---
apache-commons-jci-1.0-SimpleDump.patch | 11 ---
apache-commons-jci-1.0-depmap | 26 -------
apache-commons-jci-1.0-ecj4.patch | 17 -----
apache-commons-jci-1.0-examples-pom.patch | 34 ---------
apache-commons-jci-1.0-fixbuild.patch | 105 -----------------------------
apache-commons-jci-1.0-janino26.patch | 62 -----------------
apache-commons-jci-1.1-janino27.patch | 19 +++++
apache-commons-jci.spec | 59 ++++++----------
sources | 2 +-
11 files changed, 43 insertions(+), 304 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 520cdda..f8e4fba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/commons-jci-1.0-src.tar.gz
+/commons-jci-1.1-src.tar.gz
diff --git a/apache-commons-jci-1.1-janino27.patch b/apache-commons-jci-1.1-janino27.patch
new file mode 100644
index 0000000..7a151e9
--- /dev/null
+++ b/apache-commons-jci-1.1-janino27.patch
@@ -0,0 +1,19 @@
+diff -Nru commons-jci-1.1-src/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java commons-jci-1.1-src.janino/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java
+--- commons-jci-1.1-src/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java 2013-08-18 23:14:52.000000000 +0200
++++ commons-jci-1.1-src.janino/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java 2015-02-09 20:21:47.934668187 +0100
+@@ -31,13 +31,13 @@
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+ import org.codehaus.commons.compiler.CompileException;
++import org.codehaus.commons.compiler.ErrorHandler;
+ import org.codehaus.commons.compiler.LocatedException;
+ import org.codehaus.commons.compiler.Location;
++import org.codehaus.commons.compiler.WarningHandler;
+ import org.codehaus.janino.ClassLoaderIClassLoader;
+ import org.codehaus.janino.Compiler;
+ import org.codehaus.janino.FilterWarningHandler;
+-import org.codehaus.janino.UnitCompiler.ErrorHandler;
+-import org.codehaus.janino.WarningHandler;
+ import org.codehaus.janino.util.StringPattern;
+ import org.codehaus.janino.util.resource.Resource;
+ import org.codehaus.janino.util.resource.ResourceCreator;
diff --git a/apache-commons-jci.spec b/apache-commons-jci.spec
index 72d3178..a8288a1 100644
--- a/apache-commons-jci.spec
+++ b/apache-commons-jci.spec
@@ -4,53 +4,33 @@
%global namedversion %{version}%{?namedreltag}
Name: apache-commons-jci
-Version: 1.0
-Release: 14%{?dist}
+Version: 1.1
+Release: 1%{?dist}
Summary: Commons Java Compiler Interface
License: ASL 2.0
URL: http://commons.apache.org/jci/
-Source0: ftp://ftp.gbnet.net/pub/apache/dist/commons/%{base_name}/source/%{short_name}-%{namedversion}-src.tar.gz
-# force ecj 4.x use
-Source1: %{name}-%{namedversion}-depmap
-# fix parent relative path
-# fix groovy gId and aId
-# add org.codehaus.janino commons-compiler
-# remove org.codehaus.mojo findbugs-maven-plugin 1.0.0
-Patch0: %{name}-%{namedversion}-fixbuild.patch
-# asm 3 test build
-Patch1: %{name}-%{namedversion}-ExtendedDump.patch
-Patch2: %{name}-%{namedversion}-SimpleDump.patch
-# fix parent relative path
-# remove jetty-maven-plugin
-# use tomcat 7.x apis
-Patch3: %{name}-%{namedversion}-examples-pom.patch
-
-Patch4: %{name}-%{namedversion}-janino26.patch
-
-Patch5: %{name}-%{namedversion}-ecj4.patch
+Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{namedversion}-src.tar.gz
+Patch0: %{name}-1.1-janino27.patch
BuildRequires: maven-local
BuildRequires: maven-antrun-plugin
BuildRequires: maven-plugin-bundle
-BuildRequires: maven-plugin-cobertura
-BuildRequires: maven-site-plugin
BuildRequires: ecj >= 3.4.2-13
-BuildRequires: mvn(commons-logging:commons-logging-api)
+BuildRequires: mvn(commons-logging:commons-logging)
BuildRequires: mvn(commons-io:commons-io)
+BuildRequires: mvn(org.apache.commons:commons-parent:pom:)
BuildRequires: mvn(org.codehaus.groovy:groovy)
-BuildRequires: mvn(org.codehaus.janino:commons-compiler)
BuildRequires: mvn(org.codehaus.janino:janino)
BuildRequires: mvn(rhino:js)
# test deps
-BuildRequires: mvn(commons-lang:commons-lang)
BuildRequires: mvn(junit:junit)
BuildRequires: objectweb-asm3
+BuildRequires: mvn(org.apache.commons:commons-lang3)
Requires: %{name}-core = %{version}-%{release}
BuildArch: noarch
-#* javac Commons JCI compiler implementation for the javac compiler (up to JDK 1.5).
#* jsr199 Commons JCI compiler implementation for JDK 1.6 and up.
%description
@@ -115,23 +95,25 @@ find . -name "*.class" -delete
find . -name "*.jar" -delete
%patch0 -p1
-%patch1 -p0
-%patch2 -p0
-%patch3 -p0
-%patch4 -p1
-%patch5 -p0
# require old version of jdependency
-%pom_disable_module compilers/javac
%pom_disable_module examples
%pom_xpath_remove "pom:build/pom:extensions"
-sed -i "s|<maven.compile.source>1.4<|<maven.compile.source>1.5<|" pom.xml
-sed -i "s|<maven.compile.target>1.4<|<maven.compile.target>1.5<|" pom.xml
+%pom_xpath_set "pom:properties/pom:maven.compiler.source" 1.6
+%pom_xpath_set "pom:properties/pom:maven.compiler.target" 1.6
-# Fix installation directory
+%pom_remove_plugin :cobertura-maven-plugin
+%pom_remove_plugin :maven-assembly-plugin
+%pom_remove_plugin :maven-site-plugin
+
+%pom_xpath_set "pom:dependencyManagement/pom:dependencies/pom:dependency[pom:groupId = 'org.codehaus.groovy']/pom:artifactId" groovy
+%pom_xpath_set "pom:dependencyManagement/pom:dependencies/pom:dependency[pom:groupId = 'org.codehaus.groovy']/pom:version" 1.8.9
+%pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId = 'org.codehaus.groovy']/pom:artifactId" groovy compilers/groovy
+%pom_xpath_inject "pom:dependencies/pom:dependency[pom:groupId = 'org.codehaus.groovy']" "<version>1.8.9</version>" compilers/groovy
+# Fix installation directory
%mvn_file :%{short_name}-core %{short_name}/%{short_name}-core
%mvn_file :%{short_name}-fam %{short_name}/%{short_name}-fam
%mvn_file :%{short_name}-eclipse %{short_name}/%{short_name}-eclipse
@@ -142,7 +124,7 @@ sed -i "s|<maven.compile.target>1.4<|<maven.compile.target>1.5<|" pom.xml
%build
# random tests failures
-%mvn_build -s -- -Dmaven.test.failure.ignore=true -Dmaven.local.depmap.file="%{SOURCE1}"
+%mvn_build -s -- -Dmaven.test.failure.ignore=true
%install
%mvn_install
@@ -168,6 +150,9 @@ sed -i "s|<maven.compile.target>1.4<|<maven.compile.target>1.5<|" pom.xml
%files rhino -f .mfiles-%{short_name}-rhino
%changelog
+* Mon Feb 09 2015 gil cattaneo <puntogil at libero.it> 1.1-1
+- Update to 1.1
+
* Thu Jan 29 2015 gil cattaneo <puntogil at libero.it> 1.0-14
- introduce license macro
diff --git a/sources b/sources
index 3c8caf7..dc1071f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-969ca083b61d300e694c5300ad18107c commons-jci-1.0-src.tar.gz
+7594bbc110e92ac7cdd20013364dbbbb commons-jci-1.1-src.tar.gz
More information about the scm-commits
mailing list