Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package jdom for openSUSE:Factory checked in at 2021-05-20 19:23:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jdom (Old) and /work/SRC/openSUSE:Factory/.jdom.new.2988 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jdom" Thu May 20 19:23:10 2021 rev:27 rq:893310 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/jdom/jdom.changes 2021-04-15 16:57:03.050639507 +0200 +++ /work/SRC/openSUSE:Factory/.jdom.new.2988/jdom.changes 2021-05-20 19:23:20.250374247 +0200 @@ -1,0 +2,6 @@ +Fri May 14 15:39:29 UTC 2021 - Ferdinand Thiessen <[email protected]> + +- Update jaxen to version 1.1.6 + * Bug fixes + +------------------------------------------------------------------- Old: ---- jaxen-1.1.1-src.tar.bz2 jaxen-1.1.1.pom New: ---- jaxen-1.1.6.pom jaxen-1.1.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jdom.spec ++++++ --- /var/tmp/diff_new_pack.sib5Gc/_old 2021-05-20 19:23:20.978371166 +0200 +++ /var/tmp/diff_new_pack.sib5Gc/_new 2021-05-20 19:23:20.982371150 +0200 @@ -28,7 +28,7 @@ %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_version 1.1.6 %define jaxen_suffix %{nil} %define jaxen_dir %{_builddir}/%{name}-%{jdom_version}/jaxen-%{jaxen_version} %define jdom_dir %{_builddir}/%{name}-%{jdom_version}/%{name} @@ -50,11 +50,11 @@ # rm dom4j/lib/tools/clover.license # 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 +Source4: jaxen-%{jaxen_version}.tar.gz 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 +Source13: https://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 @@ -142,7 +142,7 @@ Canonical XML. XOM documents can be converted to and from SAX and DOM. %package -n jaxen -Version: 1.1.1 +Version: 1.1.6 Release: 0 Summary: The jaxen project is a Java XPath Engine License: Apache-2.0 @@ -175,6 +175,7 @@ cp %{SOURCE13} jaxen-%{jaxen_version}.pom %pom_xpath_set pom:project/pom:version "%{xom_version}%{xom_suffix}" xom-%{xom_version}.pom +%pom_remove_parent jaxen-%{jaxen_version}.pom %build export JAVA_OPTS="-source 1.6 -target 1.6 -encoding UTF-8 -J-Xss6m" ++++++ jaxen-1.1.1.pom -> jaxen-1.1.6.pom ++++++ --- /work/SRC/openSUSE:Factory/jdom/jaxen-1.1.1.pom 2018-12-10 12:22:58.922847700 +0100 +++ /work/SRC/openSUSE:Factory/.jdom.new.2988/jaxen-1.1.6.pom 2021-05-20 19:23:20.090374923 +0200 @@ -1,12 +1,27 @@ -<?xml version="1.0" encoding="UTF-8"?><project> +<?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> + + <parent> + <artifactId>oss-parent</artifactId> + <groupId>org.sonatype.oss</groupId> + <version>7</version> + </parent> + <groupId>jaxen</groupId> <artifactId>jaxen</artifactId> + <packaging>bundle</packaging> <name>jaxen</name> - <version>1.1.1</version> + <version>1.1.6</version> <description>Jaxen is a universal Java XPath engine.</description> <url>http://jaxen.codehaus.org/</url> + <licenses> + <license> + <url>http://jaxen.codehaus.org/license.html</url> + </license> + </licenses> <issueManagement> + <system>JIRA</system> <url>http://jira.codehaus.org/BrowseProject.jspa?id=10022</url> </issueManagement> <ciManagement> @@ -19,6 +34,12 @@ </notifiers> </ciManagement> <inceptionYear>2001</inceptionYear> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + </properties> + <mailingLists> <mailingList> <name>Jaxen Users List</name> @@ -33,12 +54,13 @@ <archive>http://archive.jaxen.codehaus.org/dev/</archive> </mailingList> <mailingList> - <name>Jaxen CVS Commits List</name> + <name>Jaxen 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> @@ -110,11 +132,12 @@ <developer> <id>elharo</id> <name>Elliotte Rusty Harold</name> - <email>[email protected]</email> + <email>[email protected]</email> <url>http://www.elharo.com/</url> <organization>Cafe au Lait</organization> </developer> </developers> + <contributors> <contributor> <name>Ryan Gustafson</name> @@ -161,7 +184,7 @@ <email>[email protected]</email> </contributor> <contributor> - <name>J??r??me N??gre</name> + <name>J??r??me N??gre</name> <email>[email protected]</email> </contributor> <contributor> @@ -172,21 +195,113 @@ <name>Steen Lehmann</name> <email>[email protected]</email> </contributor> + <contributor> + <name>Ben McCann</name> + <email>[email protected]</email> + </contributor> + <contributor> + <name>Don Corley</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> + <connection>scm:svn:https://svn.codehaus.org/jaxen/trunk/jaxen/</connection> + <url>http://fisheye.codehaus.org/browse/jaxen/</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-compiler-plugin</artifactId> + <version>2.5.1</version> + <configuration> + <debug>true</debug> + <optimize>true</optimize> + <showDeprecation>true</showDeprecation> + <source>1.3</source> + <target>1.2</target> + </configuration> + </plugin> + + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-ManifestVersion>2</Bundle-ManifestVersion> + <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> + <Bundle-Version>${project.version}</Bundle-Version> + <Export-Package>org.jaxen.*;version=${project.version}</Export-Package> + <Include-Resource> + org/w3c/dom/UserDataHandler.class=target/classes/org/w3c/dom/UserDataHandler.class, + META-INF/LICENSE.txt=LICENSE.txt + </Include-Resource> + <Import-Package> + org.w3c.dom;resolution:=optional, + *;resolution:=optional + </Import-Package> + <Private-Package>!org.w3c.dom</Private-Package> + </instructions> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.4</version> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + <configuration> + <descriptorRefs> + <descriptorRef>project</descriptorRef> + <descriptorRef>src</descriptorRef> + <descriptorRef>bin</descriptorRef> + </descriptorRefs> + </configuration> + </plugin> + <plugin> + <artifactId>maven-repository-plugin</artifactId> + <version>2.3.1</version> + </plugin> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.8.1</version> + <configuration> + <excludePackageNames>org.jaxen.saxpath.base,org.jaxen.saxpath.helpers</excludePackageNames> + <links> + <link>http://java.sun.com/j2se/1.4.2/docs/api/</link> + </links> + <stylesheetfile>${basedir}/src/site/resources/css/javadoc-style.css</stylesheetfile> + <docencoding>UTF-8</docencoding> + <stylesheetfile>./xdocs/stylesheets/javadoc-style.css</stylesheetfile> + <tags> + <tag> + <head>To Do:</head> + <name>todo</name> + <placement>Xa</placement> + </tag> + </tags> + <docencoding>UTF-8</docencoding> + </configuration> + </plugin> + <plugin> <artifactId>maven-surefire-plugin</artifactId> + <version>2.12</version> <configuration> <includes> <include>**/*Test.java</include> @@ -194,57 +309,133 @@ </configuration> </plugin> <plugin> - <groupId>maven-plugins</groupId> - <artifactId>maven-cobertura-plugin</artifactId> - <version>1.3</version> - <configuration /> + <groupId>org.codehaus.mojo</groupId> + <artifactId>cobertura-maven-plugin</artifactId> + <version>2.5.1</version> </plugin> <plugin> - <groupId>maven-plugins</groupId> - <artifactId>maven-findbugs-plugin</artifactId> - <version>1.3.1</version> - <configuration /> + <groupId>org.codehaus.mojo</groupId> + <artifactId>findbugs-maven-plugin</artifactId> + <version>2.4.0</version> </plugin> </plugins> </build> + <dependencies> <dependency> <groupId>dom4j</groupId> <artifactId>dom4j</artifactId> <version>1.6.1</version> + <optional>true</optional> </dependency> <dependency> <groupId>jdom</groupId> <artifactId>jdom</artifactId> <version>1.0</version> + <optional>true</optional> </dependency> <dependency> <groupId>xml-apis</groupId> <artifactId>xml-apis</artifactId> <version>1.3.02</version> + <scope>provided</scope> </dependency> <dependency> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> <version>2.6.2</version> + <scope>provided</scope> </dependency> <dependency> <groupId>xom</groupId> <artifactId>xom</artifactId> <version>1.0</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.2</version> + <scope>test</scope> </dependency> </dependencies> + + <reporting> + <plugins> + <plugin> + <artifactId>maven-changelog-plugin</artifactId> + <version>2.2</version> + <configuration> + <type>date</type> + <dates> + <date>2007-05-06</date> + </dates> + <outputEncoding>UTF-8</outputEncoding> + </configuration> + </plugin> + <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + <version>2.9.1</version> + </plugin> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.6.1</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jxr-plugin</artifactId> + <version>2.1</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-pmd-plugin</artifactId> + <version>2.4</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-report-plugin</artifactId> + <version>2.4.3</version> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>cobertura-maven-plugin</artifactId> + <version>2.5.1</version> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>findbugs-maven-plugin</artifactId> + <version>2.4.0</version> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jdepend-maven-plugin</artifactId> + <version>2.0-beta-2</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-project-info-reports-plugin</artifactId> + <version>2.4</version> + <configuration> + <dependencyDetailsEnabled>false</dependencyDetailsEnabled> + <dependencyLocationsEnabled>false</dependencyLocationsEnabled> + </configuration> + <reportSets> + <reportSet> + <reports> + <report>dependencies</report> + <report>scm</report> + </reports> + </reportSet> + </reportSets> + </plugin> + </plugins> + </reporting> + <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> + <url>scp://jaxen.codehaus.org/home/projects/jaxen/public_html</url> </site> - <status>converted</status> </distributionManagement> -</project> \ No newline at end of file +</project> ++++++ jdom-1.1-xom-get-jaxen.patch ++++++ --- /var/tmp/diff_new_pack.sib5Gc/_old 2021-05-20 19:23:21.038370912 +0200 +++ /var/tmp/diff_new_pack.sib5Gc/_new 2021-05-20 19:23:21.038370912 +0200 @@ -6,7 +6,7 @@ <target name="get-jaxen" description="Download Jaxen source code" depends="prepare"> - <unzip src="jaxen-1.1-src.zip" dest="${build.dir}" /> + <copy todir="${build.dir}/jaxen"> -+ <fileset dir="../jaxen-1.1.1/" /> ++ <fileset dir="../jaxen-1.1.6/" /> + </copy> </target>
