[apache-commons-jci] Add depmap file, force ecj use
gil
gil at fedoraproject.org
Thu Jul 19 07:48:53 UTC 2012
commit 0302b0e5ff0ffcc91b6d0e27ba616df84b2212a0
Author: gil <puntogil at libero.it>
Date: Thu Jul 19 09:48:29 2012 +0200
Add depmap file, force ecj use
apache-commons-jci-1.0-depmap | 26 ++++++++++++++++++++++++++
apache-commons-jci.spec | 9 +++++++--
2 files changed, 33 insertions(+), 2 deletions(-)
---
diff --git a/apache-commons-jci-1.0-depmap b/apache-commons-jci-1.0-depmap
new file mode 100644
index 0000000..698a92c
--- /dev/null
+++ b/apache-commons-jci-1.0-depmap
@@ -0,0 +1,26 @@
+<dependencies>
+<!--dependency>
+ <maven>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
+ <version>7.0.27</version>
+ </maven>
+ <jpp>
+ <groupId>JPP</groupId>
+ <artifactId>tomcat-servlet-3.0-api</artifactId>
+ <version>7.0.27</version>
+ </jpp>
+</dependency-->
+<dependency>
+ <maven>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>core</artifactId>
+ <version>3.2.0.658</version>
+ </maven>
+ <jpp>
+ <groupId>JPP</groupId>
+ <artifactId>ecj</artifactId>
+ <version>3.3.0-v_771</version>
+ </jpp>
+</dependency>
+</dependencies>
\ No newline at end of file
diff --git a/apache-commons-jci.spec b/apache-commons-jci.spec
index 2666ddc..50a18a9 100644
--- a/apache-commons-jci.spec
+++ b/apache-commons-jci.spec
@@ -5,13 +5,14 @@
Name: apache-commons-jci
Version: 1.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Commons Java Compiler Interface
Group: Development/Libraries
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 3.4.x use
+Source1: apache-commons-jci-1.0-depmap
# fix parent relative path
# fix groovy gId and aId
# add org.codehaus.janino commons-compiler
@@ -162,6 +163,7 @@ sed -i "s|<module>examples</module>|<!--module>examples</module-->|" pom.xml
# random tests failures
mvn-rpmbuild \
-Dmaven.test.failure.ignore=true \
+ -Dmaven.local.depmap.file="%{SOURCE1}" \
install javadoc:aggregate
%install
@@ -232,6 +234,9 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
%{_mavendepmapfragdir}/%{name}-rhino
%changelog
+* Thu Jul 19 2012 gil cattaneo <puntogil at libero.it> 1.0-4
+- Add depmap file, force ecj use
+
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
More information about the scm-commits
mailing list