#4 update to version 1.9.2
Merged 4 years ago by decathorpe. Opened 4 years ago by decathorpe.
Unknown source master  into  master

file modified
+5 -1
@@ -1,4 +1,7 @@

- maven-doxia-sitetools-1.0-alpha10-src.tar.gz

+ /results_*

+ /*.src.rpm

+ 

+ /maven-doxia-sitetools-1.0-alpha10-src.tar.gz

  /maven-doxia-sitetools-1.1.3.tar.gz

  /doxia-sitetools-1.2-source-release.zip

  /doxia-sitetools-1.3-source-release.zip
@@ -10,3 +13,4 @@

  /doxia-sitetools-1.7.4-source-release.zip

  /doxia-sitetools-1.7.5-source-release.zip

  /doxia-sitetools-1.9.1-source-release.zip

+ /doxia-sitetools-1.9.2-source-release.zip

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

  

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

  

file modified
+8 -3
@@ -4,14 +4,14 @@

  %global subproj sitetools

  

  Name:           %{parent}-%{subproj}

- Version:        1.9.1

- Release:        3%{?dist}

+ Version:        1.9.2

+ Release:        1%{?dist}

  Summary:        Doxia content generation framework

  License:        ASL 2.0

  URL:            http://maven.apache.org/doxia/

  BuildArch:      noarch

  

- Source0:        http://repo2.maven.org/maven2/org/apache/maven/doxia/doxia-sitetools/%{version}/doxia-%{subproj}-%{version}-source-release.zip

+ Source0:        https://repo1.maven.org/maven2/org/apache/maven/doxia/doxia-sitetools/%{version}/doxia-%{subproj}-%{version}-source-release.zip

  

  Patch0:         0001-Port-to-plexus-utils-3.0.24.patch

  Patch1:         0002-Remove-dependency-on-velocity-tools.patch
@@ -118,6 +118,11 @@

  %doc LICENSE NOTICE

  

  %changelog

+ * Mon Mar 02 2020 Fabio Valentini <decathorpe@gmail.com> - 1.9.2-1

+ - Update to version 1.9.2.

+ - Convert patches to unix line endings (following upstream sources).

+ - Switch to HTTPS URL for sources.

+ 

  * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.1-3

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

  

file modified
+1 -1
@@ -1,1 +1,1 @@

- SHA512 (doxia-sitetools-1.9.1-source-release.zip) = 1cb855fde7e313603b9c7574c6f8db66c17ec190325519c0d0cb23a7566ba7eb41bdc5009e4c8a2ce9c069ae1b8781bfdde675d5dfa61097f9db2a6d58a95b46

+ SHA512 (doxia-sitetools-1.9.2-source-release.zip) = 23ad72b6e7f1830aa70c5844a06a64960412ed1c6ef22bb377d735323605469c100c44c370f4bf883647bc4411b1a033386dfe6771596ecde2c3f4a1b328b2a3

  • update to latest version (1.9.1 → 1.9.2)
  • switch to HTTPS URL for source downloads
  • convert patches to unix line endings (following upstream change)

Test rebuilds of dependent packages are running in COPR:
https://copr.fedorainfracloud.org/coprs/decathorpe/maven-doxia-sitetools-1.9.2-pr/

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1806195

Test rebuilds were successful, no new build failures occurred on top of what's already broken in rawhide.

straightforward rebase. Noisy diff due to change in unix line endings. LGTM :thumbsup:

Pull-Request has been merged by decathorpe

4 years ago

Build is blocked by OpenJDK 8 crashes.