This commit is contained in:
commit
c11406ade1
23
.gitattributes
vendored
Normal file
23
.gitattributes
vendored
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
## Default LFS
|
||||||
|
*.7z filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.bsp filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.bz2 filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.gem filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.gz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.jar filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.lz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.lzma filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.obscpio filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.oxt filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.pdf filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.png filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.rpm filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.tbz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.tbz2 filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.tgz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.ttf filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.txz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.whl filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.xz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.zst filter=lfs diff=lfs merge=lfs -text
|
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
.osc
|
33
0001-Port-to-plexus-utils-3.0.24.patch
Normal file
33
0001-Port-to-plexus-utils-3.0.24.patch
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
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
|
||||||
|
|
92
0002-Remove-dependency-on-velocity-tools.patch
Normal file
92
0002-Remove-dependency-on-velocity-tools.patch
Normal file
@ -0,0 +1,92 @@
|
|||||||
|
From da397953bd73068c4ab8d219ec91e312fd3d5d55 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Michael Simacek <msimacek@redhat.com>
|
||||||
|
Date: Mon, 6 Feb 2017 14:27:53 +0100
|
||||||
|
Subject: [PATCH 2/2] Remove dependency on velocity-tools
|
||||||
|
|
||||||
|
---
|
||||||
|
.../doxia/siterenderer/DefaultSiteRenderer.java | 58 +---------------------
|
||||||
|
1 file changed, 2 insertions(+), 56 deletions(-)
|
||||||
|
|
||||||
|
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 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();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
--
|
||||||
|
2.9.3
|
||||||
|
|
3
doxia-sitetools-1.7.5-source-release.zip
Normal file
3
doxia-sitetools-1.7.5-source-release.zip
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:a5108049a3b18d9106c3b203070195b6211d871a443466debe88e68474629862
|
||||||
|
size 533944
|
3
maven-doxia-sitetools-build.tar.xz
Normal file
3
maven-doxia-sitetools-build.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:78a55a2617440be1b4f52923dc2f74bc4c1ff4a0b71206f98927f1304285bc31
|
||||||
|
size 3444
|
5
maven-doxia-sitetools.changes
Normal file
5
maven-doxia-sitetools.changes
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Mar 28 20:37:01 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
- Initial packaging of maven-doxia-sitetools 1.7.5
|
||||||
|
- Generate and customize ant build files
|
177
maven-doxia-sitetools.spec
Normal file
177
maven-doxia-sitetools.spec
Normal file
@ -0,0 +1,177 @@
|
|||||||
|
#
|
||||||
|
# spec file for package maven
|
||||||
|
#
|
||||||
|
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||||
|
#
|
||||||
|
# All modifications and additions to the file contributed by third parties
|
||||||
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
|
# upon. The license for this file, and modifications and additions to the
|
||||||
|
# file, is the same license as for the pristine package itself (unless the
|
||||||
|
# license for the pristine package is not an Open Source License, in which
|
||||||
|
# case the license is the MIT License). An "Open Source License" is a
|
||||||
|
# license that conforms to the Open Source Definition (Version 1.9)
|
||||||
|
# published by the Open Source Initiative.
|
||||||
|
|
||||||
|
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||||
|
#
|
||||||
|
|
||||||
|
|
||||||
|
%global parent maven-doxia
|
||||||
|
%global subproj sitetools
|
||||||
|
Name: %{parent}-%{subproj}
|
||||||
|
Version: 1.7.5
|
||||||
|
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
|
||||||
|
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: fdupes
|
||||||
|
BuildRequires: guava20
|
||||||
|
BuildRequires: javapackages-local
|
||||||
|
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
|
||||||
|
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: unzip
|
||||||
|
BuildRequires: velocity
|
||||||
|
BuildRequires: xbean
|
||||||
|
BuildRequires: xmvn-install
|
||||||
|
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:maven-parent:pom:)
|
||||||
|
BuildArch: noarch
|
||||||
|
|
||||||
|
%description
|
||||||
|
Doxia is a content generation framework which aims to provide its
|
||||||
|
users with powerful techniques for generating static and dynamic
|
||||||
|
content. Doxia can be used to generate static sites in addition to
|
||||||
|
being incorporated into dynamic content generation systems like blogs,
|
||||||
|
wikis and content management systems.
|
||||||
|
|
||||||
|
%package javadoc
|
||||||
|
Summary: Javadoc for %{name}
|
||||||
|
Group: Development/Libraries/Java
|
||||||
|
|
||||||
|
%description javadoc
|
||||||
|
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
|
||||||
|
%pom_remove_dep -r :velocity-tools
|
||||||
|
|
||||||
|
%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
|
||||||
|
|
||||||
|
%{mvn_alias} :doxia-integration-tools org.apache.maven.shared:maven-doxia-tools
|
||||||
|
|
||||||
|
%build
|
||||||
|
mkdir -p lib
|
||||||
|
build-jar-repository -s lib \
|
||||||
|
apache-commons-collections \
|
||||||
|
apache-commons-lang3 \
|
||||||
|
commons-cli \
|
||||||
|
commons-io \
|
||||||
|
guava20/guava-20.0 \
|
||||||
|
jdom2/jdom2 \
|
||||||
|
maven-doxia/doxia-core \
|
||||||
|
maven-doxia/doxia-logging-api \
|
||||||
|
maven-doxia/doxia-module-fo \
|
||||||
|
maven-doxia/doxia-module-xhtml \
|
||||||
|
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
|
||||||
|
# tests can't run because of missing deps
|
||||||
|
%{ant} -Dtest.skip=true package javadoc
|
||||||
|
|
||||||
|
mkdir -p target/site/apidocs
|
||||||
|
for i in \
|
||||||
|
doxia-decoration-model \
|
||||||
|
doxia-skin-model \
|
||||||
|
doxia-integration-tools \
|
||||||
|
doxia-site-renderer \
|
||||||
|
doxia-doc-renderer; do
|
||||||
|
%{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
|
||||||
|
|
||||||
|
%install
|
||||||
|
%mvn_install
|
||||||
|
%fdupes -s %{buildroot}%{_javadocdir}
|
||||||
|
|
||||||
|
%files -f .mfiles
|
||||||
|
%dir %{_javadir}/%{name}
|
||||||
|
|
||||||
|
%files javadoc -f .mfiles-javadoc
|
||||||
|
|
||||||
|
%changelog
|
Loading…
Reference in New Issue
Block a user