Hello community,
here is the log from the commit of package maven-doxia-sitetools for
openSUSE:Factory checked in at 2020-03-11 18:54:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/maven-doxia-sitetools (Old)
and /work/SRC/openSUSE:Factory/.maven-doxia-sitetools.new.3160 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maven-doxia-sitetools"
Wed Mar 11 18:54:16 2020 rev:2 rq:783793 version:1.9.2
Changes:
--------
---
/work/SRC/openSUSE:Factory/maven-doxia-sitetools/maven-doxia-sitetools.changes
2019-04-05 12:04:07.750601577 +0200
+++
/work/SRC/openSUSE:Factory/.maven-doxia-sitetools.new.3160/maven-doxia-sitetools.changes
2020-03-11 18:55:55.931690598 +0100
@@ -1,0 +2,9 @@
+Wed Mar 11 11:41:31 UTC 2020 - Fridrich Strba <fst...@suse.com>
+
+- Upgrade to upstream version 1.9.2
+- Modified patches:
+ * 0001-Port-to-plexus-utils-3.0.24.patch
+ * 0002-Remove-dependency-on-velocity-tools.patch
+ + fix incorrect line end
+
+-------------------------------------------------------------------
Old:
----
doxia-sitetools-1.7.5-source-release.zip
New:
----
doxia-sitetools-1.9.2-source-release.zip
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ maven-doxia-sitetools.spec ++++++
--- /var/tmp/diff_new_pack.itM0Tf/_old 2020-03-11 18:55:56.431690821 +0100
+++ /var/tmp/diff_new_pack.itM0Tf/_new 2020-03-11 18:55:56.435690823 +0100
@@ -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: 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 @@
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 @@
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 \
++++++ 0001-Port-to-plexus-utils-3.0.24.patch ++++++
--- /var/tmp/diff_new_pack.itM0Tf/_old 2020-03-11 18:55:56.447690828 +0100
+++ /var/tmp/diff_new_pack.itM0Tf/_new 2020-03-11 18:55:56.447690828 +0100
@@ -12,22 +12,22 @@
---
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
++++++ 0002-Remove-dependency-on-velocity-tools.patch ++++++
--- /var/tmp/diff_new_pack.itM0Tf/_old 2020-03-11 18:55:56.451690830 +0100
+++ /var/tmp/diff_new_pack.itM0Tf/_new 2020-03-11 18:55:56.451690830 +0100
@@ -12,81 +12,81 @@
---
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
++++++ 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 2019-03-28 18:16:50.021835787 +0100
+++ new/common.xml 2020-03-10 13:30:23.986319156 +0100
@@ -3,12 +3,12 @@
<project name="common" basedir=".">
<property file="build.properties"/>
- <property name="project.version" value="1.7.5"/>
+ <property name="project.version" value="1.9.2"/>
<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.7"/>
+ <property name="spec.version" value="1.9"/>
<property name="compiler.source" value="1.6"/>
<property name="compiler.target" value="${compiler.source}"/>
