pool/maven-doxia-sitetools
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-doxia-sitetools?expand=0&rev=3

Browse Source
This commit is contained in:
Fridrich Strba 2020-03-10 12:39:17 +00:00 committed by Git OBS Bridge
parent 5e6bcb3dfc
commit 85e67601b9
6 changed files with 104 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
0001-Port-to-plexus-utils-3.0.24.patch
View File

@ -12,22 +12,22 @@ 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." );
// 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

148
0002-Remove-dependency-on-velocity-tools.patch
View File

@ -12,81 +12,81 @@ 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;
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();
}
/**
*/
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

3
doxia-sitetools-1.7.5-source-release.zip
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a5108049a3b18d9106c3b203070195b6211d871a443466debe88e68474629862
size 533944

3
doxia-sitetools-1.9.2-source-release.zip Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f8e40dc08a95d4af9d65fd3e481f548ff1e106efb36fc97bd1f10d048ad47c1c
size 547948

4
maven-doxia-sitetools-build.tar.xz
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:78a55a2617440be1b4f52923dc2f74bc4c1ff4a0b71206f98927f1304285bc31
size 3444
oid sha256:ca18e722d595a0006d6e23d2fa6b5d56668d307086d011232c900d060e40882f
size 3464

15
maven-doxia-sitetools.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package maven
# spec file for package maven-doxia-sitetools
#
# 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
@ -19,13 +19,13 @@
%global parent maven-doxia
%global subproj sitetools
Name: %{parent}-%{subproj}
Version: 1.7.5
Version: 1.9.2
Release: 0
Summary: Doxia 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-sitetools/%{version}/doxia-%{subproj}-%{version}-source-release.zip
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
@ -68,8 +68,8 @@ BuildRequires: xmvn-resolve
BuildRequires: xz
BuildRequires: mvn(org.apache.maven.doxia:doxia-module-apt)
BuildRequires: mvn(org.apache.maven.doxia:doxia-module-fml)
BuildRequires: mvn(org.apache.maven.doxia:doxia-module-markdown)
BuildRequires: mvn(org.apache.maven.doxia:doxia-module-xdoc)
BuildRequires: mvn(org.apache.maven.doxia:doxia-module-xhtml5)
BuildRequires: mvn(org.apache.maven:maven-parent:pom:)
BuildArch: noarch
@ -113,6 +113,8 @@ API documentation for %{name}.
rm -rf $(find -type d -name itext)
%pom_remove_dep -r :doxia-module-itext
%pom_remove_dep -r :doxia-module-markdown
%{mvn_alias} :doxia-integration-tools org.apache.maven.shared:maven-doxia-tools
%build
@ -128,6 +130,7 @@ build-jar-repository -s lib \
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 \