diff --git a/0001-Port-to-plexus-utils-3.0.24.patch b/0001-Port-to-plexus-utils-3.0.24.patch deleted file mode 100644 index b723cc4..0000000 --- a/0001-Port-to-plexus-utils-3.0.24.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 2f2adbedfff4d846e039d06ef932c867a8616523 Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Thu, 12 May 2016 08:28:17 +0200 -Subject: [PATCH 1/2] Port to plexus-utils 3.0.24 - ---- - .../apache/maven/doxia/siterenderer/DefaultSiteRenderer.java | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java -index 9bc3ef2..c31688d 100644 ---- a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java -+++ b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java -@@ -559,7 +559,15 @@ public class DefaultSiteRenderer - // doxiaSiteRendererVersion - InputStream inputStream = this.getClass().getResourceAsStream( "/META-INF/" - + "maven/org.apache.maven.doxia/doxia-site-renderer/pom.properties" ); -- Properties properties = PropertyUtils.loadProperties( inputStream ); -+ Properties properties; -+ try -+ { -+ properties = PropertyUtils.loadProperties( inputStream ); -+ } -+ catch ( IOException exc ) -+ { -+ properties = null; -+ } - if ( inputStream == null ) - { - getLogger().debug( "pom.properties for doxia-site-renderer could not be found." ); --- -2.9.3 - diff --git a/0002-Remove-dependency-on-velocity-tools.patch b/0002-Remove-dependency-on-velocity-tools.patch index e62e88c..356a4e9 100644 --- a/0002-Remove-dependency-on-velocity-tools.patch +++ b/0002-Remove-dependency-on-velocity-tools.patch @@ -11,82 +11,82 @@ diff --git a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterender index c31688d..58058b3 100644 --- a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java +++ b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java -@@ -76,31 +76,11 @@ import org.apache.maven.doxia.parser.module.ParserModuleNotFoundException; - import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink; - import org.apache.maven.doxia.util.XmlValidator; - import org.apache.velocity.Template; -+import org.apache.velocity.VelocityContext; - import org.apache.velocity.context.Context; - import org.apache.velocity.exception.ParseErrorException; - import org.apache.velocity.exception.ResourceNotFoundException; - import org.apache.velocity.exception.VelocityException; --import org.apache.velocity.tools.Scope; --import org.apache.velocity.tools.ToolManager; --import org.apache.velocity.tools.config.ConfigurationUtils; --import org.apache.velocity.tools.config.EasyFactoryConfiguration; --import org.apache.velocity.tools.config.FactoryConfiguration; --import org.apache.velocity.tools.generic.AlternatorTool; --import org.apache.velocity.tools.generic.ClassTool; --import org.apache.velocity.tools.generic.ComparisonDateTool; --import org.apache.velocity.tools.generic.ContextTool; --import org.apache.velocity.tools.generic.ConversionTool; --import org.apache.velocity.tools.generic.DisplayTool; --import org.apache.velocity.tools.generic.EscapeTool; --import org.apache.velocity.tools.generic.FieldTool; --import org.apache.velocity.tools.generic.LinkTool; --import org.apache.velocity.tools.generic.LoopTool; --import org.apache.velocity.tools.generic.MathTool; --import org.apache.velocity.tools.generic.NumberTool; --import org.apache.velocity.tools.generic.RenderTool; --import org.apache.velocity.tools.generic.ResourceTool; --import org.apache.velocity.tools.generic.SortTool; --import org.apache.velocity.tools.generic.XmlTool; - import org.codehaus.plexus.PlexusContainer; - import org.codehaus.plexus.component.annotations.Component; - import org.codehaus.plexus.component.annotations.Requirement; -@@ -481,41 +461,7 @@ public class DefaultSiteRenderer - */ - protected Context createToolManagedVelocityContext( SiteRenderingContext siteRenderingContext ) - { -- Locale locale = siteRenderingContext.getLocale(); -- String dateFormat = siteRenderingContext.getDecoration().getPublishDate().getFormat(); -- -- EasyFactoryConfiguration config = new EasyFactoryConfiguration( false ); -- config.property( "safeMode", Boolean.FALSE ); -- config.toolbox( Scope.REQUEST ) -- .tool( ContextTool.class ) -- .tool( LinkTool.class ) -- .tool( LoopTool.class ) -- .tool( RenderTool.class ); -- config.toolbox( Scope.APPLICATION ).property( "locale", locale ) -- .tool( AlternatorTool.class ) -- .tool( ClassTool.class ) -- .tool( ComparisonDateTool.class ).property( "format", dateFormat ) -- .tool( ConversionTool.class ).property( "dateFormat", dateFormat ) -- .tool( DisplayTool.class ) -- .tool( EscapeTool.class ) -- .tool( FieldTool.class ) -- .tool( MathTool.class ) -- .tool( NumberTool.class ) -- .tool( ResourceTool.class ).property( "bundles", new String[] { "site-renderer" } ) -- .tool( SortTool.class ) -- .tool( XmlTool.class ); -- -- FactoryConfiguration customConfig = ConfigurationUtils.findInClasspath( TOOLS_LOCATION ); -- -- if ( customConfig != null ) -- { -- config.addConfiguration( customConfig ); -- } -- -- ToolManager manager = new ToolManager( false, false ); -- manager.configure( config ); -- -- return manager.createContext(); -+ return new VelocityContext(); - } - - /** +@@ -76,31 +76,11 @@ import org.apache.maven.doxia.parser.mod + import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink; + import org.apache.maven.doxia.util.XmlValidator; + import org.apache.velocity.Template; ++import org.apache.velocity.VelocityContext; + import org.apache.velocity.context.Context; + import org.apache.velocity.exception.ParseErrorException; + import org.apache.velocity.exception.ResourceNotFoundException; + import org.apache.velocity.exception.VelocityException; +-import org.apache.velocity.tools.Scope; +-import org.apache.velocity.tools.ToolManager; +-import org.apache.velocity.tools.config.ConfigurationUtils; +-import org.apache.velocity.tools.config.EasyFactoryConfiguration; +-import org.apache.velocity.tools.config.FactoryConfiguration; +-import org.apache.velocity.tools.generic.AlternatorTool; +-import org.apache.velocity.tools.generic.ClassTool; +-import org.apache.velocity.tools.generic.ComparisonDateTool; +-import org.apache.velocity.tools.generic.ContextTool; +-import org.apache.velocity.tools.generic.ConversionTool; +-import org.apache.velocity.tools.generic.DisplayTool; +-import org.apache.velocity.tools.generic.EscapeTool; +-import org.apache.velocity.tools.generic.FieldTool; +-import org.apache.velocity.tools.generic.LinkTool; +-import org.apache.velocity.tools.generic.LoopTool; +-import org.apache.velocity.tools.generic.MathTool; +-import org.apache.velocity.tools.generic.NumberTool; +-import org.apache.velocity.tools.generic.RenderTool; +-import org.apache.velocity.tools.generic.ResourceTool; +-import org.apache.velocity.tools.generic.SortTool; +-import org.apache.velocity.tools.generic.XmlTool; + import org.codehaus.plexus.PlexusContainer; + import org.codehaus.plexus.component.annotations.Component; + import org.codehaus.plexus.component.annotations.Requirement; +@@ -495,41 +475,7 @@ public class DefaultSiteRenderer + */ + protected Context createToolManagedVelocityContext( SiteRenderingContext siteRenderingContext ) + { +- Locale locale = siteRenderingContext.getLocale(); +- String dateFormat = siteRenderingContext.getDecoration().getPublishDate().getFormat(); +- +- EasyFactoryConfiguration config = new EasyFactoryConfiguration( false ); +- config.property( "safeMode", Boolean.FALSE ); +- config.toolbox( Scope.REQUEST ) +- .tool( ContextTool.class ) +- .tool( LinkTool.class ) +- .tool( LoopTool.class ) +- .tool( RenderTool.class ); +- config.toolbox( Scope.APPLICATION ).property( "locale", locale ) +- .tool( AlternatorTool.class ) +- .tool( ClassTool.class ) +- .tool( ComparisonDateTool.class ).property( "format", dateFormat ) +- .tool( ConversionTool.class ).property( "dateFormat", dateFormat ) +- .tool( DisplayTool.class ) +- .tool( EscapeTool.class ) +- .tool( FieldTool.class ) +- .tool( MathTool.class ) +- .tool( NumberTool.class ) +- .tool( ResourceTool.class ).property( "bundles", new String[] { "site-renderer" } ) +- .tool( SortTool.class ) +- .tool( XmlTool.class ); +- +- FactoryConfiguration customConfig = ConfigurationUtils.findInClasspath( TOOLS_LOCATION ); +- +- if ( customConfig != null ) +- { +- config.addConfiguration( customConfig ); +- } +- +- ToolManager manager = new ToolManager( false, false ); +- manager.configure( config ); +- +- return manager.createContext(); ++ return new VelocityContext(); + } + + /** -- 2.9.3 diff --git a/doxia-sitetools-1.11.1-source-release.zip b/doxia-sitetools-1.11.1-source-release.zip new file mode 100644 index 0000000..5ac8327 --- /dev/null +++ b/doxia-sitetools-1.11.1-source-release.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b5d1e30d32129af3d026a1347efb2005824c44cf1674716a21692f4a7698057a +size 555803 diff --git a/doxia-sitetools-1.9.2-source-release.zip b/doxia-sitetools-1.9.2-source-release.zip deleted file mode 100644 index 95e3608..0000000 --- a/doxia-sitetools-1.9.2-source-release.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f8e40dc08a95d4af9d65fd3e481f548ff1e106efb36fc97bd1f10d048ad47c1c -size 547948 diff --git a/maven-doxia-sitetools-build.tar.xz b/maven-doxia-sitetools-build.tar.xz index bdee8d7..a7f5b8c 100644 --- a/maven-doxia-sitetools-build.tar.xz +++ b/maven-doxia-sitetools-build.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e4dbd4eb2130d5dba1d1f297b6b1b814e1f129e18d940376d3da2b16e9848378 -size 3488 +oid sha256:0ad19cb2a7b7ef07794675477bbe0ee1a8977595ce7dc82233dac766e096f080 +size 3484 diff --git a/maven-doxia-sitetools.changes b/maven-doxia-sitetools.changes index 4bedfa1..4b415a6 100644 --- a/maven-doxia-sitetools.changes +++ b/maven-doxia-sitetools.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Sat Sep 23 18:10:46 UTC 2023 - Fridrich Strba + +- Upgrade to upstream version 1.11.1 + * Bug + + DOXIASITETOOLS-221: CLIRR can't find previous version + * Improvement + + DOXIASITETOOLS-228: Remove all   in + default-site-macros.vm and replace by a space + + DOXIASITETOOLS-234: improve documentation on site.xml + inheritance vs interpolation + * Task + + DOXIASITETOOLS-236: Deprecate Doxia Sitetools Doc Renderer + * Dependency upgrade + + DOXIASITETOOLS-219: fix javadoc issues with JDK 8 when + generating documentation + + DOXIASITETOOLS-223: wrong coordinates for jai_core: hyphen + should be underscore + + DOXIASITETOOLS-226: Use latest JUnit version 4.13.2 + + DOXIASITETOOLS-231: Upgrade Plexus Utils to 3.3.0 + + DOXIASITETOOLS-232: Upgrade Plexus Interpolation to 1.26 + + DOXIASITETOOLS-233: Upgrade Maven Doxia to 1.10 + + DOXIASITETOOLS-237: Upgrade Maven Doxia to 1.11.1 +- Modified patch: + * 0002-Remove-dependency-on-velocity-tools.patch + + rediff to changes context +- Removed patch: + * 0001-Port-to-plexus-utils-3.0.24.patch + + not needed with this version + ------------------------------------------------------------------- Fri May 13 09:12:53 UTC 2022 - Fridrich Strba diff --git a/maven-doxia-sitetools.spec b/maven-doxia-sitetools.spec index f585ffd..0c73ae1 100644 --- a/maven-doxia-sitetools.spec +++ b/maven-doxia-sitetools.spec @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %global parent maven-doxia %global subproj sitetools Name: %{parent}-%{subproj} -Version: 1.9.2 +Version: 1.11.1 Release: 0 Summary: Doxia content generation framework License: Apache-2.0 @@ -27,40 +27,39 @@ Group: Development/Libraries/Java URL: https://maven.apache.org/doxia/ Source0: https://repo1.maven.org/maven2/org/apache/maven/doxia/doxia-sitetools/%{version}/doxia-%{subproj}-%{version}-source-release.zip Source1: %{name}-build.tar.xz -Patch0: 0001-Port-to-plexus-utils-3.0.24.patch Patch1: 0002-Remove-dependency-on-velocity-tools.patch BuildRequires: ant BuildRequires: apache-commons-cli BuildRequires: apache-commons-collections BuildRequires: apache-commons-io BuildRequires: apache-commons-lang3 +BuildRequires: atinject BuildRequires: fdupes +BuildRequires: google-guice BuildRequires: guava BuildRequires: java-devel >= 1.8 -BuildRequires: javapackages-local +BuildRequires: javapackages-local >= 6 BuildRequires: jdom2 -BuildRequires: maven-artifact -BuildRequires: maven-artifact-manager BuildRequires: maven-doxia-core BuildRequires: maven-doxia-logging-api BuildRequires: maven-doxia-module-fo BuildRequires: maven-doxia-module-xhtml BuildRequires: maven-doxia-sink-api BuildRequires: maven-lib -BuildRequires: maven-project BuildRequires: maven-reporting-api BuildRequires: modello >= 2.0.0 BuildRequires: objectweb-asm BuildRequires: plexus-classworlds BuildRequires: plexus-cli BuildRequires: plexus-containers-component-annotations -BuildRequires: plexus-containers-container-default BuildRequires: plexus-i18n BuildRequires: plexus-interpolation BuildRequires: plexus-metadata-generator BuildRequires: plexus-utils BuildRequires: plexus-velocity BuildRequires: qdox +BuildRequires: sisu-inject +BuildRequires: sisu-plexus BuildRequires: unzip BuildRequires: velocity BuildRequires: xbean @@ -90,12 +89,15 @@ API documentation for %{name}. %prep %setup -q -n doxia-%{subproj}-%{version} -a1 -%patch0 -p1 %patch1 -p1 +# migrate to maven 3 +%pom_xpath_set //pom:mavenVersion 3.8.6 doxia-integration-tools +%pom_change_dep :maven-artifact-manager :maven-core doxia-integration-tools +%pom_change_dep :maven-project :maven-compat doxia-integration-tools + # complains %pom_remove_plugin :apache-rat-plugin -%pom_remove_plugin :maven-enforcer-plugin %pom_remove_plugin org.codehaus.mojo:clirr-maven-plugin %pom_remove_dep net.sourceforge.htmlunit:htmlunit doxia-site-renderer/pom.xml @@ -104,13 +106,6 @@ API documentation for %{name}. %pom_xpath_inject "pom:plugin[pom:artifactId[text()='modello-maven-plugin']]/pom:configuration" \ "true" doxia-decoration-model -# There are two backends for generating PDFs: one based on iText and -# one using FOP. iText module is broken and only brings additional -# dependencies. Besides that upstream admits that iText support will -# likely removed in future versions of Doxia. -# -# See also: http://maven.apache.org/doxia/faq.html#How_to_export_in_PDF -# http://lists.fedoraproject.org/pipermail/java-devel/2013-April/004742.html rm -rf $(find -type d -name itext) %pom_remove_dep -r :doxia-module-itext @@ -121,38 +116,39 @@ rm -rf $(find -type d -name itext) %build mkdir -p lib build-jar-repository -s lib \ - apache-commons-collections \ - apache-commons-lang3 \ - commons-cli \ - commons-io \ - guava/guava \ - jdom2/jdom2 \ - maven-doxia/doxia-core \ - maven-doxia/doxia-logging-api \ - maven-doxia/doxia-module-fo \ - maven-doxia/doxia-module-xhtml \ - maven-doxia/doxia-module-xhtml5 \ - maven-doxia/doxia-sink-api \ - maven/maven-artifact \ - maven/maven-artifact-2.0.2 \ - maven/maven-artifact-manager \ - maven/maven-model \ - maven/maven-plugin-api \ - maven/maven-project \ - maven-reporting-api/maven-reporting-api \ - objectweb-asm/asm \ - plexus-classworlds \ - plexus/cli \ - plexus-containers/plexus-component-annotations \ - plexus-containers/plexus-container-default \ - plexus-i18n/plexus-i18n \ - plexus/interpolation \ - plexus-metadata-generator \ - plexus/utils \ - plexus-velocity/plexus-velocity \ - qdox \ - velocity \ - xbean/xbean-reflect + atinject \ + apache-commons-collections \ + apache-commons-lang3 \ + commons-cli \ + commons-io \ + guava/guava \ + guice/google-guice \ + jdom2/jdom2 \ + maven-doxia/doxia-core \ + maven-doxia/doxia-logging-api \ + maven-doxia/doxia-module-fo \ + maven-doxia/doxia-module-xhtml \ + maven-doxia/doxia-module-xhtml5 \ + maven-doxia/doxia-sink-api \ + maven/maven-artifact \ + maven/maven-core \ + maven/maven-plugin-api \ + maven/maven-project \ + maven-reporting-api/maven-reporting-api \ + objectweb-asm/asm \ + org.eclipse.sisu.inject \ + org.eclipse.sisu.plexus \ + plexus-classworlds \ + plexus/cli \ + plexus-containers/plexus-component-annotations \ + plexus-i18n/plexus-i18n \ + plexus/interpolation \ + plexus-metadata-generator \ + plexus/utils \ + plexus-velocity/plexus-velocity \ + qdox \ + velocity \ + xbean/xbean-reflect # tests can't run because of missing deps %{ant} -Dtest.skip=true package javadoc