Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 75AF2200BDF for ; Tue, 8 Nov 2016 04:20:00 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 746FD160B10; Tue, 8 Nov 2016 03:20:00 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id AD328160AF9 for ; Tue, 8 Nov 2016 04:19:59 +0100 (CET) Received: (qmail 43339 invoked by uid 500); 8 Nov 2016 03:19:58 -0000 Mailing-List: contact issues-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list issues@maven.apache.org Received: (qmail 43215 invoked by uid 99); 8 Nov 2016 03:19:58 -0000 Received: from arcas.apache.org (HELO arcas) (140.211.11.28) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Nov 2016 03:19:58 +0000 Received: from arcas.apache.org (localhost [127.0.0.1]) by arcas (Postfix) with ESMTP id 9BDE52C1F5A for ; Tue, 8 Nov 2016 03:19:58 +0000 (UTC) Date: Tue, 8 Nov 2016 03:19:58 +0000 (UTC) From: =?utf-8?Q?Herv=C3=A9_Boutemy_=28JIRA=29?= To: issues@maven.apache.org Message-ID: In-Reply-To: References: Subject: [jira] [Commented] (DOXIASITETOOLS-171) DefaultSiteRenderer must use Package#getImplementationVersion to check for Doxia Sitetools prerequisite MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394 archived-at: Tue, 08 Nov 2016 03:20:00 -0000 [ https://issues.apache.org/jira/browse/DOXIASITETOOLS-171?page=3Dcom.a= tlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentI= d=3D15646327#comment-15646327 ]=20 Herv=C3=A9 Boutemy commented on DOXIASITETOOLS-171: ---------------------------------------------- the change in generated specification version happened in Doxia Sitetools 1= .7.2: {noformat}$ for f in 1.7* ; do echo ; echo "* $f" ; unzip -p $f/doxia-site-= renderer-$f.jar META-INF/MANIFEST.MF ; done * 1.7 Manifest-Version: 1.0 Implementation-Vendor: The Apache Software Foundation Implementation-Title: Doxia :: Site Renderer Implementation-Version: 1.7 Implementation-Vendor-Id: org.apache.maven.doxia Built-By: herve Build-Jdk: 1.7.0_71 Specification-Vendor: The Apache Software Foundation Specification-Title: Doxia :: Site Renderer Created-By: Apache Maven 3.3.9 Specification-Version: 1.7 Archiver-Version: Plexus Archiver * 1.7.1 Manifest-Version: 1.0 Implementation-Vendor: The Apache Software Foundation Implementation-Title: Doxia :: Site Renderer Implementation-Version: 1.7.1 Implementation-Vendor-Id: org.apache.maven.doxia Built-By: herve Build-Jdk: 1.7.0_71 Specification-Vendor: The Apache Software Foundation Specification-Title: Doxia :: Site Renderer Created-By: Apache Maven 3.3.9 Specification-Version: 1.7.1 Archiver-Version: Plexus Archiver * 1.7.2 Manifest-Version: 1.0 Implementation-Vendor: The Apache Software Foundation Implementation-Title: Doxia :: Site Renderer Implementation-Version: 1.7.2 Implementation-Vendor-Id: org.apache.maven.doxia Built-By: herve Build-Jdk: 1.7.0_71 Specification-Vendor: The Apache Software Foundation Specification-Title: Doxia :: Site Renderer Created-By: Apache Maven 3.4.0-SNAPSHOT Implementation-URL: https://maven.apache.org/doxia/doxia-sitetools/dox ia-site-renderer/ Specification-Version: 1.7 Archiver-Version: Plexus Archiver * 1.7.3 Manifest-Version: 1.0 Implementation-Vendor: The Apache Software Foundation Implementation-Title: Doxia :: Site Renderer Implementation-Version: 1.7.3 Implementation-Vendor-Id: org.apache.maven.doxia Built-By: herve Build-Jdk: 1.7.0_71 Specification-Vendor: The Apache Software Foundation Specification-Title: Doxia :: Site Renderer Created-By: Apache Maven 3.4.0-SNAPSHOT Implementation-URL: https://maven.apache.org/doxia/doxia-sitetools/dox ia-site-renderer/ Specification-Version: 1.7 Archiver-Version: Plexus Archiver{noformat} what caused this change? and IIUC, MSHARED-191 is about avoiding {{-SNAPSHOT}} in specification vers= ion, not about limiting version to 2 digits: or the title and description s= hould be improved to match the full implemented changes? > DefaultSiteRenderer must use Package#getImplementationVersion to check fo= r Doxia Sitetools prerequisite > -------------------------------------------------------------------------= ------------------------------ > > Key: DOXIASITETOOLS-171 > URL: https://issues.apache.org/jira/browse/DOXIASITETOOLS= -171 > Project: Maven Doxia Sitetools > Issue Type: Bug > Components: Site renderer > Affects Versions: 1.7.3 > Reporter: Michael Osipov > Assignee: Michael Osipov > Fix For: 1.7.4 > > > Issue raised on the [mailing list|https://mail-archives.apache.org/mod_mb= ox/maven-dev/201611.mbox/%3CCAArU9iZJLoscR0VQw7%2BpTcXUwHLwjF%3Dva8MNLN-rn%= 2BEuMQGfCQ%40mail.gmail.com%3E] with a [sample project|https://github.com/j= ieryn/fluido-fail] issue has been reproduced. > The reason is that the prerequisite for the Sitetools are validated again= st: > {code:java} > Package p =3D DefaultSiteRenderer.class.getPackage(); > String current =3D ( p =3D=3D null ) ? null : p.getSpecificationVersion()= ; > {code} > but the specification for the value of {{SpecificationVersion}} is {{majo= r.minor}}. This was broken for some years and finally fixed with MSHARED-19= 1. This likely creeped into the module. > Proposed patch: > {code} > Index: DefaultSiteRenderer.java > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- DefaultSiteRenderer.java=09(revision 1768577) > +++ DefaultSiteRenderer.java=09(working copy) > @@ -803,7 +803,7 @@ > skinModel.getPrerequisites() =3D=3D null ? null : sk= inModel.getPrerequisites().getDoxiaSitetools(); > =20 > Package p =3D DefaultSiteRenderer.class.getPackage(); > - String current =3D ( p =3D=3D null ) ? null : p.getSpeci= ficationVersion(); > + String current =3D ( p =3D=3D null ) ? null : p.getImple= mentationVersion(); > =20 > if ( StringUtils.isNotBlank( toolsPrerequisite ) && ( cu= rrent !=3D null ) > && !matchVersion( current, toolsPrerequisite ) ) > {code} > works flawlessly with the sample project. -- This message was sent by Atlassian JIRA (v6.3.4#6332)