rpm/maven-doxia
SHA256
1
0
Fork 0
forked from pool/maven-doxia
Code Pull Requests Activity

Accepting request 1113314 from Java:packages

Browse Source 
1.12.0

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

245
0001-Fix-itext-dependency.patch
View File

@ -1,245 +0,0 @@
From 71a78088dff0081a290a860a184166bf993d04bf Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
Date: Mon, 29 Apr 2013 11:37:12 +0200
Subject: [PATCH 1/4] Fix itext dependency
---
doxia-modules/doxia-module-itext/pom.xml | 2 +-
.../apache/maven/doxia/module/itext/ITextFont.java | 16 ++---
.../apache/maven/doxia/module/itext/ITextSink.java | 6 +-
.../apache/maven/doxia/module/itext/ITextUtil.java | 69 +---------------------
.../doxia/module/itext/ITextSinkTestCase.java | 22 -------
5 files changed, 13 insertions(+), 102 deletions(-)
diff --git a/doxia-modules/doxia-module-itext/pom.xml b/doxia-modules/doxia-module-itext/pom.xml
index 94f94f3..8293f04 100644
--- a/doxia-modules/doxia-module-itext/pom.xml
+++ b/doxia-modules/doxia-module-itext/pom.xml
@@ -58,7 +58,7 @@ under the License.
<dependency>
<groupId>com.lowagie</groupId>
<artifactId>itext</artifactId>
- <version>1.4</version>
+ <version>2.1.7</version>
</dependency>
</dependencies>
diff --git a/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextFont.java b/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextFont.java
index 2cc8ef1..5dfc882 100644
--- a/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextFont.java
+++ b/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextFont.java
@@ -24,7 +24,7 @@ import java.awt.Color;
import com.lowagie.text.ExceptionConverter;
import com.lowagie.text.Font;
import com.lowagie.text.FontFactory;
-import com.lowagie.text.markup.MarkupTags;
+import com.lowagie.text.html.Markup;
import com.lowagie.text.pdf.BaseFont;
/**
@@ -38,16 +38,16 @@ import com.lowagie.text.pdf.BaseFont;
public class ITextFont
{
/** A normal font style */
- public static final String NORMAL = MarkupTags.CSS_VALUE_NORMAL;
+ public static final String NORMAL = Markup.CSS_VALUE_NORMAL;
/** A bold font style */
- public static final String BOLD = MarkupTags.CSS_VALUE_BOLD;
+ public static final String BOLD = Markup.CSS_VALUE_BOLD;
/** A italic font style */
- public static final String ITALIC = MarkupTags.CSS_VALUE_ITALIC;
+ public static final String ITALIC = Markup.CSS_VALUE_ITALIC;
/** An underline font style */
- public static final String UNDERLINE = MarkupTags.CSS_VALUE_UNDERLINE;
+ public static final String UNDERLINE = Markup.CSS_VALUE_UNDERLINE;
/** A default font name */
public static final String DEFAULT_FONT_NAME = FontFactory.HELVETICA;
@@ -262,7 +262,7 @@ public class ITextFont
{
Font font = getCurrentFont();
- return String.valueOf( font.color().getBlue() );
+ return String.valueOf( font.getColor().getBlue() );
}
/**
@@ -274,7 +274,7 @@ public class ITextFont
{
Font font = getCurrentFont();
- return String.valueOf( font.color().getGreen() );
+ return String.valueOf( font.getColor().getGreen() );
}
/**
@@ -286,7 +286,7 @@ public class ITextFont
{
Font font = getCurrentFont();
- return String.valueOf( font.color().getRed() );
+ return String.valueOf( font.getColor().getRed() );
}
/**
diff --git a/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java b/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java
index 2847413..c85f81f 100644
--- a/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java
+++ b/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java
@@ -1232,9 +1232,9 @@ public class ITextSink
try
{
Image image = Image.getInstance( new URL( urlName ) );
- image.scaleToFit( ITextUtil.getDefaultPageSize().width() / 2, ITextUtil.getDefaultPageSize().height() / 2 );
- width = image.plainWidth();
- height = image.plainHeight();
+ image.scaleToFit( ITextUtil.getDefaultPageSize().getWidth() / 2, ITextUtil.getDefaultPageSize().getHeight() / 2 );
+ width = image.getPlainWidth();
+ height = image.getPlainHeight();
}
catch ( BadElementException e )
{
diff --git a/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java b/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java
index 4363413..141646c 100644
--- a/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java
+++ b/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java
@@ -22,9 +22,6 @@ package org.apache.maven.doxia.module.itext;
import com.lowagie.text.DocumentException;
import com.lowagie.text.PageSize;
import com.lowagie.text.Rectangle;
-import com.lowagie.text.xml.XmlToHtml;
-import com.lowagie.text.xml.XmlToPdf;
-import com.lowagie.text.xml.XmlToRtf;
import java.io.InputStream;
import java.io.OutputStream;
@@ -77,7 +74,7 @@ public class ITextUtil
if ( currentField.getType().equals( Rectangle.class ) )
{
Rectangle fPageSize = (Rectangle) currentField.get( null );
- if ( ( rect.width() == fPageSize.width() ) && ( rect.height() == fPageSize.height() ) )
+ if ( ( rect.getWidth() == fPageSize.getWidth() ) && ( rect.getHeight() == fPageSize.getHeight() ) )
{
return currentField.getName();
}
@@ -114,68 +111,4 @@ public class ITextUtil
return false;
}
-
- /**
- * Parse an iText XML from the specified <CODE>InputStream</CODE>, writing an Pdf document
- * specified <CODE>OutputStream</CODE>.
- *
- * @param is the <CODE>InputStream</CODE> from which the XML is read.
- * @param os the <CODE>OutputStream</CODE> to which the result as Pdf is written.
- * @see com.lowagie.text.xml.XmlToPdf
- */
- public static void writePdf( InputStream is, OutputStream os )
- {
- try
- {
- XmlToPdf x = new XmlToPdf();
-
- x.parse( is, os );
- }
- catch ( DocumentException e )
- {
- throw new RuntimeException( "DocumentException : " + e.getMessage(), e );
- }
- }
-
- /**
- * Parse an iText XML from the specified <CODE>InputStream</CODE>, writing an rtf document
- * specified <CODE>OutputStream</CODE>.
- *
- * @param is the <CODE>InputStream</CODE> from which the XML is read.
- * @param os the <CODE>OutputStream</CODE> to which the result as RTF is written.
- * @see com.lowagie.text.xml.XmlToRtf
- */
- public static void writeRtf( InputStream is, OutputStream os )
- {
- try
- {
- XmlToRtf x = new XmlToRtf();
- x.parse( is, os );
- }
- catch ( DocumentException e )
- {
- throw new RuntimeException( "DocumentException : " + e.getMessage(), e );
- }
- }
-
- /**
- * Parse an iText XML from the specified <CODE>InputStream</CODE>, writing an html document
- * specified <CODE>OutputStream</CODE>.
- *
- * @param is the <CODE>InputStream</CODE> from which the XML is read.
- * @param os the <CODE>OutputStream</CODE> to which the result as Html is written.
- * @see com.lowagie.text.xml.XmlToHtml
- */
- public static void writeHtml( InputStream is, OutputStream os )
- {
- try
- {
- XmlToHtml x = new XmlToHtml();
- x.parse( is, os );
- }
- catch ( DocumentException e )
- {
- throw new RuntimeException( "DocumentException : " + e.getMessage(), e );
- }
- }
}
diff --git a/doxia-modules/doxia-module-itext/src/test/java/org/apache/maven/doxia/module/itext/ITextSinkTestCase.java b/doxia-modules/doxia-module-itext/src/test/java/org/apache/maven/doxia/module/itext/ITextSinkTestCase.java
index 6bcd2be..a9674a0 100644
--- a/doxia-modules/doxia-module-itext/src/test/java/org/apache/maven/doxia/module/itext/ITextSinkTestCase.java
+++ b/doxia-modules/doxia-module-itext/src/test/java/org/apache/maven/doxia/module/itext/ITextSinkTestCase.java
@@ -81,20 +81,6 @@ public class ITextSinkTestCase
}
/**
- * Test PDF generation
- *
- * @throws Exception
- */
- public void testGeneratingPDFFromITextXml()
- throws Exception
- {
- File f = new File( getBasedir(), "src/test/resources/itext/itext.xml" );
-
- ITextUtil.writePdf( new FileInputStream( f ),
- new FileOutputStream( getGeneratedFile( "test_itext", "pdf" ) ) );
- }
-
- /**
* Generate a pdf and a rtf from the standart test model.
*
* @throws Exception if any
@@ -107,11 +93,6 @@ public class ITextSinkTestCase
SinkTestDocument.generate( sink );
sink.close();
-
- ITextUtil.writePdf( new FileInputStream( getGeneratedFile( "test_model", "xml" ) ),
- new FileOutputStream( getGeneratedFile( "test_model", "pdf" ) ) );
- ITextUtil.writeRtf( new FileInputStream( getGeneratedFile( "test_model", "xml" ) ),
- new FileOutputStream( getGeneratedFile( "test_model", "rtf" ) ) );
}
/**
@@ -148,8 +129,5 @@ public class ITextSinkTestCase
sink.flush();
sink.close();
-
- ITextUtil.writePdf( new FileInputStream( getGeneratedFile( "empty_anchor", "xml" ) ),
- new FileOutputStream( getGeneratedFile( "empty_anchor", "pdf" ) ) );
}
}
--
2.5.5

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

Binary file not shown.

3
doxia-1.9.1-source-release.zip
View File

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

BIN
maven-doxia-build.tar.xz (Stored with Git LFS)
View File

Binary file not shown.

28
maven-doxia.changes
View File

@ -1,3 +1,29 @@
-------------------------------------------------------------------
Sat Sep 23 17:46:16 UTC 2023 - Fridrich Strba <fstrba@suse.com>
- Upgrade to upstream version 1.12.0
* Changes
+ DOXIA-409: Upgrade to FOP 2.2
+ DOXIA-497: Fix rendering links and paragraphs inside tables
+ DOXIA-584: Rewrite .md and .markdown links to .html
+ DOXIA-576 Upgrade HttpComponents: httpclient to 4.5.8 and
httpcore to 4.4.11
+ DOXIA-570: Escape links to xml based figureGraphics image
elements
+ SECURITY: Use HTTPS to resolve dependencies in Maven Build
+ MNGSITE-393: remove old Maven 1 and 2 info
+ DOXIA-612: update commons-lang to 3.8.1
+ DOXIA-610: Drop dependency to outdated Log4j
+ Fix Java 7 compatibility that was broken with DOXIA-616
+ DOXIA-618: import tests from maven-site-plugin
+ DOXIA-609: Fixed crosslinks starting with a dot in markdown
files
+ replace deprecated class from commons-lang
+ fill in some generic types
- Removed patch:
* 0001-Fix-itext-dependency.patch
+ no need to patch a module that we disable
------------------------------------------------------------------- -------------------------------------------------------------------
Fri May 13 09:03:45 UTC 2022 - Fridrich Strba <fstrba@suse.com> Fri May 13 09:03:45 UTC 2022 - Fridrich Strba <fstrba@suse.com>
@ -32,7 +58,7 @@ Wed Mar 11 11:37:57 UTC 2020 - Fridrich Strba <fstrba@suse.com>
* 0002-Update-to-Plexus-Container-1.5.5.patch * 0002-Update-to-Plexus-Container-1.5.5.patch
* 0003-Disable-tests-which-rely-on-ordering-in-set.patch * 0003-Disable-tests-which-rely-on-ordering-in-set.patch
* 0004-Port-to-fop-2.0.patch * 0004-Port-to-fop-2.0.patch
- Not needed in this build any more + Not needed in this build any more
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Oct 1 12:18:33 UTC 2019 - Fridrich Strba <fstrba@suse.com> Tue Oct 1 12:18:33 UTC 2019 - Fridrich Strba <fstrba@suse.com>

67
maven-doxia.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package maven-doxia # spec file for package maven-doxia
# #
# Copyright (c) 2022 SUSE LLC # Copyright (c) 2023 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -17,7 +17,7 @@
Name: maven-doxia Name: maven-doxia
Version: 1.9.1 Version: 1.12.0
Release: 0 Release: 0
Summary: Content generation framework Summary: Content generation framework
License: Apache-2.0 License: Apache-2.0
@ -25,15 +25,16 @@ Group: Development/Libraries/Java
URL: https://maven.apache.org/doxia/ URL: https://maven.apache.org/doxia/
Source0: https://repo1.maven.org/maven2/org/apache/maven/doxia/doxia/%{version}/doxia-%{version}-source-release.zip Source0: https://repo1.maven.org/maven2/org/apache/maven/doxia/doxia/%{version}/doxia-%{version}-source-release.zip
Source1: %{name}-build.tar.xz Source1: %{name}-build.tar.xz
# Build against iText 2.x
# https://issues.apache.org/jira/browse/DOXIA-53
Patch1: 0001-Fix-itext-dependency.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: apache-commons-cli BuildRequires: apache-commons-cli
BuildRequires: apache-commons-collections BuildRequires: apache-commons-collections
BuildRequires: apache-commons-configuration BuildRequires: apache-commons-configuration
BuildRequires: apache-commons-lang
BuildRequires: apache-commons-lang3 BuildRequires: apache-commons-lang3
BuildRequires: apache-commons-text
BuildRequires: atinject
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: google-guice
BuildRequires: guava BuildRequires: guava
BuildRequires: httpcomponents-client BuildRequires: httpcomponents-client
BuildRequires: httpcomponents-core BuildRequires: httpcomponents-core
@ -46,10 +47,11 @@ BuildRequires: pegdown
BuildRequires: plexus-classworlds BuildRequires: plexus-classworlds
BuildRequires: plexus-cli BuildRequires: plexus-cli
BuildRequires: plexus-containers-component-annotations BuildRequires: plexus-containers-component-annotations
BuildRequires: plexus-containers-container-default
BuildRequires: plexus-metadata-generator BuildRequires: plexus-metadata-generator
BuildRequires: plexus-utils BuildRequires: plexus-utils
BuildRequires: qdox BuildRequires: qdox
BuildRequires: sisu-inject
BuildRequires: sisu-plexus
BuildRequires: unzip BuildRequires: unzip
BuildRequires: xbean BuildRequires: xbean
BuildRequires: xmlgraphics-commons BuildRequires: xmlgraphics-commons
@ -57,7 +59,6 @@ BuildRequires: xmlgraphics-fop
BuildRequires: xmlunit BuildRequires: xmlunit
BuildRequires: xmvn-install BuildRequires: xmvn-install
BuildRequires: xmvn-resolve BuildRequires: xmvn-resolve
# Runtime dependency of doxia-module-fo
BuildRequires: mvn(log4j:log4j) BuildRequires: mvn(log4j:log4j)
BuildRequires: mvn(org.apache.maven:maven-parent:pom:) BuildRequires: mvn(org.apache.maven:maven-parent:pom:)
BuildArch: noarch BuildArch: noarch
@ -184,7 +185,6 @@ API documentation for %{name}.
%prep %prep
%setup -q -n doxia-%{version} -a1 %setup -q -n doxia-%{version} -a1
%patch1 -p1
# we don't have clirr-maven-plugin # we don't have clirr-maven-plugin
%pom_remove_plugin org.codehaus.mojo:clirr-maven-plugin pom.xml %pom_remove_plugin org.codehaus.mojo:clirr-maven-plugin pom.xml
@ -192,11 +192,6 @@ API documentation for %{name}.
# complains # complains
%pom_remove_plugin :apache-rat-plugin %pom_remove_plugin :apache-rat-plugin
# use java 5 generics in modello plugin
%pom_xpath_inject "pom:plugin[pom:artifactId[text()='modello-maven-plugin']]"\
"/pom:executions/pom:execution/pom:configuration" \
"<useJava5>true</useJava5>" doxia-modules/doxia-module-fml/pom.xml
# requires network # requires network
rm doxia-core/src/test/java/org/apache/maven/doxia/util/XmlValidatorTest.java rm doxia-core/src/test/java/org/apache/maven/doxia/util/XmlValidatorTest.java
@ -210,27 +205,31 @@ rm doxia-core/src/test/java/org/apache/maven/doxia/util/XmlValidatorTest.java
%build %build
mkdir -p lib mkdir -p lib
build-jar-repository -s lib \ build-jar-repository -s lib \
apache-commons-lang3 \ atinject \
apache-commons-lang \ apache-commons-lang3 \
commons-cli \ apache-commons-text \
commons-configuration \ commons-cli \
guava/guava \ commons-configuration \
httpcomponents/httpclient \ commons-lang \
httpcomponents/httpcore \ guava/guava \
jdom2/jdom2 \ guice/google-guice \
objectweb-asm/asm \ httpcomponents/httpclient \
parboiled/core \ httpcomponents/httpcore \
pegdown \ jdom2/jdom2 \
plexus-classworlds \ objectweb-asm/asm \
plexus/cli \ org.eclipse.sisu.inject \
plexus-containers/plexus-component-annotations \ org.eclipse.sisu.plexus \
plexus-containers/plexus-container-default \ parboiled/core \
plexus-metadata-generator \ pegdown \
plexus/utils \ plexus-classworlds \
qdox \ plexus/cli \
xbean/xbean-reflect \ plexus-containers/plexus-component-annotations \
xmlgraphics-commons \ plexus-metadata-generator \
xmlgraphics-fop plexus/utils \
qdox \
xbean/xbean-reflect \
xmlgraphics-commons \
xmlgraphics-fop
%{ant} -Dtest.skip=true \ %{ant} -Dtest.skip=true \
package javadoc package javadoc