Hello community, here is the log from the commit of package maven-doxia for openSUSE:Factory checked in at 2020-03-11 18:54:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/maven-doxia (Old) and /work/SRC/openSUSE:Factory/.maven-doxia.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maven-doxia" Wed Mar 11 18:54:13 2020 rev:3 rq:783792 version:1.9.1 Changes: -------- --- /work/SRC/openSUSE:Factory/maven-doxia/maven-doxia.changes 2019-10-04 11:22:30.868930570 +0200 +++ /work/SRC/openSUSE:Factory/.maven-doxia.new.3160/maven-doxia.changes 2020-03-11 18:55:55.195690269 +0100 @@ -1,0 +2,10 @@ +Wed Mar 11 11:37:57 UTC 2020 - Fridrich Strba <fst...@suse.com> + +- Update to upstream version 1.9.1 +- Removed patches: + * 0002-Update-to-Plexus-Container-1.5.5.patch + * 0003-Disable-tests-which-rely-on-ordering-in-set.patch + * 0004-Port-to-fop-2.0.patch + - Not needed in this build any more + +------------------------------------------------------------------- Old: ---- 0002-Update-to-Plexus-Container-1.5.5.patch 0003-Disable-tests-which-rely-on-ordering-in-set.patch 0004-Port-to-fop-2.0.patch doxia-1.7-source-release.zip New: ---- doxia-1.9.1-source-release.zip ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ maven-doxia.spec ++++++ --- /var/tmp/diff_new_pack.FxWVTM/_old 2020-03-11 18:55:55.671690482 +0100 +++ /var/tmp/diff_new_pack.FxWVTM/_new 2020-03-11 18:55:55.675690483 +0100 @@ -1,7 +1,7 @@ # # spec file for package maven-doxia # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,28 +17,22 @@ Name: maven-doxia -Version: 1.7 +Version: 1.9.1 Release: 0 Summary: Content generation framework License: Apache-2.0 Group: Development/Libraries/Java -URL: http://maven.apache.org/doxia/ -Source0: http://repo2.maven.org/maven2/org/apache/maven/doxia/doxia/%{version}/doxia-%{version}-source-release.zip +URL: https://maven.apache.org/doxia/ +Source0: https://repo1.maven.org/maven2/org/apache/maven/doxia/doxia/%{version}/doxia-%{version}-source-release.zip Source1: %{name}-build.tar.xz # Build against iText 2.x # https://issues.apache.org/jira/browse/DOXIA-53 Patch1: 0001-Fix-itext-dependency.patch -# Accepted upstream: DOXIA-504, https://issues.apache.org/jira/browse/DOXIA-504 -Patch2: 0002-Update-to-Plexus-Container-1.5.5.patch -# Don't run bad tests which rely on ordering in set (they fail with Java 8) -Patch3: 0003-Disable-tests-which-rely-on-ordering-in-set.patch -# Not upstreamable due to higher Java version of fop's dependencies -Patch4: 0004-Port-to-fop-2.0.patch BuildRequires: ant BuildRequires: apache-commons-cli BuildRequires: apache-commons-collections BuildRequires: apache-commons-configuration -BuildRequires: apache-commons-lang +BuildRequires: apache-commons-lang3 BuildRequires: fdupes BuildRequires: guava20 BuildRequires: httpcomponents-client @@ -122,11 +116,11 @@ %description module-fo This package provides %{summary}. -%package module-markdown -Summary: Markdown module for %{name} +%package module-xhtml5 +Summary: XHTML5 module for %{name} Group: Development/Libraries/Java -%description module-markdown +%description module-xhtml5 This package provides %{summary}. %package module-latex @@ -188,9 +182,6 @@ %prep %setup -q -n doxia-%{version} -a1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 # we don't have clirr-maven-plugin %pom_remove_plugin org.codehaus.mojo:clirr-maven-plugin pom.xml @@ -206,9 +197,6 @@ # requires network rm doxia-core/src/test/java/org/apache/maven/doxia/util/XmlValidatorTest.java -# FIXME fails -rm doxia-modules/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownParserTest.java - %pom_disable_module doxia-module-itext doxia-modules %{mvn_package} :doxia __noinstall @@ -218,6 +206,7 @@ %build mkdir -p lib build-jar-repository -s lib \ + apache-commons-lang3 \ apache-commons-lang \ commons-cli \ commons-configuration \ @@ -239,24 +228,24 @@ xmlgraphics-commons \ xmlgraphics-fop -%ant -Dtest.skip=true \ +%{ant} -Dtest.skip=true \ package javadoc mkdir -p target/site/apidocs -%mvn_artifact pom.xml +%{mvn_artifact} pom.xml for i in \ doxia-logging-api \ doxia-sink-api \ doxia-test-docs \ doxia-core; do - %mvn_artifact ${i}/pom.xml ${i}/target/${i}-%{version}.jar + %{mvn_artifact} ${i}/pom.xml ${i}/target/${i}-%{version}.jar if [ -d ${i}/target/site/apidocs ]; then cp -r ${i}/target/site/apidocs target/site/apidocs/${i} fi done -%mvn_artifact doxia-modules/pom.xml +%{mvn_artifact} doxia-modules/pom.xml for i in \ doxia-module-apt \ doxia-module-confluence \ @@ -268,8 +257,8 @@ doxia-module-twiki \ doxia-module-xdoc \ doxia-module-xhtml \ - doxia-module-markdown; do - %mvn_artifact doxia-modules/${i}/pom.xml doxia-modules/${i}/target/${i}-%{version}.jar + doxia-module-xhtml5; do + %{mvn_artifact} doxia-modules/${i}/pom.xml doxia-modules/${i}/target/${i}-%{version}.jar if [ -d doxia-modules/${i}/target/site/apidocs ]; then cp -r doxia-modules/${i}/target/site/apidocs target/site/apidocs/${i} fi @@ -295,7 +284,7 @@ %files module-fo -f .mfiles-doxia-module-fo -%files module-markdown -f .mfiles-doxia-module-markdown +%files module-xhtml5 -f .mfiles-doxia-module-xhtml5 %files module-latex -f .mfiles-doxia-module-latex ++++++ maven-doxia-build.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/common.xml new/common.xml --- old/common.xml 2019-03-28 13:49:45.700501621 +0100 +++ new/common.xml 2020-03-10 11:37:31.625313674 +0100 @@ -3,14 +3,14 @@ <project name="common" basedir="."> <property file="build.properties"/> - <property name="project.version" value="1.7"/> + <property name="project.version" value="1.9.1"/> <property name="project.groupId" value="org.apache.maven.doxia"/> <property name="project.organization.name" value="The Apache Software Foundation"/> - <property name="spec.version" value="1.7"/> + <property name="spec.version" value="1.9"/> - <property name="compiler.source" value="1.6"/> + <property name="compiler.source" value="1.7"/> <property name="compiler.target" value="${compiler.source}"/> </project> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doxia-modules/build.xml new/doxia-modules/build.xml --- old/doxia-modules/build.xml 2019-03-28 15:59:58.433873714 +0100 +++ new/doxia-modules/build.xml 2020-03-10 11:26:55.030232034 +0100 @@ -17,7 +17,7 @@ <ant antfile="build.xml" dir="doxia-module-twiki" target="clean"/> <ant antfile="build.xml" dir="doxia-module-xdoc" target="clean"/> <ant antfile="build.xml" dir="doxia-module-xhtml" target="clean"/> - <ant antfile="build.xml" dir="doxia-module-markdown" target="clean"/> + <ant antfile="build.xml" dir="doxia-module-xhtml5" target="clean"/> </target> <!-- ====================================================================== --> @@ -35,7 +35,7 @@ <ant antfile="build.xml" dir="doxia-module-twiki" target="compile"/> <ant antfile="build.xml" dir="doxia-module-xdoc" target="compile"/> <ant antfile="build.xml" dir="doxia-module-xhtml" target="compile"/> - <ant antfile="build.xml" dir="doxia-module-markdown" target="compile"/> + <ant antfile="build.xml" dir="doxia-module-xhtml5" target="compile"/> </target> <!-- ====================================================================== --> @@ -53,7 +53,7 @@ <ant antfile="build.xml" dir="doxia-module-twiki" target="compile-tests"/> <ant antfile="build.xml" dir="doxia-module-xdoc" target="compile-tests"/> <ant antfile="build.xml" dir="doxia-module-xhtml" target="compile-tests"/> - <ant antfile="build.xml" dir="doxia-module-markdown" target="compile-tests"/> + <ant antfile="build.xml" dir="doxia-module-xhtml5" target="compile-tests"/> </target> <!-- ====================================================================== --> @@ -71,7 +71,7 @@ <ant antfile="build.xml" dir="doxia-module-twiki" target="test"/> <ant antfile="build.xml" dir="doxia-module-xdoc" target="test"/> <ant antfile="build.xml" dir="doxia-module-xhtml" target="test"/> - <ant antfile="build.xml" dir="doxia-module-markdown" target="test"/> + <ant antfile="build.xml" dir="doxia-module-xhtml5" target="test"/> </target> <!-- ====================================================================== --> @@ -89,7 +89,7 @@ <ant antfile="build.xml" dir="doxia-module-twiki" target="javadoc"/> <ant antfile="build.xml" dir="doxia-module-xdoc" target="javadoc"/> <ant antfile="build.xml" dir="doxia-module-xhtml" target="javadoc"/> - <ant antfile="build.xml" dir="doxia-module-markdown" target="javadoc"/> + <ant antfile="build.xml" dir="doxia-module-xhtml5" target="javadoc"/> </target> <!-- ====================================================================== --> @@ -107,7 +107,7 @@ <ant antfile="build.xml" dir="doxia-module-twiki" target="package"/> <ant antfile="build.xml" dir="doxia-module-xdoc" target="package"/> <ant antfile="build.xml" dir="doxia-module-xhtml" target="package"/> - <ant antfile="build.xml" dir="doxia-module-markdown" target="package"/> + <ant antfile="build.xml" dir="doxia-module-xhtml5" target="package"/> </target> </project> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doxia-modules/doxia-module-apt/build.xml new/doxia-modules/doxia-module-apt/build.xml --- old/doxia-modules/doxia-module-apt/build.xml 2019-03-28 15:59:58.437873733 +0100 +++ new/doxia-modules/doxia-module-apt/build.xml 2020-03-10 11:39:14.105809782 +0100 @@ -74,9 +74,6 @@ </src> <classpath refid="build.classpath"/> </javac> - <copy todir="${build.outputDir}"> - <fileset dir="${build.resourceDir}"/> - </copy> </target> <!-- ====================================================================== --> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doxia-modules/doxia-module-xhtml5/build.xml new/doxia-modules/doxia-module-xhtml5/build.xml --- old/doxia-modules/doxia-module-xhtml5/build.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/doxia-modules/doxia-module-xhtml5/build.xml 2020-03-10 11:25:07.181709972 +0100 @@ -0,0 +1,262 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="doxia-module-xhtml5" default="package" basedir="."> + + <!-- ====================================================================== --> + <!-- Build environment properties --> + <!-- ====================================================================== --> + + <include file="../../common.xml"/> + <property file="build.properties"/> + + <property name="project.artifactId" value="doxia-module-xhtml5"/> + <property name="project.name" value="Doxia :: XHTML5 Module"/> + + <property name="build.finalName" value="${project.artifactId}-${project.version}"/> + <property name="build.dir" value="target"/> + <property name="build.outputDir" value="${build.dir}/classes"/> + <property name="build.srcDir" value="src/main/java"/> + <property name="build.resourceDir" value="src/main/resources"/> + <property name="build.testOutputDir" value="${build.dir}/test-classes"/> + <property name="build.testDir" value="src/test/java"/> + <property name="build.testResourceDir" value="src/test/resources"/> + <property name="test.reports" value="${build.dir}/test-reports"/> + <property name="reporting.outputDirectory" value="${build.dir}/site"/> + + <!-- ====================================================================== --> + <!-- Defining classpaths --> + <!-- ====================================================================== --> + + <path id="build.classpath"> + <pathelement location="../../doxia-core/target/classes"/> + <pathelement location="../../doxia-logging-api/target/classes"/> + <pathelement location="../../doxia-sink-api/target/classes"/> + <fileset dir="../../lib"> + <include name="**/*.jar"/> + </fileset> + </path> + <path id="build.test.classpath"> + <pathelement location="../../doxia-core/target/classes"/> + <pathelement location="../../doxia-logging-api/target/classes"/> + <pathelement location="../../doxia-sink-api/target/classes"/> + <pathelement location="../../doxia-core/target/test-classes"/> + <fileset dir="../../lib"> + <include name="**/*.jar"/> + </fileset> + </path> + + <!-- ====================================================================== --> + <!-- Cleaning up target --> + <!-- ====================================================================== --> + + <target name="clean" description="Clean the output directory"> + <delete dir="${build.dir}"/> + </target> + + <!-- ====================================================================== --> + <!-- Compilation target --> + <!-- ====================================================================== --> + + <target name="compile" description="Compile the code"> + <mkdir dir="${build.outputDir}"/> + <javac destdir="${build.outputDir}" + nowarn="false" + debug="true" + encoding="UTF-8" + optimize="false" + deprecation="true" + target="${compiler.target}" + verbose="false" + fork="false" + source="${compiler.source}"> + <src> + <pathelement location="${build.srcDir}"/> + </src> + <classpath refid="build.classpath"/> + </javac> + </target> + + <!-- ====================================================================== --> + <!-- Target to generate Plexus component.xml --> + <!-- ====================================================================== --> + + <target name="plexus" + depends="compile" + description="Generate Plexus component.xml"> + <mkdir dir="${build.outputDir}/META-INF/plexus"/> + <java classname="org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli" + failonerror="true" + fork="true"> + <classpath> + <path refid="build.classpath"/> + <pathelement location="${build.outputDir}"/> + </classpath> + <arg value="-X"/> + <arg value="-s"/> + <arg value="${build.srcDir}"/> + <arg value="-c"/> + <arg value="${build.outputDir}"/> + <arg value="-m"/> + <arg value="${build.outputDir}/META-INF/plexus"/> + <arg value="-o"/> + <arg value="${build.outputDir}/META-INF/plexus/components.xml"/> + </java> + </target> + + <!-- ====================================================================== --> + <!-- Test-compilation target --> + <!-- ====================================================================== --> + + <target name="compile-tests" + depends="plexus" + description="Compile the test code" + unless="test.skip"> + <mkdir dir="${build.testOutputDir}"/> + <javac destdir="${build.testOutputDir}" + nowarn="false" + debug="true" + encoding="UTF-8" + optimize="false" + deprecation="true" + target="${compiler.target}" + verbose="false" + fork="false" + source="${compiler.source}"> + <src> + <pathelement location="${build.testDir}"/> + </src> + <classpath> + <path refid="build.test.classpath"/> + <pathelement location="${build.outputDir}"/> + </classpath> + </javac> + <copy todir="${build.testOutputDir}"> + <fileset dir="${build.testResourceDir}"/> + </copy> + </target> + + <!-- ====================================================================== --> + <!-- Run all tests --> + <!-- ====================================================================== --> + + <target name="test" + depends="compile-tests, junit-missing" + unless="junit.skipped" + description="Run the test cases"> + <mkdir dir="${test.reports}"/> + <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir="."> + <sysproperty key="basedir" value="."/> + <formatter type="xml"/> + <formatter type="plain" usefile="false"/> + <classpath> + <path refid="build.test.classpath"/> + <pathelement location="${build.outputDir}"/> + <pathelement location="${build.testOutputDir}"/> + </classpath> + <batchtest todir="${test.reports}" unless="test"> + <fileset dir="${build.testDir}"> + <include name="**/Test*.java"/> + <include name="**/*Test.java"/> + <include name="**/*TestCase.java"/> + <exclude name="**/*Abstract*Test.java"/> + </fileset> + </batchtest> + <batchtest todir="${test.reports}" if="test"> + <fileset dir="${build.testDir}"> + <include name="**/${test}.java"/> + <exclude name="**/*Abstract*Test.java"/> + </fileset> + </batchtest> + </junit> + </target> + + <target name="test-junit-present"> + <available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/> + </target> + + <target name="test-junit-status" + depends="test-junit-present"> + <condition property="junit.missing"> + <and> + <isfalse value="${junit.present}"/> + <isfalse value="${test.skip}"/> + </and> + </condition> + <condition property="junit.skipped"> + <or> + <isfalse value="${junit.present}"/> + <istrue value="${test.skip}"/> + </or> + </condition> + </target> + + <target name="junit-missing" + depends="test-junit-status" + if="junit.missing"> + <echo>=================================== WARNING ===================================</echo> + <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo> + <echo>===============================================================================</echo> + </target> + + <!-- ====================================================================== --> + <!-- Javadoc target --> + <!-- ====================================================================== --> + + <target name="javadoc" description="Generates the Javadoc of the application"> + <javadoc sourcepath="${build.srcDir}" + packagenames="*" + destdir="${reporting.outputDirectory}/apidocs" + access="protected" + source="${compiler.source}" + verbose="false" + version="true" + use="true" + author="true" + splitindex="false" + nodeprecated="false" + nodeprecatedlist="false" + notree="false" + noindex="false" + nohelp="false" + nonavbar="false" + serialwarn="false" + encoding="UTF-8" + linksource="false" + breakiterator="false"> + <classpath refid="build.classpath"/> + </javadoc> + </target> + + <!-- ====================================================================== --> + <!-- Package target --> + <!-- ====================================================================== --> + + <target name="package" depends="plexus,test" description="Package the application"> + <jar jarfile="${build.dir}/${build.finalName}.jar" + compress="true" + index="false" + basedir="${build.outputDir}" + excludes="**/package.html"> + <manifest> + <attribute name="Implementation-Title" value="${project.name}"/> + <attribute name="Implementation-URL" value="http://maven.apache.org/doxia/doxia/doxia-modules/${project.artifactId}/"/> + <attribute name="Implementation-Vendor" value="${project.organization.name}"/> + <attribute name="Implementation-Vendor-Id" value="${project.groupId}"/> + <attribute name="Implementation-Version" value="${project.version}"/> + <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> + <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> + <attribute name="JavaPackages-Version" value="${project.version}"/> + <attribute name="Specification-Title" value="${project.name}"/> + <attribute name="Specification-Vendor" value="${project.organization.name}"/> + <attribute name="Specification-Version" value="${project.version}"/> + </manifest> + </jar> + </target> + + <!-- ====================================================================== --> + <!-- A dummy target for the package named after the type it creates --> + <!-- ====================================================================== --> + + <target name="jar" depends="package" description="Builds the jar for the application"/> + +</project>
