Hello community, here is the log from the commit of package jdom for openSUSE:Factory checked in at 2018-12-10 12:22:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jdom (Old) and /work/SRC/openSUSE:Factory/.jdom.new.19453 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jdom" Mon Dec 10 12:22:57 2018 rev:23 rq:655983 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/jdom/jdom.changes 2017-10-06 10:54:21.907757276 +0200 +++ /work/SRC/openSUSE:Factory/.jdom.new.19453/jdom.changes 2018-12-10 12:22:59.106847517 +0100 @@ -1,0 +2,15 @@ +Tue Nov 20 10:58:51 UTC 2018 - Fridrich Strba <[email protected]> + +- Removed patch: + * include-glibj.jar.patch + + The build works since ages without glibj being present, so + removing any trace of it + +------------------------------------------------------------------- +Tue Nov 20 09:32:18 UTC 2018 - Fridrich Strba <[email protected]> + +- 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 + +------------------------------------------------------------------- Old: ---- include-glibj.jar.patch New: ---- jaxen-1.1.1.pom jdom-1.1.pom saxpath-1.0-FCS.pom xom-1.2.5.pom ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jdom.spec ++++++ --- /var/tmp/diff_new_pack.tiARvE/_old 2018-12-10 12:23:00.014846612 +0100 +++ /var/tmp/diff_new_pack.tiARvE/_new 2018-12-10 12:23:00.014846612 +0100 @@ -1,7 +1,7 @@ # # spec file for package jdom # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -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 @@ 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,16 @@ # 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 @@ -93,7 +97,7 @@ Version: 1.2b1 Release: 0 Summary: XOM is a new XML object model -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Development/Languages/Java %description -n xom @@ -152,29 +156,39 @@ # delete all inlcuded jar files: 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) \ -Dxml-apis.jar=$(build-classpath xml-commons-apis) \ - -Dglibj.jar=$(build-classpath glibj) \ -Djaxen.lib.dir=%{stage1_build_dir} \ -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \ package @@ -184,14 +198,14 @@ 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 %{_builddir}/jdom-%{jdom_version}.jar:%{stage1_build_dir} -d build/ $(find . -name "*.java" | xargs) cd build jar -cf %{_builddir}/jaxen-%{jaxen_version}.jar * popd pushd %{saxpath_dir} mkdir src/conf touch src/conf/MANIFEST.MF -CLASSPATH=$(build-classpath glibj):%{_builddir}/jaxen-%{jaxen_version}.jar:%{_builddir}/jdom-%{jdom_version}.jar:%{stage1_build_dir} ant package +CLASSPATH=%{_builddir}/jaxen-%{jaxen_version}.jar:%{_builddir}/jdom-%{jdom_version}.jar:%{stage1_build_dir} ant package mv build/saxpath.jar %{_builddir}/saxpath-%{saxpath_version}.jar popd pushd %{xom_dir} @@ -204,8 +218,7 @@ -Djunit.jar=$(build-classpath junit) \ -Dresolver.jar=$(build-classpath xml-commons-resolver) \ -Ddom4j.jar=%{stage1_build_dir} \ --Dglibj.jar=$(build-classpath glibj) \ - -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \ +-Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \ compile compile15 jar mv build/xom-%{xom_version}.jar %{_builddir} popd @@ -219,16 +232,47 @@ 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 ++++++ jaxen-1.1.1.pom ++++++ <?xml version="1.0" encoding="UTF-8"?><project> <modelVersion>4.0.0</modelVersion> <groupId>jaxen</groupId> <artifactId>jaxen</artifactId> <name>jaxen</name> <version>1.1.1</version> <description>Jaxen is a universal Java XPath engine.</description> <url>http://jaxen.codehaus.org/</url> <issueManagement> <url>http://jira.codehaus.org/BrowseProject.jspa?id=10022</url> </issueManagement> <ciManagement> <notifiers> <notifier> <configuration> <address>[email protected]</address> </configuration> </notifier> </notifiers> </ciManagement> <inceptionYear>2001</inceptionYear> <mailingLists> <mailingList> <name>Jaxen Users List</name> <subscribe>[email protected]</subscribe> <unsubscribe>[email protected]</unsubscribe> <archive>http://archive.jaxen.codehaus.org/user/</archive> </mailingList> <mailingList> <name>Jaxen Developers List</name> <subscribe>[email protected]</subscribe> <unsubscribe>[email protected]</unsubscribe> <archive>http://archive.jaxen.codehaus.org/dev/</archive> </mailingList> <mailingList> <name>Jaxen CVS Commits List</name> <subscribe>[email protected]</subscribe> <unsubscribe>[email protected]</unsubscribe> <archive>http://archive.jaxen.codehaus.org/scm/</archive> </mailingList> </mailingLists> <developers> <developer> <id>bob</id> <name>Bob McWhirter</name> <email>[email protected]</email> <organization>The Werken Company</organization> </developer> <developer> <id>jstrachan</id> <name>James Strachan</name> <email>[email protected]</email> <organization>Spiritsoft</organization> </developer> <developer> <id>dmegginson</id> <name>David Megginson</name> <email>[email protected]</email> <organization>Megginson Technologies</organization> </developer> <developer> <id>eboldwidt</id> <name>Erwin Bolwidt</name> <email>[email protected]</email> </developer> <developer> <id>mbelonga</id> <name>Mark A. Belonga</name> <email>[email protected]</email> </developer> <developer> <id>cnentwich</id> <name>Christian Nentwich</name> <email>[email protected]</email> </developer> <developer> <id>purpletech</id> <name>Alexander Day Chaffee</name> <email>[email protected]</email> <organization>Purple Technologies</organization> </developer> <developer> <id>jdvorak</id> <name>Jan Dvorak</name> <email>[email protected]</email> </developer> <developer> <id>szegedia</id> <name>Attila Szegedi</name> <email>[email protected]</email> </developer> <developer> <id>proyal</id> <name>Peter Royal</name> <email>[email protected]</email> <url>http://fotap.org/~osi</url> </developer> <developer> <id>ssanders</id> <name>Scott Sanders</name> <email>[email protected]</email> <url>http://dotnot.org/blog</url> <organization>dotnot</organization> </developer> <developer> <id>bewins</id> <name>Brian Ewins</name> <email>[email protected]</email> </developer> <developer> <id>elharo</id> <name>Elliotte Rusty Harold</name> <email>[email protected]</email> <url>http://www.elharo.com/</url> <organization>Cafe au Lait</organization> </developer> </developers> <contributors> <contributor> <name>Ryan Gustafson</name> <email>[email protected]</email> </contributor> <contributor> <name>David Peterson</name> <email>[email protected]</email> </contributor> <contributor> <name>Mark Wilson</name> <email>[email protected]</email> </contributor> <contributor> <name>Jacob Kjome</name> <email>[email protected]</email> </contributor> <contributor> <name>Michael Brennan</name> <email>[email protected]</email> </contributor> <contributor> <name>Jason Hunter</name> <email>[email protected]</email> </contributor> <contributor> <name>Brett Mclaughlin</name> <email>[email protected]</email> </contributor> <contributor> <name>Bradley S. Huffman</name> <email>[email protected]</email> </contributor> <contributor> <name>K. Ari Krupnikov</name> <email>[email protected]</email> </contributor> <contributor> <name>Paul R. Brown</name> <email>[email protected]</email> </contributor> <contributor> <name>Guoliang Cao</name> <email>[email protected]</email> </contributor> <contributor> <name>J??r??me N??gre</name> <email>[email protected]</email> </contributor> <contributor> <name>Eddie McGreal</name> <email>[email protected]</email> </contributor> <contributor> <name>Steen Lehmann</name> <email>[email protected]</email> </contributor> </contributors> <scm> <connection>scm:cvs:pserver:[email protected]:/cvs/jaxen:jaxen</connection> <url>http://cvs.jaxen.codehaus.org</url> </scm> <organization> <name>Codehaus</name> <url>http://codehaus.org</url> </organization> <build> <sourceDirectory>src/java/main</sourceDirectory> <testSourceDirectory>src/java/test</testSourceDirectory> <plugins> <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> <includes> <include>**/*Test.java</include> </includes> </configuration> </plugin> <plugin> <groupId>maven-plugins</groupId> <artifactId>maven-cobertura-plugin</artifactId> <version>1.3</version> <configuration /> </plugin> <plugin> <groupId>maven-plugins</groupId> <artifactId>maven-findbugs-plugin</artifactId> <version>1.3.1</version> <configuration /> </plugin> </plugins> </build> <dependencies> <dependency> <groupId>dom4j</groupId> <artifactId>dom4j</artifactId> <version>1.6.1</version> </dependency> <dependency> <groupId>jdom</groupId> <artifactId>jdom</artifactId> <version>1.0</version> </dependency> <dependency> <groupId>xml-apis</groupId> <artifactId>xml-apis</artifactId> <version>1.3.02</version> </dependency> <dependency> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> <version>2.6.2</version> </dependency> <dependency> <groupId>xom</groupId> <artifactId>xom</artifactId> <version>1.0</version> </dependency> </dependencies> <distributionManagement> <repository> <id>default</id> <name>Default Repository</name> <url>file:///dist</url> </repository> <site> <id>default</id> <name>Default Site</name> <url>scp://jaxen.codehaus.org//home/projects/jaxen/public_html</url> </site> <status>converted</status> </distributionManagement> </project>++++++ jdom-1.1.pom ++++++ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <groupId>jdom</groupId> <artifactId>jdom</artifactId> <version>1.1</version> <packaging>jar</packaging> <distributionManagement> <relocation> <groupId>org.jdom</groupId> </relocation> </distributionManagement> </project>++++++ saxpath-1.0-FCS.pom ++++++ <project> <modelVersion>4.0.0</modelVersion> <groupId>saxpath</groupId> <artifactId>saxpath</artifactId> <version>1.0-FCS</version> </project>++++++ xom-1.2.5.pom ++++++ <?xml version="1.0"?> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <packaging>jar</packaging> <name>XOM</name> <version>1.2.5</version> <description>The XOM Dual Streaming/Tree API for Processing XML</description> <url>http://xom.nu</url> <licenses> <license> <name>The GNU Lesser General Public License, Version 2.1</name> <url>http://www.gnu.org/licenses/lgpl-2.1.html</url> <distribution>repo</distribution> </license> </licenses> <scm> <url>https://xom.dev.java.net/source/browse/xom/</url> </scm> <artifactId>xom</artifactId> <!-- previously used group ID --> <groupId>xom</groupId> <inceptionYear>2002</inceptionYear> <mailingLists> <mailingList> <name>XOM Interest Mailing List</name> <archive>http://lists.ibiblio.org/pipermail/xom-interest/</archive> </mailingList> </mailingLists> <developers> <developer> <name>Elliotte Rusty Harold</name> <id>elharo</id> <email>[email protected]</email> <organization>Cafe au Lait</organization> </developer> </developers> <dependencies> <dependency> <groupId>xml-apis</groupId> <artifactId>xml-apis</artifactId> <version>1.3.03</version> <type>jar</type> </dependency> <dependency> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> <version>2.8.0</version> <type>jar</type> </dependency> <dependency> <groupId>xalan</groupId> <artifactId>xalan</artifactId> <version>2.7.0</version> <type>jar</type> </dependency> </dependencies> <build> <sourceDirectory>src</sourceDirectory> </build> </project>
