Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package maven-doxia-sitetools for
openSUSE:Factory checked in at 2023-09-25 20:02:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/maven-doxia-sitetools (Old)
and /work/SRC/openSUSE:Factory/.maven-doxia-sitetools.new.1770 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maven-doxia-sitetools"
Mon Sep 25 20:02:40 2023 rev:6 rq:1113245 version:1.11.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/maven-doxia-sitetools/maven-doxia-sitetools.changes
2022-05-13 23:03:34.347145230 +0200
+++
/work/SRC/openSUSE:Factory/.maven-doxia-sitetools.new.1770/maven-doxia-sitetools.changes
2023-09-25 20:51:36.439070159 +0200
@@ -1,0 +2,30 @@
+Sat Sep 23 18:10:46 UTC 2023 - Fridrich Strba <[email protected]>
+
+- Upgrade to upstream version 1.11.1
+ * Bug
+ + DOXIASITETOOLS-221: CLIRR can't find previous version
+ * Improvement
+ + DOXIASITETOOLS-228: Remove all   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
+
+-------------------------------------------------------------------
Old:
----
0001-Port-to-plexus-utils-3.0.24.patch
doxia-sitetools-1.9.2-source-release.zip
New:
----
doxia-sitetools-1.11.1-source-release.zip
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ maven-doxia-sitetools.spec ++++++
--- /var/tmp/diff_new_pack.enp2IK/_old 2023-09-25 20:51:37.611112499 +0200
+++ /var/tmp/diff_new_pack.enp2IK/_new 2023-09-25 20:51:37.611112499 +0200
@@ -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 @@
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 @@
%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 @@
%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 @@
%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 @@
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 \
++++++ 0002-Remove-dependency-on-velocity-tools.patch ++++++
--- /var/tmp/diff_new_pack.enp2IK/_old 2023-09-25 20:51:37.631113222 +0200
+++ /var/tmp/diff_new_pack.enp2IK/_new 2023-09-25 20:51:37.635113366 +0200
@@ -11,82 +11,82 @@
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
++++++ doxia-sitetools-1.9.2-source-release.zip ->
doxia-sitetools-1.11.1-source-release.zip ++++++
++++ 57665 lines of diff (skipped)
++++++ maven-doxia-sitetools-build.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/common.xml new/common.xml
--- old/common.xml 2022-03-22 13:59:27.665962973 +0100
+++ new/common.xml 2023-09-23 14:58:47.074316961 +0200
@@ -3,12 +3,12 @@
<project name="common" basedir=".">
<property file="build.properties"/>
- <property name="project.version" value="1.9.2"/>
+ <property name="project.version" value="1.11.1"/>
<property name="project.groupId" value="org.apache.maven.doxia"/>
<property name="project.organization.name" value="The Apache Software
Foundation"/>
- <property name="spec.version" value="1.9"/>
+ <property name="spec.version" value="1.11"/>
<property name="compiler.source" value="1.8"/>
<property name="compiler.target" value="${compiler.source}"/>
