From c5609d8706fe0b75eb3e4cb516c17dff8cd54fad Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 12 Jan 2010 15:39:14 +0000 Subject: [PATCH 1/5] Initial import --- .cvsignore | 1 + apache-commons-jexl-1.1-level.patch | 13 ++ apache-commons-jexl.spec | 133 +++++++++++++++ import.log | 1 + pom.xml | 240 ++++++++++++++++++++++++++++ sources | 1 + 6 files changed, 389 insertions(+) create mode 100644 apache-commons-jexl-1.1-level.patch create mode 100644 apache-commons-jexl.spec create mode 100644 import.log create mode 100644 pom.xml diff --git a/.cvsignore b/.cvsignore index e69de29..0fb37da 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +commons-jexl-1.1-src.tar.gz diff --git a/apache-commons-jexl-1.1-level.patch b/apache-commons-jexl-1.1-level.patch new file mode 100644 index 0000000..f71469a --- /dev/null +++ b/apache-commons-jexl-1.1-level.patch @@ -0,0 +1,13 @@ +--- 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.spec b/apache-commons-jexl.spec new file mode 100644 index 0000000..b955a48 --- /dev/null +++ b/apache-commons-jexl.spec @@ -0,0 +1,133 @@ +%global jarname commons-jexl + +Name: apache-%{jarname} +Version: 1.1 +Release: 3%{?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 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: jpackage-utils +BuildRequires: java-devel +BuildRequires: maven2 +BuildRequires: maven2-plugin-compiler +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-doxia-sitetools + +BuildArch: noarch + +Requires: jpackage-utils +Requires: java +Provides: %{jarname} = %{version}-%{release} + +%description +Java Expression Language (JEXL) is an expression language engine which can be +embedded in applications and frameworks. JEXL is inspired by Jakarta Velocity +and the Expression Language defined in the JavaServer Pages Standard Tag +Library version 1.1 (JSTL) and JavaServer Pages version 2.0 (JSP). While +inspired by JSTL EL, it must be noted that JEXL is not a compatible +implementation of EL as defined in JSTL 1.1 (JSR-052) or JSP 2.0 (JSR-152). +For a compatible implementation of these specifications, see the Commons EL +project. + +JEXL attempts to bring some of the lessons learned by the Velocity community +about expression languages in templating to a wider audience. Commons Jelly +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} + +%description javadoc +This package contains the API documentation for %{name}. + + +%prep +%setup -q -n %{jarname}-%{version}-src +%patch0 -p1 -b .level +cp %SOURCE1 . +find \( -name '*.jar' -o -name '*.class' \) -exec rm -f '{}' + +# Fix line endings +find -name '*.txt' -exec sed -i 's/\r//' '{}' + + + +%build +export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository +mkdir -p $MAVEN_REPO_LOCAL + +mvn-jpp \ +-Dmaven.repo.local=$MAVEN_REPO_LOCAL \ +install javadoc:javadoc + + +%install +rm -rf $RPM_BUILD_ROOT + +mkdir -p $RPM_BUILD_ROOT%{_javadir} +cp target/%{jarname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar +ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar +ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{jarname}.jar +ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{jarname}-%{version}.jar + +mkdir -p $RPM_BUILD_ROOT%{_javadocdir} +cp -rp target/site/apidocs \ +$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} + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%post +%update_maven_depmap + +%postun +%update_maven_depmap + + +%files +%defattr(-,root,root,-) +%doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt +%{_datadir}/maven2/poms/JPP-%{name}.pom +%{_mavendepmapfragdir} +%{_javadir}/%{name}-%{version}.jar +%{_javadir}/%{name}.jar +%{_javadir}/%{jarname}-%{version}.jar +%{_javadir}/%{jarname}.jar + +%files javadoc +%defattr(-,root,root,-) +%{_javadocdir}/%{name} + + +%changelog +* Sat Jan 9 2010 Orion Poplawski - 1.1-3 +- Drop gcj support +- Fix javadoc group +- Bump java levels in pom.xml + +* Thu Jan 7 2010 Orion Poplawski - 1.1-2 +- Rename to apache-commons-jexl + +* Tue Oct 27 2009 Orion Poplawski - 1.1-1 +- Initial Fedora Package diff --git a/import.log b/import.log new file mode 100644 index 0000000..63cb47c --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +apache-commons-jexl-1_1-3_fc12:F-12:apache-commons-jexl-1.1-3.fc12.src.rpm:1263310558 diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..5ffbf8e --- /dev/null +++ b/pom.xml @@ -0,0 +1,240 @@ + + 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 e69de29..369049c 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +d774d1ec952faa744b2f768b611cf175 commons-jexl-1.1-src.tar.gz From b343a29968c67d90211dcc56c2e7cad75056a9a7 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 8 May 2010 01:42:49 +0000 Subject: [PATCH 2/5] Initialize branch EL-6 for apache-commons-jexl --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..46381b9 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-6 From d1fea55ace062d927de391bd2992043258f7791f Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 1 Jul 2010 17:40:31 +0000 Subject: [PATCH 3/5] Update to 2.0.1 from devel --- .cvsignore | 2 +- apache-commons-jexl-1.1-level.patch | 13 -- apache-commons-jexl-2.0.1-bsf.patch | 23 +++ apache-commons-jexl.spec | 31 ++-- import.log | 1 + pom.xml | 240 ---------------------------- sources | 2 +- 7 files changed, 47 insertions(+), 265 deletions(-) delete mode 100644 apache-commons-jexl-1.1-level.patch create mode 100644 apache-commons-jexl-2.0.1-bsf.patch delete mode 100644 pom.xml 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 From 7054a4bb8904b0940c03c601f176b0d067b08b82 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 10:03:47 +0000 Subject: [PATCH 4/5] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 2 -- 4 files changed, 24 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 3abbe00..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: apache-commons-jexl -# $Id$ -NAME := apache-commons-jexl -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 46381b9..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-6 diff --git a/import.log b/import.log deleted file mode 100644 index 798711d..0000000 --- a/import.log +++ /dev/null @@ -1,2 +0,0 @@ -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 From 8c6b435d255a18ec70e9ee882448fa0b2c4cba9f Mon Sep 17 00:00:00 2001 From: Till Maas Date: Mon, 22 May 2017 23:11:23 +0200 Subject: [PATCH 5/5] 2017-05-22: Retired orphaned package, because it was not built or published. --- .gitignore | 1 - apache-commons-jexl-2.0.1-bsf.patch | 23 ----- apache-commons-jexl.spec | 144 ---------------------------- dead.package | 3 + sources | 1 - 5 files changed, 3 insertions(+), 169 deletions(-) delete mode 100644 .gitignore delete mode 100644 apache-commons-jexl-2.0.1-bsf.patch delete mode 100644 apache-commons-jexl.spec create mode 100644 dead.package delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 9630e23..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -commons-jexl-2.0.1-src.tar.gz diff --git a/apache-commons-jexl-2.0.1-bsf.patch b/apache-commons-jexl-2.0.1-bsf.patch deleted file mode 100644 index 86f6113..0000000 --- a/apache-commons-jexl-2.0.1-bsf.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- 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 deleted file mode 100644 index 2fcddd2..0000000 --- a/apache-commons-jexl.spec +++ /dev/null @@ -1,144 +0,0 @@ -%global jarname commons-jexl - -Name: apache-%{jarname} -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 -# 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 >= 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 - -Requires: jpackage-utils -Requires: java -Provides: %{jarname} = %{version}-%{release} - -%description -Java Expression Language (JEXL) is an expression language engine which can be -embedded in applications and frameworks. JEXL is inspired by Jakarta Velocity -and the Expression Language defined in the JavaServer Pages Standard Tag -Library version 1.1 (JSTL) and JavaServer Pages version 2.0 (JSP). While -inspired by JSTL EL, it must be noted that JEXL is not a compatible -implementation of EL as defined in JSTL 1.1 (JSR-052) or JSP 2.0 (JSR-152). -For a compatible implementation of these specifications, see the Commons EL -project. - -JEXL attempts to bring some of the lessons learned by the Velocity community -about expression languages in templating to a wider audience. Commons Jelly -needed Velocity-ish method access, it just had to have it. - - -%package javadoc -Summary: Javadocs for %{name} -Group: Documentation -Requires: jpackage-utils -Provides: %{jarname}-javadoc = %{version}-%{release} - -%description javadoc -This package contains the API documentation for %{name}. - - -%prep -%setup -q -n %{jarname}-%{version}-src -%patch0 -p1 -b .bsf -find \( -name '*.jar' -o -name '*.class' \) -exec rm -f '{}' + -# Fix line endings -find -name '*.txt' -exec sed -i 's/\r//' '{}' + - - -%build -export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository -mkdir -p $MAVEN_REPO_LOCAL - -mvn-jpp \ --Dmaven.repo.local=$MAVEN_REPO_LOCAL \ -install javadoc:javadoc - - -%install -rm -rf $RPM_BUILD_ROOT - -mkdir -p $RPM_BUILD_ROOT%{_javadir} -cp target/%{jarname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar -ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar -ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{jarname}.jar -ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{jarname}-%{version}.jar - -mkdir -p $RPM_BUILD_ROOT%{_javadocdir} -cp -rp target/site/apidocs \ -$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.commons %{jarname} %{version} JPP %{name} - - -%clean -rm -rf $RPM_BUILD_ROOT - - -%post -%update_maven_depmap - -%postun -%update_maven_depmap - - -%files -%defattr(-,root,root,-) -%doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt -%{_datadir}/maven2/poms/JPP-%{name}.pom -%{_mavendepmapfragdir} -%{_javadir}/%{name}-%{version}.jar -%{_javadir}/%{name}.jar -%{_javadir}/%{jarname}-%{version}.jar -%{_javadir}/%{jarname}.jar - -%files javadoc -%defattr(-,root,root,-) -%{_javadocdir}/%{name} - - -%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 -- Bump java levels in pom.xml - -* Thu Jan 7 2010 Orion Poplawski - 1.1-2 -- Rename to apache-commons-jexl - -* Tue Oct 27 2009 Orion Poplawski - 1.1-1 -- Initial Fedora Package diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..233469d --- /dev/null +++ b/dead.package @@ -0,0 +1,3 @@ +2017-05-22: Retired orphaned package, because it was not built or +published. + diff --git a/sources b/sources deleted file mode 100644 index 87892f7..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -37c370ec1c4168c26a88d2f6239b3153 commons-jexl-2.0.1-src.tar.gz