From ad6f3adfd19f56560e9eb4f302e404dbdf2b95807244d1a3ab065b7efed6759b Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 20 Nov 2018 09:37:25 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jdom?expand=0&rev=28 --- jaxen-1.1.1.pom | 250 ++++++++++++++++++++++++++++++++++++++++++++ jdom-1.1.pom | 15 +++ jdom.changes | 7 ++ jdom.spec | 80 +++++++++++--- saxpath-1.0-FCS.pom | 6 ++ xom-1.2.5.pom | 70 +++++++++++++ 6 files changed, 412 insertions(+), 16 deletions(-) create mode 100644 jaxen-1.1.1.pom create mode 100644 jdom-1.1.pom create mode 100644 saxpath-1.0-FCS.pom create mode 100644 xom-1.2.5.pom diff --git a/jaxen-1.1.1.pom b/jaxen-1.1.1.pom new file mode 100644 index 0000000..a922284 --- /dev/null +++ b/jaxen-1.1.1.pom @@ -0,0 +1,250 @@ + + 4.0.0 + jaxen + jaxen + jaxen + 1.1.1 + Jaxen is a universal Java XPath engine. + http://jaxen.codehaus.org/ + + http://jira.codehaus.org/BrowseProject.jspa?id=10022 + + + + + +
dev@jaxen.codehaus.org
+ + + + + 2001 + + + Jaxen Users List + user-subscribe@jaxen.codehaus.org + user-unsubscribe@jaxen.codehaus.org + http://archive.jaxen.codehaus.org/user/ + + + Jaxen Developers List + dev-subscribe@jaxen.codehaus.org + dev-unsubscribe@jaxen.codehaus.org + http://archive.jaxen.codehaus.org/dev/ + + + Jaxen CVS Commits List + scm-subscribe@jaxen.codehaus.org + scm-unsubscribe@jaxen.codehaus.org + http://archive.jaxen.codehaus.org/scm/ + + + + + bob + Bob McWhirter + bob@eng.werken.com + The Werken Company + + + jstrachan + James Strachan + james_strachan@yahoo.co.uk + Spiritsoft + + + dmegginson + David Megginson + contact@megginson.com + Megginson Technologies + + + eboldwidt + Erwin Bolwidt + erwin@klomp.org + + + mbelonga + Mark A. Belonga + mbelonga@users.sourceforge.net + + + cnentwich + Christian Nentwich + xcut@users.sourceforge.net + + + purpletech + Alexander Day Chaffee + purpletech@users.sourceforge.net + Purple Technologies + + + jdvorak + Jan Dvorak + jdvorak@users.sourceforge.net + + + szegedia + Attila Szegedi + szegedia@users.sourceforge.net + + + proyal + Peter Royal + peter.royal@pobox.com + http://fotap.org/~osi + + + ssanders + Scott Sanders + scott@dotnot.org + http://dotnot.org/blog + dotnot + + + bewins + Brian Ewins + brian.ewins@gmail.com + + + elharo + Elliotte Rusty Harold + elharo@metalab.unc.edu + http://www.elharo.com/ + Cafe au Lait + + + + + Ryan Gustafson + rgustav@users.sourceforge.net + + + David Peterson + david@randombits.org + + + Mark Wilson + mark.wilson@wilsoncom.de + + + Jacob Kjome + hoju@visi.com + + + Michael Brennan + mpbrennan@earthlink.net + + + Jason Hunter + jhunter@xquery.com + + + Brett Mclaughlin + brett.mclaughlin@lutris.com + + + Bradley S. Huffman + hip@cs.okstate.edu + + + K. Ari Krupnikov + ari@lib.aero + + + Paul R. Brown + prb@fivesight.com + + + Guoliang Cao + cao@ispsoft.com + + + J??r??me N??gre + jerome.negre@e-xmlmedia.fr + + + Eddie McGreal + emcgreal@BlackPearl.com + + + Steen Lehmann + slehmann@users.sourceforge.net + + + + scm:cvs:pserver:anonymous@cvs.jaxen.codehaus.org:/cvs/jaxen:jaxen + http://cvs.jaxen.codehaus.org + + + Codehaus + http://codehaus.org + + + src/java/main + src/java/test + + + maven-surefire-plugin + + + **/*Test.java + + + + + maven-plugins + maven-cobertura-plugin + 1.3 + + + + maven-plugins + maven-findbugs-plugin + 1.3.1 + + + + + + + dom4j + dom4j + 1.6.1 + + + jdom + jdom + 1.0 + + + xml-apis + xml-apis + 1.3.02 + + + xerces + xercesImpl + 2.6.2 + + + xom + xom + 1.0 + + + + + default + Default Repository + file:///dist + + + default + Default Site + scp://jaxen.codehaus.org//home/projects/jaxen/public_html + + converted + + \ No newline at end of file diff --git a/jdom-1.1.pom b/jdom-1.1.pom new file mode 100644 index 0000000..5247577 --- /dev/null +++ b/jdom-1.1.pom @@ -0,0 +1,15 @@ + + + 4.0.0 + + jdom + jdom + 1.1 + jar + + + + org.jdom + + + \ No newline at end of file diff --git a/jdom.changes b/jdom.changes index f0c639d..fd2ffe3 100644 --- a/jdom.changes +++ b/jdom.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Nov 20 09:32:18 UTC 2018 - Fridrich Strba + +- Add maven pom files for the distributed jars +- Speed-up build by filtering out the failing files beforehand + and then building all with one javac invocation + ------------------------------------------------------------------- Fri Sep 29 06:37:03 UTC 2017 - fstrba@suse.com diff --git a/jdom.spec b/jdom.spec index b4caa5d..388c9c8 100644 --- a/jdom.spec +++ b/jdom.spec @@ -12,24 +12,24 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define xom_version 1.2b1 -%define xom_suffix "" +%define xom_suffix %{nil} %define xom_dir %{_builddir}/%{name}-%{jdom_version}/XOM %define xom_included_jaxen_archive jaxen-1.1-src.zip %define jdom_version 1.1 -%define jdom_suffix "" +%define jdom_suffix %{nil} %define dom4j_version 1.6.1 -%define dom4j_suffix "" +%define dom4j_suffix %{nil} %define dom4j_dir %{_builddir}/%{name}-%{jdom_version}/dom4j %define saxpath_version 1.0 %define saxpath_suffix -FCS %define saxpath_dir %{_builddir}/%{name}-%{jdom_version}/saxpath-%{saxpath_version}%{saxpath_suffix} %define jaxen_version 1.1.1 -%define jaxen_suffix "" +%define jaxen_suffix %{nil} %define jaxen_dir %{_builddir}/%{name}-%{jdom_version}/jaxen-%{jaxen_version} %define jdom_dir %{_builddir}/%{name}-%{jdom_version}/%{name}-%{jdom_version} %define stage1_build_dir %{_builddir}/build @@ -39,7 +39,7 @@ Release: 0 Summary: JDOM is a Java Representation of an XML Document License: Apache-2.0 Group: Development/Libraries/Java -Url: http://www.jdom.org +URL: http://www.jdom.org Source0: %{name}-%{version}.tar.bz2 Source1: saxpath-%{saxpath_version}.tar.bz2 Source2: xom-%{xom_version}-src.tar.bz2 @@ -51,12 +51,17 @@ Source2: xom-%{xom_version}-src.tar.bz2 # tar --exclude-vcs -cjf dom4j-1.6.1-debian.tar.bz2 dom4j/ Source3: dom4j-%{dom4j_version}-debian.tar.bz2 Source4: jaxen-%{jaxen_version}-src.tar.bz2 +Source10: http://repo.maven.apache.org/maven2/%{name}/%{name}/%{jdom_version}%{jdom_suffix}/%{name}-%{jdom_version}%{jdom_suffix}.pom +Source11: http://repo.maven.apache.org/maven2/saxpath/saxpath/%{saxpath_version}%{saxpath_suffix}/saxpath-%{saxpath_version}%{saxpath_suffix}.pom +Source12: http://repo.maven.apache.org/maven2/xom/xom/1.2.5/xom-1.2.5.pom +Source13: http://repo.maven.apache.org/maven2/jaxen/jaxen/%{jaxen_version}%{jaxen_suffix}/jaxen-%{jaxen_version}%{jaxen_suffix}.pom Patch0: jdom-1.1-build.xml.patch Patch1: include-glibj.jar.patch Patch2: jdom-1.1-xom-get-jaxen.patch BuildRequires: ant BuildRequires: ant-junit BuildRequires: java-devel +BuildRequires: javapackages-local BuildRequires: junit BuildRequires: relaxngDatatype BuildRequires: servletapi5 @@ -154,22 +159,34 @@ find . -name "*.jar" -delete -name "*.class" -delete %patch0 %patch1 %patch2 +cp %{SOURCE10} %{name}-%{jdom_version}.pom +cp %{SOURCE11} saxpath-%{saxpath_version}.pom +cp %{SOURCE12} xom-%{xom_version}.pom +cp %{SOURCE13} jaxen-%{jaxen_version}.pom + +%pom_xpath_set pom:project/pom:version "%{xom_version}%{xom_suffix}" xom-%{xom_version}.pom %build export JAVA_OPTS="-source 1.6 -target 1.6 -encoding UTF-8 -J-Xss4m" export JAVAC="javac ${JAVA_OPTS} " export ANT_OPTS="-Xss4m" i=0 -export CLASSPATH="%{stage1_build_dir}:$(build-classpath $LIBGCJ xerces-j2 xalan-j2 xalan-j2-serializer junit relaxngDatatype servletapi5 xpp2 xpp3):%{jaxen_dir}/src/java/main/:%{jdom_dir}/src/java/:%{saxpath_dir}/src/java/main/:%{xom_dir}/src/:%{dom4j_dir}/src/java" +CLASSPATH="%{stage1_build_dir}:$(build-classpath xerces-j2 xalan-j2 xalan-j2-serializer junit relaxngDatatype servletapi5 xpp2 xpp3)" SOURCE_DIRS="%{jaxen_dir}/src/java/main/ %{jdom_dir}/src/java/ %{saxpath_dir}/src/java/main/ %{xom_dir}/src/ %{dom4j_dir}/src/java" -MAX=$(find ${SOURCE_DIRS} -iname "*.java" | wc -l) -for file in $(find ${SOURCE_DIRS} -name "*.java") -do - i=$((i+1)) - echo compiling class \# $i of ${MAX} - ${JAVAC} -classpath ${CLASSPATH} -d %{stage1_build_dir} $file || FAILED_FILES="$FAILED_FILES $file" -done -unset CLASSPATH SOURCE_DIRS MAX +SOURCE_PATH=$(echo ${SOURCE_DIRS} | sed 's#\ #:#g') +# Failing files +rm -f \ + XOM/src/nu/xom/tools/XHTMLJavaDoc.java \ + dom4j/src/java/org/dom4j/datatype/SchemaParser.java \ + dom4j/src/java/org/dom4j/datatype/DatatypeAttribute.java \ + dom4j/src/java/org/dom4j/datatype/DatatypeElement.java \ + dom4j/src/java/org/dom4j/datatype/NamedTypeResolver.java \ + dom4j/src/java/org/dom4j/datatype/DatatypeDocumentFactory.java \ + dom4j/src/java/org/dom4j/datatype/DatatypeElementFactory.java \ + dom4j/src/java/org/jaxen/dom4j/DocumentNavigator.java \ + dom4j/src/java/org/jaxen/dom4j/Dom4jXPath.java +${JAVAC} -classpath ${CLASSPATH} -sourcepath ${SOURCE_PATH} -d %{stage1_build_dir} $(find ${SOURCE_DIRS} -name "*.java" | xargs) +unset CLASSPATH SOURCE_DIRS SOURCE_PATH pushd %{jdom_dir} ant -Dparser.jar=$(build-classpath xerces-j2) \ @@ -184,7 +201,7 @@ pushd %{jaxen_dir}/src/java/main mkdir build #mkdir %{_builddir}/jaxen-excluded #mv org/jaxen/dom4j %{_builddir}/jaxen-excluded -${JAVAC} -classpath $(build-classpath glibj):%{_builddir}/jdom-%{jdom_version}.jar:%{stage1_build_dir} -d build/ $(find . -name "*.java") +${JAVAC} -classpath $(build-classpath glibj):%{_builddir}/jdom-%{jdom_version}.jar:%{stage1_build_dir} -d build/ $(find . -name "*.java" | xargs) cd build jar -cf %{_builddir}/jaxen-%{jaxen_version}.jar * popd @@ -219,16 +236,47 @@ ln -sf %{_javadir}/jaxen-%{jaxen_version}.jar %{buildroot}/%{_javadir}/jaxen.jar ln -sf %{_javadir}/saxpath-%{saxpath_version}.jar %{buildroot}/%{_javadir}/saxpath.jar ln -sf %{_javadir}/xom-%{xom_version}.jar %{buildroot}/%{_javadir}/xom.jar +mkdir -p %{buildroot}/%{_mavenpomdir} +cp *.pom %{buildroot}/%{_mavenpomdir}/ +%add_maven_depmap jdom-%{jdom_version}.pom jdom-%{jdom_version}.jar +%add_maven_depmap xom-%{xom_version}.pom xom-%{xom_version}.jar -f xom +%add_maven_depmap saxpath-%{saxpath_version}.pom saxpath-%{saxpath_version}.jar -f saxpath +%add_maven_depmap jaxen-%{jaxen_version}.pom jaxen-%{jaxen_version}.jar -f jaxen + %files %{_javadir}/jdom*.jar +%{_mavenpomdir}/jdom*.pom +%if %{defined _maven_repository} +%{_mavendepmapfragdir}/%{name} +%else +%{_datadir}/maven-metadata/%{name}.xml* +%endif %files -n xom %{_javadir}/xom*.jar +%{_mavenpomdir}/xom*.pom +%if %{defined _maven_repository} +%{_mavendepmapfragdir}/%{name}-xom +%else +%{_datadir}/maven-metadata/%{name}-xom.xml* +%endif %files -n saxpath %{_javadir}/saxpath*.jar +%{_mavenpomdir}/saxpath*.pom +%if %{defined _maven_repository} +%{_mavendepmapfragdir}/%{name}-saxpath +%else +%{_datadir}/maven-metadata/%{name}-saxpath.xml* +%endif %files -n jaxen %{_javadir}/jaxen*.jar +%{_mavenpomdir}/jaxen*.pom +%if %{defined _maven_repository} +%{_mavendepmapfragdir}/%{name}-jaxen +%else +%{_datadir}/maven-metadata/%{name}-jaxen.xml* +%endif %changelog diff --git a/saxpath-1.0-FCS.pom b/saxpath-1.0-FCS.pom new file mode 100644 index 0000000..ab79a9d --- /dev/null +++ b/saxpath-1.0-FCS.pom @@ -0,0 +1,6 @@ + + 4.0.0 + saxpath + saxpath + 1.0-FCS + \ No newline at end of file diff --git a/xom-1.2.5.pom b/xom-1.2.5.pom new file mode 100644 index 0000000..db13110 --- /dev/null +++ b/xom-1.2.5.pom @@ -0,0 +1,70 @@ + + + 4.0.0 + jar + XOM + 1.2.5 + The XOM Dual Streaming/Tree API for Processing XML + http://xom.nu + + + The GNU Lesser General Public License, Version 2.1 + http://www.gnu.org/licenses/lgpl-2.1.html + repo + + + + https://xom.dev.java.net/source/browse/xom/ + + + xom + + xom + + 2002 + + + + XOM Interest Mailing List + http://lists.ibiblio.org/pipermail/xom-interest/ + + + + + + Elliotte Rusty Harold + elharo + elharo@ibiblio.org + Cafe au Lait + + + + + + xml-apis + xml-apis + 1.3.03 + jar + + + xerces + xercesImpl + 2.8.0 + jar + + + xalan + xalan + 2.7.0 + jar + + + + + src + + + \ No newline at end of file