diff --git a/.cvsignore b/.cvsignore index 0fb37da..9630e23 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -commons-jexl-1.1-src.tar.gz +commons-jexl-2.0.1-src.tar.gz diff --git a/apache-commons-jexl-1.1-level.patch b/apache-commons-jexl-1.1-level.patch deleted file mode 100644 index f71469a..0000000 --- a/apache-commons-jexl-1.1-level.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- commons-jexl-1.1-src/project.properties.level 2006-09-08 17:15:15.000000000 -0600 -+++ commons-jexl-1.1-src/project.properties 2009-10-27 17:06:28.084842249 -0600 -@@ -27,8 +27,8 @@ - maven.xdoc.distributionUrl=http://www.apache.org/dist/java-repository/commons-jexl/jars - - # Compile targets --maven.compile.source=1.2 --maven.compile.target=1.2 -+maven.compile.source=1.3 -+maven.compile.target=1.3 - - # for changes.xml - maven.changes.issue.template=%URL%/browse/%ISSUE% diff --git a/apache-commons-jexl-2.0.1-bsf.patch b/apache-commons-jexl-2.0.1-bsf.patch new file mode 100644 index 0000000..86f6113 --- /dev/null +++ b/apache-commons-jexl-2.0.1-bsf.patch @@ -0,0 +1,23 @@ +--- commons-jexl-2.0.1-src/pom.xml.bsf 2010-03-31 12:05:13.000000000 -0600 ++++ commons-jexl-2.0.1-src/pom.xml 2010-05-26 13:29:00.614309865 -0600 +@@ -102,13 +102,6 @@ + 3.8.2 + test + +- +- +- org.apache.bsf +- bsf-api +- 3.0-beta3 +- provided +- + + + +@@ -301,4 +294,4 @@ + --> + + +- +\ No newline at end of file ++ diff --git a/apache-commons-jexl.spec b/apache-commons-jexl.spec index b955a48..2fcddd2 100644 --- a/apache-commons-jexl.spec +++ b/apache-commons-jexl.spec @@ -1,29 +1,34 @@ %global jarname commons-jexl Name: apache-%{jarname} -Version: 1.1 -Release: 3%{?dist} +Version: 2.0.1 +Release: 1%{?dist} Summary: Java Expression Language (JEXL) Group: Development/Libraries License: ASL 2.0 URL: http://commons.apache.org/jexl Source0: http://www.apache.org/dist/commons/jexl/source/%{jarname}-%{version}-src.tar.gz -Source1: pom.xml -#Up source and target level to 1.3 from 1.2 -Patch0: %{name}-1.1-level.patch +# Java 1.6 contains bsf 3.0, so we don't need the dependency in the pom.xml file +Patch0: %{name}-2.0.1-bsf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: jpackage-utils -BuildRequires: java-devel +BuildRequires: java-devel >= 1:1.6.0 BuildRequires: maven2 +BuildRequires: maven2-plugin-antrun +BuildRequires: maven2-plugin-assembly +BuildRequires: maven-plugin-bundle BuildRequires: maven2-plugin-compiler +BuildRequires: maven2-plugin-idea BuildRequires: maven2-plugin-install BuildRequires: maven2-plugin-jar BuildRequires: maven2-plugin-javadoc BuildRequires: maven2-plugin-resources BuildRequires: maven2-plugin-surefire BuildRequires: maven2-plugin-surefire-report +BuildRequires: maven-release-plugin +BuildRequires: javacc-maven-plugin BuildRequires: maven-doxia-sitetools BuildArch: noarch @@ -50,7 +55,6 @@ needed Velocity-ish method access, it just had to have it. %package javadoc Summary: Javadocs for %{name} Group: Documentation -Requires: %{name} = %{version}-%{release} Requires: jpackage-utils Provides: %{jarname}-javadoc = %{version}-%{release} @@ -60,8 +64,7 @@ This package contains the API documentation for %{name}. %prep %setup -q -n %{jarname}-%{version}-src -%patch0 -p1 -b .level -cp %SOURCE1 . +%patch0 -p1 -b .bsf find \( -name '*.jar' -o -name '*.class' \) -exec rm -f '{}' + # Fix line endings find -name '*.txt' -exec sed -i 's/\r//' '{}' + @@ -91,7 +94,7 @@ $RPM_BUILD_ROOT%{_javadocdir}/%{name} mkdir -p $RPM_BUILD_ROOT%{_datadir}/maven2/poms cp -p pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}.pom -%add_to_maven_depmap org.apache.maven %{jarname} %{version} JPP %{name} +%add_to_maven_depmap org.apache.commons %{jarname} %{version} JPP %{name} %clean @@ -121,6 +124,14 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed May 26 2010 Orion Poplawski - 2.0.1-1 +- Update to 2.0.1 +- Require Java 1.6 or greater +- Drop language level patch +- Add patch to remove bsf-api 3.0 dependency from pom.xml as this is provided + by Java 1.6 +- Fix depmap group id + * Sat Jan 9 2010 Orion Poplawski - 1.1-3 - Drop gcj support - Fix javadoc group diff --git a/import.log b/import.log index 63cb47c..798711d 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ apache-commons-jexl-1_1-3_fc12:F-12:apache-commons-jexl-1.1-3.fc12.src.rpm:1263310558 +apache-commons-jexl-2_0_1-1_fc14:EL-6:apache-commons-jexl-2.0.1-1.fc14.src.rpm:1278005992 diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 5ffbf8e..0000000 --- a/pom.xml +++ /dev/null @@ -1,240 +0,0 @@ - - 4.0.0 - commons-jexl - commons-jexl - Commons JEXL - 1.1 - Jexl is an implementation of the JSTL Expression Language with extensions. - http://jakarta.apache.org/commons/jexl/ - - http://issues.apache.org/jira/ - - - - - -
commons-dev@jakarta.apache.org
- - - - - 2003 - - - Commons Dev List - commons-dev-subscribe@jakarta.apache.org - commons-dev-unsubscribe@jakarta.apache.org - http://mail-archives.apache.org/mod_mbox/jakarta-commons-dev/ - - - Commons User List - commons-user-subscribe@jakarta.apache.org - commons-user-unsubscribe@jakarta.apache.org - http://mail-archives.apache.org/mod_mbox/jakarta-commons-user/ - - - - - dion - dIon Gillard - dion@apache.org - Apache Software Foundation - - - geirm - Geir Magnusson Jr. - geirm@apache.org - independent - - - tobrien - Tim O'Brien - tobrien@apache.org - independent - - - proyal - Peter Royal - proyal@apache.org - Pace Systems Group, Inc. - - - jstrachan - James Strachan - jstrachan@apache.org - SpiritSoft, Inc. - - - rahul - Rahul Akolkar - rahul AT apache.org - Apache Software Foundation - - - - - The Apache Software License, Version 2.0 - /LICENSE.txt - repo - - - - scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/jexl/trunk - scm:svn:https://svn.apache.org/repos/asf/jakarta/commons/proper/jexl/trunk - http://svn.apache.org/repos/asf/jakarta/commons/proper/jexl/trunk - - - The Apache Software Foundation - http://jakarta.apache.org - - - src/java - src/test - - - META-INF - . - - NOTICE.txt - - - - - - maven-compiler-plugin - - true - false - true - 1.3 - 1.3 - - - - maven-jar-plugin - - - - org.apache.commons.jexl - Apache Software Foundation - 1.0 - Apache Software Foundation - org.apache - 1.1-SNAPSHOT - ${maven.compile.source} - ${maven.compile.target} - - - - - - maven-javadoc-plugin - - false - - http://java.sun.com/j2se/1.4.2/docs/api - http://jakarta.apache.org/commons/logging/apidocs - - - - - maven-surefire-plugin - - - org.apache.xerces.parsers.SAXParser - - - **/*Test.java - - - - - - - - - commons-logging - commons-logging - 1.0.3 - - - junit - junit - 3.8.1 - - - - - - maven-changes-plugin - - %URL%/browse/%ISSUE% - ${basedir}/xdocs/changes.xml - - - - maven-checkstyle-plugin - - ${basedir}/src/conf/checkstyle.xml - org/apache/commons/jexl/parser/Parser*.java,org/apache/commons/jexl/parser/SimpleCharStream.java,org/apache/commons/jexl/parser/Token*.java,org/apache/commons/jexl/parser/JJTParserState.java - ${basedir}/src/conf/header.txt - - - - maven-javadoc-plugin - - - maven-jcoverage-plugin - - - maven-jxr-plugin - - - maven-pmd-plugin - - - /rulesets/basic.xml - /rulesets/unusedcode.xml - /rulesets/imports.xml - /rulesets/codesize.xml - /rulesets/coupling.xml - /rulesets/design.xml - /rulesets/strings.xml - - - - - maven-surefire-report-plugin - - - org.codehaus.mojo - jdepend-maven-plugin - - - org.codehaus.mojo - taglist-maven-plugin - - - - - - default - Default Repository - file:///www/jakarta.apache.org/builds/jakarta-commons/jexl/ - - - default - Default Site - scp://people.apache.org/www/jakarta.apache.org/commons/jexl/ - - - diff --git a/sources b/sources index 369049c..87892f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d774d1ec952faa744b2f768b611cf175 commons-jexl-1.1-src.tar.gz +37c370ec1c4168c26a88d2f6239b3153 commons-jexl-2.0.1-src.tar.gz