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 2024-10-16 23:47:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/maven-doxia-sitetools (Old) and /work/SRC/openSUSE:Factory/.maven-doxia-sitetools.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "maven-doxia-sitetools" Wed Oct 16 23:47:06 2024 rev:11 rq:1208220 version:2.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/maven-doxia-sitetools/maven-doxia-sitetools.changes 2024-09-30 15:40:36.637545288 +0200 +++ /work/SRC/openSUSE:Factory/.maven-doxia-sitetools.new.19354/maven-doxia-sitetools.changes 2024-10-16 23:48:35.037564524 +0200 @@ -1,0 +2,115 @@ +Mon Oct 7 07:37:13 UTC 2024 - Fridrich Strba <fstrba@suse.com> + +- Upgrade to upstream version 2.0.0 + * Bug + + DOXIASITETOOLS-251: Plexus to Sisu migration misses Singleton + annotation + + DOXIASITETOOLS-263: Don't inject a default decoration model + when inheritance is at play + + DOXIASITETOOLS-266: Don't create anchors behind the user's + back + + DOXIASITETOOLS-299: Site descriptor interpolation does not + properly escape reserved XML chars + + DOXIASITETOOLS-305: Removal of 0-byte site descriptors from + the local repo does not put remote repos into consideration + * New Feature + + DOXIASITETOOLS-238: Pass input file name as reference to + parser + + DOXIASITETOOLS-291: Add timezone field to site descriptor + PublishDate object and pass onto Velocity tools context + + DOXIASITETOOLS-324: Allow configuration of parser per markup + * Improvement + + DOXIASITETOOLS-253: Clarify "border", "width" and "height" for + Banner and LinkItem + + DOXIASITETOOLS-257: Require a skin if a site descriptor + (site.xml) has been provided + + DOXIASITETOOLS-268: Don't open version resource file on every + call to render + + DOXIASITETOOLS-271: Overhaul locale support (make Locale#ROOT + instead of Locale#ENGLISH default and use full locale) + + DOXIASITETOOLS-278: Remove menu items link in the sidebar to + submodule that do not generate any site in the same build + + DOXIASITETOOLS-293: Remove menu items link in the sidebar to + submodule that are not present in the same build (reactor) + + DOXIASITETOOLS-294: Replace legacy artifact resolution with + Maven Resolver + + DOXIASITETOOLS-300: Don't populate Velocity context with XML + entities + + DOXIASITETOOLS-301: Automatically remove the 0-byte site + descriptors from the local repo + + DOXIASITETOOLS-302: Harmonize path separator in + DocumentRenderingContext + + DOXIASITETOOLS-332: Create anchors for indexable entries + automatically + + DOXIASITETOOLS-334: Pass project relative source path to + Parser.parse(...) as reference argument + + DOXIASITETOOLS-336: Make SiteRenderingContext#siteDirectories + editable aware + + DOXIASITETOOLS-340: Rearrange title order in Velocity context + + DOXIASITETOOLS-344: Improve performance of case-sensitive file + key checking + + DOXIASITETOOLS-348: Extend site descriptor to enforce a parent + + DOXIASITETOOLS-349: Remove plexus-component-metadata plugin + * Wish + + DOXIASITETOOLS-174: rename site.xml root tag from "project" to + "site" + * Task + + DOXIASITETOOLS-156: Fail if deprecated ${reports}, + ${parentProject} or ${modules} is found + + DOXIASITETOOLS-167: Replace deprecated Maven 2 + MavenProjectBuilder with Maven 3 ProjectBuilder + + DOXIASITETOOLS-239: Remove Doxia Sitetools Doc Renderer + + DOXIASITETOOLS-241: Replace Plexus Container Default with Sisu + Plexus Shim + + DOXIASITETOOLS-242: Remove all deprecated code + + DOXIASITETOOLS-244: Clean up exceptions and log messages + + DOXIASITETOOLS-245: Upgrade to Java 8 + + DOXIASITETOOLS-247: Replace Plexus Annotations with Java + Inject along with JUnit 5 + + DOXIASITETOOLS-254: Clarify inconsistencies in Doxia site + model + + DOXIASITETOOLS-258: Don't inject bannerLeft is none is set + + DOXIASITETOOLS-259: Deprecate Google-related site descriptor + properties + + DOXIASITETOOLS-264: Remove usage of default skin during + testing + + DOXIASITETOOLS-265: Drop MiscVerifier + + DOXIASITETOOLS-270: Remove internal (pseudo) skin and use + Maven Fluido Skin by default + + DOXIASITETOOLS-272: Remove support for Maven 1.x style site + directory layout + + DOXIASITETOOLS-281: Deprecate SiteTool#getParentProject() in + favor of MavenProject#getParent() + + DOXIASITETOOLS-282: Deprecate support for Maven 1.x style site + directory layout + + DOXIASITETOOLS-285: Deprecate + SiteRenderingContext#defaultWindowTitle in favor of + SiteRenderingContext#defaultTitle + + DOXIASITETOOLS-287: Remove Google-related site descriptor + properties + + DOXIASITETOOLS-289: Remove SiteTool#getParentProject() + + DOXIASITETOOLS-290: Remove + SiteRenderingContext#defaultWindowTitle + + DOXIASITETOOLS-295: Rename o.a.m.doxia.siterenderer.Renderer + to o.a.m.doxia.siterenderer.SiteRenderer + + DOXIASITETOOLS-296: Rename + o.a.m.doxia.siterenderer.RenderingContext to + o.a.m.doxia.siterenderer.DocumentRenderingContext + + DOXIASITETOOLS-298: Rename doxia-decoration-model to + doxia-site-model + + DOXIASITETOOLS-303: Implement workaround for + MNG-7758/MRESOLVER-335 + + DOXIASITETOOLS-306: Clean up and simplify thrown exceptions + + DOXIASITETOOLS-309: Add resource bundle property "External + Links" to site-renderer.properties + + DOXIASITETOOLS-310: Add resource bundle property "Edit" to + site-renderer.properties + + DOXIASITETOOLS-311: Rework and simplify the site model + + DOXIASITETOOLS-319: Improve DocumentRenderer + interface/DocumentRenderingContext class API +- Modified patch: + * 0002-Remove-dependency-on-velocity-tools.patch -> + 0001-Remove-dependency-on-velocity-tools.patch + + rediff + +------------------------------------------------------------------- Old: ---- 0002-Remove-dependency-on-velocity-tools.patch doxia-sitetools-1.11.1-source-release.zip New: ---- 0001-Remove-dependency-on-velocity-tools.patch _service maven-doxia-sitetools-2.0.0.tar.xz BETA DEBUG BEGIN: Old:- Modified patch: * 0002-Remove-dependency-on-velocity-tools.patch -> 0001-Remove-dependency-on-velocity-tools.patch BETA DEBUG END: BETA DEBUG BEGIN: New: * 0002-Remove-dependency-on-velocity-tools.patch -> 0001-Remove-dependency-on-velocity-tools.patch + rediff BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ maven-doxia-sitetools.spec ++++++ --- /var/tmp/diff_new_pack.9L32iR/_old 2024-10-16 23:48:36.557627918 +0200 +++ /var/tmp/diff_new_pack.9L32iR/_new 2024-10-16 23:48:36.561628085 +0200 @@ -16,51 +16,40 @@ # -%global parent maven-doxia -%global subproj sitetools -Name: %{parent}-%{subproj} -Version: 1.11.1 +Name: maven-doxia-sitetools +Version: 2.0.0 Release: 0 Summary: Doxia content generation framework License: Apache-2.0 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 +Source0: %{name}-%{version}.tar.xz Source1: %{name}-build.tar.xz -Patch1: 0002-Remove-dependency-on-velocity-tools.patch +Patch1: 0001-Remove-dependency-on-velocity-tools.patch BuildRequires: ant -BuildRequires: apache-commons-collections BuildRequires: apache-commons-io BuildRequires: apache-commons-lang3 +BuildRequires: atinject BuildRequires: fdupes BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local >= 6 BuildRequires: maven-doxia-core -BuildRequires: maven-doxia-logging-api -BuildRequires: maven-doxia-module-fo -BuildRequires: maven-doxia-module-xhtml +BuildRequires: maven-doxia-module-xhtml5 BuildRequires: maven-doxia-sink-api BuildRequires: maven-lib BuildRequires: maven-reporting-api -BuildRequires: modello >= 2.0.0 -BuildRequires: plexus-containers-component-annotations +BuildRequires: maven-resolver-api +BuildRequires: modello BuildRequires: plexus-i18n BuildRequires: plexus-interpolation BuildRequires: plexus-metadata-generator BuildRequires: plexus-utils BuildRequires: plexus-velocity BuildRequires: plexus-xml +BuildRequires: sisu-inject BuildRequires: sisu-plexus -BuildRequires: unzip -BuildRequires: velocity -BuildRequires: xmvn-install -BuildRequires: xmvn-resolve -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-xdoc) -BuildRequires: mvn(org.apache.maven.doxia:doxia-module-xhtml5) -BuildRequires: mvn(org.apache.maven:maven-parent:pom:) +BuildRequires: slf4j +BuildRequires: velocity-engine-core BuildArch: noarch %description @@ -78,78 +67,57 @@ API documentation for %{name}. %prep -%setup -q -n doxia-%{subproj}-%{version} -a1 +%setup -q -a1 %patch -P 1 -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 org.codehaus.mojo:clirr-maven-plugin -%pom_remove_dep net.sourceforge.htmlunit:htmlunit doxia-site-renderer/pom.xml -%pom_remove_dep -r :velocity-tools - -rm -rf $(find -type d -name itext) -%pom_remove_dep -r :doxia-module-itext - -%pom_remove_dep -r :doxia-module-markdown - -for i in doxia-decoration-model doxia-doc-renderer doxia-integration-tools doxia-site-renderer; do - %pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 ${i} -done - -%{mvn_alias} :doxia-integration-tools org.apache.maven.shared:maven-doxia-tools +%pom_remove_dep -r :velocity-tools-generic %build mkdir -p lib build-jar-repository -s lib \ - apache-commons-collections \ apache-commons-lang3 \ + atinject \ commons-io \ maven-doxia/doxia-core \ - 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-core \ - maven/maven-plugin-api \ - maven/maven-project \ + maven/maven-model \ maven-reporting-api/maven-reporting-api \ + maven-resolver/maven-resolver-api \ + org.eclipse.sisu.inject \ org.eclipse.sisu.plexus \ - plexus-containers/plexus-component-annotations \ plexus-i18n/plexus-i18n \ plexus/interpolation \ plexus/utils \ - plexus/xml \ plexus-velocity/plexus-velocity \ - velocity -# tests can't run because of missing deps -%{ant} -Dtest.skip=true package javadoc + plexus/xml \ + slf4j/api \ + velocity-engine/velocity-engine-core + +ant package javadoc -mkdir -p target/site/apidocs +%install +install -dm 0755 %{buildroot}%{_javadir}/%{name} +install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} +install -dm 0755 %{buildroot}%{_javadocdir}/%{name} for i in \ - doxia-decoration-model \ + doxia-site-model \ doxia-skin-model \ - doxia-integration-tools \ - doxia-site-renderer; do - %{mvn_artifact} ${i}/pom.xml ${i}/target/${i}-%{version}.jar + doxia-site-renderer \ + doxia-integration-tools; do + install -pm 0644 ${i}/target/${i}-%{version}.jar %{buildroot}%{_javadir}/%{name}/${i}.jar + %{mvn_install_pom} ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom + %add_maven_depmap %{name}/${i}.pom %{name}/${i}.jar -f ${i} if [ -d ${i}/target/site/apidocs ]; then - cp -r ${i}/target/site/apidocs target/site/apidocs/${i} + cp -r ${i}/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/${i} fi done - -%install -%mvn_install %fdupes -s %{buildroot}%{_javadocdir} -%files -f .mfiles -%dir %{_javadir}/%{name} +%files -f .mfiles-doxia-integration-tools -f .mfiles-doxia-site-model -f .mfiles-doxia-site-renderer -f .mfiles-doxia-skin-model -%files javadoc -f .mfiles-javadoc +%files javadoc +%{_javadocdir}/%{name} ++++++ 0002-Remove-dependency-on-velocity-tools.patch -> 0001-Remove-dependency-on-velocity-tools.patch ++++++ --- /work/SRC/openSUSE:Factory/maven-doxia-sitetools/0002-Remove-dependency-on-velocity-tools.patch 2023-09-25 20:51:36.375067846 +0200 +++ /work/SRC/openSUSE:Factory/.maven-doxia-sitetools.new.19354/0001-Remove-dependency-on-velocity-tools.patch 2024-10-16 23:48:31.513417549 +0200 @@ -1,92 +1,99 @@ -From da397953bd73068c4ab8d219ec91e312fd3d5d55 Mon Sep 17 00:00:00 2001 +From 7b2073aa38961c5069508c40274b1b644ccb195d Mon Sep 17 00:00:00 2001 From: Michael Simacek <msimacek@redhat.com> Date: Mon, 6 Feb 2017 14:27:53 +0100 -Subject: [PATCH 2/2] Remove dependency on velocity-tools +Subject: [PATCH] Remove dependency on velocity-tools --- - .../doxia/siterenderer/DefaultSiteRenderer.java | 58 +--------------------- - 1 file changed, 2 insertions(+), 56 deletions(-) + .../siterenderer/DefaultSiteRenderer.java | 65 +------------------ + 2 files changed, 2 insertions(+), 68 deletions(-) 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 c31688d..58058b3 100644 +index 7e41c4a..6efdcaf 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.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(); - } - - /** +@@ -70,31 +70,11 @@ import org.apache.maven.doxia.siterenderer.SiteRenderingContext.SiteDirectory; + 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.util.DirectoryScanner; + import org.codehaus.plexus.util.FileUtils; +@@ -425,48 +405,7 @@ public class DefaultSiteRenderer implements Renderer { + * @return a Velocity tools managed context + */ + protected Context createToolManagedVelocityContext(SiteRenderingContext siteRenderingContext) { +- Locale locale = siteRenderingContext.getLocale(); +- String dateFormat = siteRenderingContext.getSiteModel().getPublishDate().getFormat(); +- String timeZoneId = siteRenderingContext.getSiteModel().getPublishDate().getTimezone(); +- TimeZone timeZone = +- "system".equalsIgnoreCase(timeZoneId) ? TimeZone.getDefault() : TimeZone.getTimeZone(timeZoneId); +- +- 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) +- .property("timezone", timeZone) +- .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 +2.46.1 ++++++ _service ++++++ <services> <service name="tar_scm" mode="disabled"> <param name="scm">git</param> <param name="url">https://github.com/apache/maven-doxia-sitetools.git</param> <param name="revision">doxia-sitetools-2.0.0</param> <param name="match-tag">doxia-*</param> <param name="versionformat">@PARENT_TAG@</param> <param name="versionrewrite-pattern">doxia-sitetools-(.*)</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> <service name="set_version" mode="disabled"/> </services> ++++++ maven-doxia-sitetools-build.tar.xz ++++++ ++++ 1609 lines of diff (skipped)