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

Accepting request 1113245 from Java:packages

Browse Source 
1.11.1

OBS-URL: https://build.opensuse.org/request/show/1113245
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/maven-doxia-sitetools?expand=0&rev=6
This commit is contained in:
Ana Guerrero 2023-09-25 18:02:40 +00:00 committed by Git OBS Bridge
commit b7c4722bda
7 changed files with 156 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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

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

@ -11,7 +11,7 @@ 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;
@@ -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;
@ -44,7 +44,7 @@ index c31688d..58058b3 100644
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
@@ -495,41 +475,7 @@ public class DefaultSiteRenderer
*/
protected Context createToolManagedVelocityContext( SiteRenderingContext siteRenderingContext )
{

BIN
doxia-sitetools-1.11.1-source-release.zip (Stored with Git LFS) Normal file
View File

Binary file not shown.

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

@ -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)
View File

Binary file not shown.

30
maven-doxia-sitetools.changes
View File

@ -1,3 +1,33 @@
-------------------------------------------------------------------
Sat Sep 23 18:10:46 UTC 2023 - Fridrich Strba <fstrba@suse.com>
- Upgrade to upstream version 1.11.1
* Bug
+ DOXIASITETOOLS-221: CLIRR can't find previous version
* Improvement
+ DOXIASITETOOLS-228: Remove all &#xA0; 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 <fstrba@suse.com>

38
maven-doxia-sitetools.spec
View File

@ -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" \
"<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
@ -121,11 +116,13 @@ rm -rf $(find -type d -name itext)
%build
mkdir -p lib
build-jar-repository -s lib \
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 \
@ -134,17 +131,16 @@ build-jar-repository -s lib \
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-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-containers/plexus-container-default \
plexus-i18n/plexus-i18n \
plexus/interpolation \
plexus-metadata-generator \