OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-doxia-sitetools?expand=0&rev=14
This commit is contained in:
Fridrich Strba
Git OBS Bridge
parent
8eb7ae5792
commit
b3ec59ea95
@ -1,33 +0,0 @@
|
||||
From 2f2adbedfff4d846e039d06ef932c867a8616523 Mon Sep 17 00:00:00 2001
|
||||
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
||||
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
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
BIN
doxia-sitetools-1.11.1-source-release.zip
(Stored with Git LFS)
Normal file
BIN
doxia-sitetools-1.11.1-source-release.zip
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f8e40dc08a95d4af9d65fd3e481f548ff1e106efb36fc97bd1f10d048ad47c1c
|
||||
size 547948
|
||||
BIN
maven-doxia-sitetools-build.tar.xz
(Stored with Git LFS)
BIN
maven-doxia-sitetools-build.tar.xz
(Stored with Git LFS)
Binary file not shown.
@ -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,7 +27,6 @@ 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
|
||||
@ -90,12 +89,10 @@ API documentation for %{name}.
|
||||
|
||||
%prep
|
||||
%setup -q -n doxia-%{subproj}-%{version} -a1
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
# 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 +101,6 @@ API documentation for %{name}.
|
||||
%pom_xpath_inject "pom:plugin[pom:artifactId[text()='modello-maven-plugin']]/pom:configuration" \
|
||||
"<useJava5>true</useJava5>" 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
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user