Hello community, here is the log from the commit of package jdom for openSUSE:Factory checked in at 2019-03-28 22:45:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jdom (Old) and /work/SRC/openSUSE:Factory/.jdom.new.25356 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jdom" Thu Mar 28 22:45:34 2019 rev:24 rq:689060 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/jdom/jdom.changes 2018-12-10 12:22:59.106847517 +0100 +++ /work/SRC/openSUSE:Factory/.jdom.new.25356/jdom.changes 2019-03-28 22:45:35.663084919 +0100 @@ -1,0 +2,11 @@ +Tue Mar 26 16:48:35 UTC 2019 - Fridrich Strba <[email protected]> + +- Upgrade the jdom component to 1.1.3 +- Modified patch: + * jdom-1.1-build.xml.patch + + Remove unneeded hunk +- Added patch: + * jdom-1.1-OSGiManifest.patch + + Make jdom an OSGi bundle + +------------------------------------------------------------------- Old: ---- jdom-1.1.pom jdom-1.1.tar.bz2 New: ---- jdom-1.1-OSGiManifest.patch jdom-1.1.3.pom jdom-1.1.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jdom.spec ++++++ --- /var/tmp/diff_new_pack.yo7f9l/_old 2019-03-28 22:45:36.807084745 +0100 +++ /var/tmp/diff_new_pack.yo7f9l/_new 2019-03-28 22:45:36.827084742 +0100 @@ -1,7 +1,7 @@ # # spec file for package jdom # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -20,7 +20,7 @@ %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_version 1.1.3 %define jdom_suffix %{nil} %define dom4j_version 1.6.1 %define dom4j_suffix %{nil} @@ -31,16 +31,16 @@ %define jaxen_version 1.1.1 %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 jdom_dir %{_builddir}/%{name}-%{jdom_version}/%{name} %define stage1_build_dir %{_builddir}/build Name: jdom -Version: 1.1 +Version: 1.1.3 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 -Source0: %{name}-%{version}.tar.bz2 +Source0: http://jdom.org/dist/binary/archive/%{name}-%{version}.tar.gz Source1: saxpath-%{saxpath_version}.tar.bz2 Source2: xom-%{xom_version}-src.tar.bz2 # svn co svn://svn.debian.org/svn/pkg-java/trunk/dom4j @@ -51,11 +51,12 @@ # 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 +Source10: http://repo.maven.apache.org/maven2/org/%{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: jdom-1.1-OSGiManifest.patch Patch2: jdom-1.1-xom-get-jaxen.patch BuildRequires: ant BuildRequires: ant-junit @@ -156,6 +157,7 @@ # 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 @@ -185,22 +187,24 @@ 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 +jar cf %{jdom_dir}/jaxen.jar -C %{stage1_build_dir} . pushd %{jdom_dir} ant -Dparser.jar=$(build-classpath xerces-j2) \ -Dxml-apis.jar=$(build-classpath xml-commons-apis) \ - -Djaxen.lib.dir=%{stage1_build_dir} \ - -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \ + -Djaxen.lib.dir=%{jdom_dir} \ + -Dcompile.source=1.6 -Dcompile.target=1.6 \ + -Dversion=%jdom_version \ package -mv build/jdom.jar %{_builddir}/jdom-%{jdom_version}.jar +mv build/jdom-%{jdom_version}.jar %{_builddir}/jdom-%{jdom_version}.jar +rm jaxen.jar popd pushd %{jaxen_dir}/src/java/main mkdir build #mkdir %{_builddir}/jaxen-excluded #mv org/jaxen/dom4j %{_builddir}/jaxen-excluded ${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 * +jar -cf %{_builddir}/jaxen-%{jaxen_version}.jar -C build . popd pushd %{saxpath_dir} mkdir src/conf @@ -234,7 +238,7 @@ mkdir -p %{buildroot}/%{_mavenpomdir} cp *.pom %{buildroot}/%{_mavenpomdir}/ -%add_maven_depmap jdom-%{jdom_version}.pom jdom-%{jdom_version}.jar +%add_maven_depmap jdom-%{jdom_version}.pom jdom-%{jdom_version}.jar -a jdom:jdom %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 ++++++ jdom-1.1-OSGiManifest.patch ++++++ --- jdom/package/META-INF/MANIFEST.MF.osgimanifest 2008-07-21 16:00:59.000000000 -0400 +++ jdom/package/META-INF/MANIFEST.MF 2008-07-21 16:02:20.000000000 -0400 @@ -1,4 +1,19 @@ Manifest-Version: 1.0 +Bundle-RequiredExecutionEnvironment: J2SE-1.4 +Bundle-SymbolicName: org.jdom +Bundle-ManifestVersion: 2 +Bundle-Name: %Bundle-Name.0 +Bundle-Localization: plugin +Bundle-Version: @version.impl@ +Bundle-Vendor: %Bundle-Vendor.0 +Export-Package: org.jdom;version="@version.impl@", + org.jdom.adapters;version="@version.impl@", + org.jdom.filter;version="@version.impl@", + org.jdom.input;version="@version.impl@", + org.jdom.output;version="@version.impl@", + org.jdom.transform;version="@version.impl@", + org .jdom.xpath;version="@version.impl@" +Require-Bundle: org.apache.xerces;resolution:=optional Name: org/jdom/ Specification-Title: JDOM Classes ++++++ jdom-1.1-build.xml.patch ++++++ --- /var/tmp/diff_new_pack.yo7f9l/_old 2019-03-28 22:45:36.931084726 +0100 +++ /var/tmp/diff_new_pack.yo7f9l/_new 2019-03-28 22:45:36.931084726 +0100 @@ -1,78 +1,57 @@ ---- jdom-1.1/build.xml -+++ jdom-1.1/build.xml -@@ -39,8 +39,8 @@ - - <property name="compile.debug" value="true" /> - <property name="compile.optimize" value="true" /> -- <property name="compile.target" value="1.2" /> -- <property name="compile.source" value="1.2" /> -+ <property name="compile.target" value="1.6" /> -+ <property name="compile.source" value="1.6" /> - <property name="compile.deprecation" value="true" /> - - <property name="src.dir" value="./src/java"/> -@@ -75,6 +75,7 @@ - <path id="compile.class.path"> - <pathelement location="${xml-apis.jar}"/> - <pathelement location="${parser.jar}"/> -+ <pathelement location="${jaxen.lib.dir}"/> - - <fileset dir="${jaxen.lib.dir}"> - <include name="jaxen-*.jar"/> ---- XOM/build.xml -+++ XOM/build.xml -@@ -201,8 +201,8 @@ - debug="${debug}" - optimize="${optimize}" - deprecation="${deprecation}" -- target="1.2" -- source="1.3" -+ target="1.6" -+ source="1.6" - encoding="UTF-8" - excludes="nu/xom/pantry/* nu/xom/tools/* nu/xom/samples/*Servlet.java"> - <classpath refid="compile.class.path"/> -@@ -228,8 +228,8 @@ - debug="${debug}" - optimize="${optimize}" - deprecation="${deprecation}" -- target="1.2" -- source="1.3" -+ target="1.6" -+ source="1.6" - encoding="UTF-8"> - <classpath refid="compile.class.path"/> - <include name="nu/xom/samples/*Servlet.java" /> -@@ -244,8 +244,8 @@ - debug="${debug}" - optimize="${optimize}" - deprecation="${deprecation}" -- target="1.2" -- source="1.3" -+ target="1.6" -+ source="1.6" - encoding="UTF-8" - failonerror="false"> - <classpath refid="compile.class.path"/> -@@ -462,8 +462,8 @@ - debug="${debug}" - optimize="${optimize}" - deprecation="${deprecation}" -- target="1.2" -- source="1.3" -+ target="1.6" -+ source="1.6" - encoding="UTF-8" - includes="nu/xom/tools/*"> - <classpath> -@@ -705,8 +705,8 @@ - debug="${debug}" - optimize="${optimize}" - deprecation="${deprecation}" -- target="1.2" -- source="1.3" -+ target="1.6" -+ source="1.6" - encoding="UTF-8" - includeAntRuntime="no" - excludes="org/jaxen/dom/** +--- XOM/build.xml ++++ XOM/build.xml +@@ -201,8 +201,8 @@ + debug="${debug}" + optimize="${optimize}" + deprecation="${deprecation}" +- target="1.2" +- source="1.3" ++ target="1.6" ++ source="1.6" + encoding="UTF-8" + excludes="nu/xom/pantry/* nu/xom/tools/* nu/xom/samples/*Servlet.java"> + <classpath refid="compile.class.path"/> +@@ -228,8 +228,8 @@ + debug="${debug}" + optimize="${optimize}" + deprecation="${deprecation}" +- target="1.2" +- source="1.3" ++ target="1.6" ++ source="1.6" + encoding="UTF-8"> + <classpath refid="compile.class.path"/> + <include name="nu/xom/samples/*Servlet.java" /> +@@ -244,8 +244,8 @@ + debug="${debug}" + optimize="${optimize}" + deprecation="${deprecation}" +- target="1.2" +- source="1.3" ++ target="1.6" ++ source="1.6" + encoding="UTF-8" + failonerror="false"> + <classpath refid="compile.class.path"/> +@@ -462,8 +462,8 @@ + debug="${debug}" + optimize="${optimize}" + deprecation="${deprecation}" +- target="1.2" +- source="1.3" ++ target="1.6" ++ source="1.6" + encoding="UTF-8" + includes="nu/xom/tools/*"> + <classpath> +@@ -705,8 +705,8 @@ + debug="${debug}" + optimize="${optimize}" + deprecation="${deprecation}" +- target="1.2" +- source="1.3" ++ target="1.6" ++ source="1.6" + encoding="UTF-8" + includeAntRuntime="no" + excludes="org/jaxen/dom/** ++++++ jdom-1.1.pom -> jdom-1.1.3.pom ++++++ --- /work/SRC/openSUSE:Factory/jdom/jdom-1.1.pom 2018-12-10 12:22:58.978847644 +0100 +++ /work/SRC/openSUSE:Factory/.jdom.new.25356/jdom-1.1.3.pom 2019-03-28 22:45:35.547084937 +0100 @@ -1,15 +1,75 @@ -<?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> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jdom</groupId> + <artifactId>jdom</artifactId> + <packaging>jar</packaging> + + <name>JDOM</name> + <version>1.1.3</version> + + <description> + A complete, Java-based solution for accessing, manipulating, + and outputting XML data + </description> + <url>http://www.jdom.org</url> + + <organization> + <name>JDOM</name> + <url>http://www.jdom.org</url> + </organization> + + <mailingLists> + <mailingList> + <name>JDOM-interest Mailing List</name> + <post>[email protected]</post> + <archive>http://jdom.markmail.org/</archive> + </mailingList> + </mailingLists> + + <licenses> + <license> + <name>Similar to Apache License but with the acknowledgment clause removed</name> + <url>https://raw.github.com/hunterhacker/jdom/master/LICENSE.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + + <scm> + <url>[email protected]:/hunterhacker/jdom</url> + <connection>scm:git:[email protected]:hunterhacker/jdom</connection> + <developerConnection>scm:git:[email protected]:hunterhacker/jdom</developerConnection> + </scm> + + <developers> + <developer> + <id>hunterhacker</id> + <name>Jason Hunter</name> + <email>[email protected]</email> + </developer> + <developer> + <id>rolfl</id> + <name>Rolf Lear</name> + <email>[email protected]</email> + </developer> + </developers> + + <dependencies> + <dependency> + <groupId>jaxen</groupId> + <artifactId>jaxen</artifactId> + <version>1.1.3</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>2.10.0</version> + <optional>true</optional> + </dependency> + + </dependencies> + + <properties> + <jdk.version>1.2</jdk.version> + </properties> </project> \ No newline at end of file
