Author: michaelo Date: Thu Dec 11 21:20:45 2014 New Revision: 1644770 URL: http://svn.apache.org/r1644770 Log: [MPIR-313] License name is mandatory but it is not validated
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report.properties maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_cs.properties maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_de.properties maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_es.properties maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_fr.properties maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_gl.properties maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_ko.properties maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_lt.properties maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_pt.properties maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_pt_BR.properties maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_ru.properties maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_sv.properties maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_zh_CN.properties maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_zh_TW.properties Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java?rev=1644770&r1=1644769&r2=1644770&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java Thu Dec 11 21:20:45 2014 @@ -289,6 +289,10 @@ public class LicenseReport for ( License license : licenses ) { String name = license.getName(); + if ( StringUtils.isEmpty( name ) ) + { + name = getI18nString( "unnamed" ); + } sink.listItem(); link( "#" + HtmlTools.encodeId( name ), name ); @@ -301,6 +305,11 @@ public class LicenseReport for ( License license : licenses ) { String name = license.getName(); + if ( StringUtils.isEmpty( name ) ) + { + name = getI18nString( "unnamed" ); + } + String url = license.getUrl(); String comments = license.getComments(); Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report.properties?rev=1644770&r1=1644769&r2=1644770&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report.properties (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report.properties Thu Dec 11 21:20:45 2014 @@ -144,6 +144,7 @@ report.license.overview.title report.license.originalText = [Original text] report.license.copy = Copy of the license follows: report.license.title = Project License +report.license.unnamed = Unnamed report.mailing-lists.column.archive = Archive report.mailing-lists.column.name = Name report.mailing-lists.column.otherArchives = Other Archives Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_cs.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_cs.properties?rev=1644770&r1=1644769&r2=1644770&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_cs.properties (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_cs.properties Thu Dec 11 21:20:45 2014 @@ -135,6 +135,7 @@ report.license.nolicense report.license.overview.intro = Obvykle jsou uveden\u00e9 licence licencemi projektu samotn\u00e9ho a nikoliv z\u00e1vislost\u00ed. report.license.overview.title = Souhrn report.license.title = Licence projektu +report.license.unnamed = Nepojmenovan\u00fd report.mailing-lists.column.archive = Archiv report.mailing-lists.column.name = N\u00e1zev report.mailing-lists.column.otherArchives = Jin\u00e9 archivy Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_de.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_de.properties?rev=1644770&r1=1644769&r2=1644770&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_de.properties (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_de.properties Thu Dec 11 21:20:45 2014 @@ -143,6 +143,7 @@ report.license.overview.title report.license.originalText = [Originaltext] report.license.copy = Nachfolgend ist eine Kopie der Lizenz zu sehen: report.license.title = Projektlizenz +report.license.unnamed = Unbenannt report.mailing-lists.column.archive = Archiv report.mailing-lists.column.name = Name report.mailing-lists.column.otherArchives = Andere Archive Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_es.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_es.properties?rev=1644770&r1=1644769&r2=1644770&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_es.properties (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_es.properties Thu Dec 11 21:20:45 2014 @@ -135,6 +135,7 @@ report.license.nolicense report.license.overview.intro = Normalmente, la licencia indicada para el proyecto es para el propio proyecto y no para sus dependencias. report.license.overview.title = Resumen report.license.title = Licencia del Proyecto +report.license.unnamed = Sin nombre report.mailing-lists.column.archive = Archivo report.mailing-lists.column.name = Nombre report.mailing-lists.column.otherArchives = Otros Archivos Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_fr.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_fr.properties?rev=1644770&r1=1644769&r2=1644770&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_fr.properties (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_fr.properties Thu Dec 11 21:20:45 2014 @@ -136,6 +136,7 @@ report.license.nolicense report.license.overview.intro = Typiquement les licences \u00e9num\u00e9r\u00e9s pour ce projet sont celles du projet lui-m\u00eame, et non celles des d\u00e9pendances. report.license.overview.title = Vue d'ensemble report.license.title = Licence du projet +report.license.unnamed = Non-sp\u00e9cifi\u00e9 report.mailing-lists.column.archive = Archive report.mailing-lists.column.name = Nom report.mailing-lists.column.otherArchives = Autres Archives Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_gl.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_gl.properties?rev=1644770&r1=1644769&r2=1644770&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_gl.properties (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_gl.properties Thu Dec 11 21:20:45 2014 @@ -125,6 +125,7 @@ report.license.nolicense report.license.overview.intro = Normalmente, a licenza indicada para o proxecto \u00E9 para o propio proxecto e non para as s\u00FAas dependencias. report.license.overview.title = Resumo report.license.title = Licenza do Proxecto +report.license.unnamed = Sen nome report.mailing-lists.column.archive = Arquivo report.mailing-lists.column.name = Nome report.mailing-lists.column.otherArchives = Outros Arquivos Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_ko.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_ko.properties?rev=1644770&r1=1644769&r2=1644770&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_ko.properties (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_ko.properties Thu Dec 11 21:20:45 2014 @@ -119,6 +119,7 @@ report.license.nolicense report.license.overview.intro = \uc77c\ubc18\uc801\uc73c\ub85c \uc774 \ud504\ub85c\uc81d\ud2b8\uc758 \ub77c\uc774\uc13c\uc2a4\ub4e4\uc740 \uc774 \ud504\ub85c\uc81d\ud2b8 \uc790\uccb4\ub97c \uc704\ud55c \uac83\ub4e4\uc774\uba70, \uc758\uc874\ubb3c\ub4e4\uc5d0 \ub300\ud55c \ub77c\uc774\uc13c\uc2a4\ub4e4\uc774 \uc544\ub2d9\ub2c8\ub2e4. report.license.overview.title = \uac1c\uc694 report.license.title = \ud504\ub85c\uc81d\ud2b8 \ub77c\uc774\uc13c\uc2a4 +report.license.unnamed = \uba85\uba85 \uc548\ub428 report.mailing-lists.column.archive = \uc544\uce74\uc774\ube0c report.mailing-lists.column.name = \uc774\ub984 report.mailing-lists.column.otherArchives = \uae30\ud0c0 \uc544\uce74\uc774\ube0c Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_lt.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_lt.properties?rev=1644770&r1=1644769&r2=1644770&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_lt.properties (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_lt.properties Thu Dec 11 21:20:45 2014 @@ -128,6 +128,7 @@ report.license.nolicense report.license.overview.intro = Bendru atveju \u017eemiau pateiktos licenzijos yra pa\u010dio projekto, o ne jo naudojam\u0173 bibliotek\u0173 report.license.overview.title = \u012evadas report.license.title = Projekto licenzija +report.license.unnamed = Be pavadinimo report.mailing-lists.column.archive = Archyvas report.mailing-lists.column.name = Vardas report.mailing-lists.column.otherArchives = Kiti archyvai Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_pt.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_pt.properties?rev=1644770&r1=1644769&r2=1644770&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_pt.properties (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_pt.properties Thu Dec 11 21:20:45 2014 @@ -130,6 +130,7 @@ report.license.nolicense report.license.overview.intro = Tipicamente a licen\u00e7a apresentada para o projecto \u00e9 somente para o projecto e n\u00e3o para as suas depend\u00eancias. report.license.overview.title = Vis\u00e3o Geral report.license.title = Licen\u00e7a do Projecto +report.license.unnamed = Sem nome report.mailing-lists.column.archive = Hist\u00f3rico report.mailing-lists.column.name = Nome report.mailing-lists.column.otherArchives = Hist\u00f3rico anterior Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_pt_BR.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_pt_BR.properties?rev=1644770&r1=1644769&r2=1644770&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_pt_BR.properties (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_pt_BR.properties Thu Dec 11 21:20:45 2014 @@ -161,6 +161,7 @@ report.license.nolicense report.license.overview.intro = Tipicamente a licen\u00e7a apresentada para o projeto \u00e9 somente para o projeto, e n\u00e3o para as depend\u00eancias. report.license.overview.title = Vis\u00e3o Geral report.license.title = Licen\u00e7a do Projeto +report.license.unnamed = Sem nome report.mailing-lists.column.archive = Hist\u00f3rico report.mailing-lists.column.name = Nome report.mailing-lists.column.otherArchives = Hist\u00f3rico mais antigo Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_ru.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_ru.properties?rev=1644770&r1=1644769&r2=1644770&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_ru.properties (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_ru.properties Thu Dec 11 21:20:45 2014 @@ -130,6 +130,7 @@ report.license.nolicense report.license.overview.intro = \u041e\u0431\u044b\u0447\u043d\u043e, \u043b\u0438\u0446\u0435\u043d\u0437\u0438\u0438 \u043a\u043e\u0442\u043e\u0440\u044b\u0435 \u043c\u043e\u0436\u043d\u043e \u043d\u0430\u0439\u0442\u0438 \u043d\u0430 \u0441\u0430\u0439\u0442\u0435 \u043f\u0440\u043e\u0435\u043a\u0442\u0430 \u043e\u0442\u043d\u043e\u0441\u044f\u0442\u0441\u044f \u043a \u0441\u0430\u043c\u043e\u043c\u0443 \u043f\u0440\u043e\u0435\u043a\u0442\u0443 \u0430 \u043d\u0435 \u043a \u0435\u0433\u043e \u0437\u0430\u0432\u0438\u0441\u0438\u043c\u043e\u0441\u0442\u044f\u043c. report.license.overview.title = \u041e\u0431\u0437\u043e\u0440 report.license.title = \u041b\u0438\u0446\u0435\u043d\u0437\u0438\u044f \u041f\u0440\u043e\u0435\u043a\u0442\u0430 +report.license.unnamed = \u041d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u0430\u044f report.mailing-lists.column.archive = \u0410\u0440\u0445\u0438\u0432 report.mailing-lists.column.name = \u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435 report.mailing-lists.column.otherArchives = \u0414\u0440\u0443\u0433\u0438\u0435 \u0410\u0440\u0445\u0438\u0432\u044b Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_sv.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_sv.properties?rev=1644770&r1=1644769&r2=1644770&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_sv.properties (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_sv.properties Thu Dec 11 21:20:45 2014 @@ -132,6 +132,7 @@ report.license.nolicense report.license.overview.intro = Vanligtvis \u00e4r licenserna som listas f\u00f6r projektet bara licenser f\u00f6r sj\u00e4lva projektet, och inte f\u00f6r projektets beroenden. report.license.overview.title = \u00d6versikt report.license.title = Projektlicens +report.license.unnamed = Namnl\u00f6s report.mailing-lists.column.archive = Arkiv report.mailing-lists.column.name = Namn report.mailing-lists.column.otherArchives = \u00d6vriga arkiv Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_zh_CN.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_zh_CN.properties?rev=1644770&r1=1644769&r2=1644770&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_zh_CN.properties (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_zh_CN.properties Thu Dec 11 21:20:45 2014 @@ -119,6 +119,7 @@ report.license.nolicense report.license.overview.intro = \u4E00\u822C\u6765\u8BF4\uFF0C\u9879\u76EE\u4E2D\u6240\u5217\u7684\u6388\u6743\u4EC5\u5BF9\u9879\u76EE\u81EA\u8EAB\u800C\u8A00\uFF0C\u4E0D\u5305\u62EC\u9879\u76EE\u7684\u4F9D\u8D56\u3002 report.license.overview.title = \u6982\u8FF0 report.license.title = \u9879\u76EE\u6388\u6743 +report.license.unnamed = \u672A\u547D\u540D report.mailing-lists.column.archive = \u5F52\u6863 report.mailing-lists.column.name = \u540D\u79F0 report.mailing-lists.column.otherArchives = \u5176\u4ED6\u5F52\u6863 Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_zh_TW.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_zh_TW.properties?rev=1644770&r1=1644769&r2=1644770&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_zh_TW.properties (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_zh_TW.properties Thu Dec 11 21:20:45 2014 @@ -128,6 +128,7 @@ report.license.nolicense report.license.overview.intro = \u4e00\u822c\u4f86\u8aaa\uff0c\u5c08\u6848\u6240\u5217\u7684\u6388\u6b0a\u8a31\u53ef\u53ea\u5c0d\u5176\u81ea\u8eab\u6709\u5f71\u97ff\uff0c\u800c\u4e0d\u6d89\u53ca\u5c08\u6848\u7684\u4f9d\u8cf4\u3002 report.license.overview.title = \u6982\u8981 (Overview) report.license.title = \u5c08\u6848\u6388\u6b0a\u8a31\u53ef (Project License) +report.license.unnamed = \u672a\u547d\u540d report.mailing-lists.column.archive = \u6b78\u6a94 (Archive) report.mailing-lists.column.name = \u540d\u7a31 (Name) report.mailing-lists.column.otherArchives = \u5176\u5b83\u6b78\u6a94 (Other Archives)