From 77cb0210e8ab48e78a06c65e6c0665002639531c Mon Sep 17 00:00:00 2001 From: Michael Boyles Date: Thu, 10 Sep 2020 13:13:26 +0100 Subject: [PATCH] [MPIR-395] - Add TeamCity as a possibility for ciManagement entry --- .../projectinfo/CiManagementReport.java | 4 ++ .../resources/project-info-reports.properties | 1 + .../project-info-reports_cs.properties | 1 + .../project-info-reports_de.properties | 1 + .../project-info-reports_es.properties | 1 + .../project-info-reports_fr.properties | 1 + .../project-info-reports_gl.properties | 1 + .../project-info-reports_hu.properties | 1 + .../project-info-reports_it.properties | 1 + .../project-info-reports_ja.properties | 1 + .../project-info-reports_ko.properties | 1 + .../project-info-reports_lt.properties | 1 + .../project-info-reports_nl.properties | 1 + .../project-info-reports_no.properties | 1 + .../project-info-reports_pl.properties | 1 + .../project-info-reports_pt.properties | 1 + .../project-info-reports_pt_BR.properties | 1 + .../project-info-reports_ru.properties | 1 + .../project-info-reports_sk.properties | 1 + .../project-info-reports_sv.properties | 1 + .../project-info-reports_tr.properties | 1 + .../project-info-reports_zh_CN.properties | 1 + .../project-info-reports_zh_TW.properties | 1 + .../projectinfo/CiManagementReportTest.java | 33 ++++++++++++ .../stubs/CiManagementWithCiSectionStub.java | 30 +++++++++++ ...nagement-plugin-with-ci-section-config.xml | 51 +++++++++++++++++++ 26 files changed, 140 insertions(+) create mode 100644 src/test/java/org/apache/maven/report/projectinfo/stubs/CiManagementWithCiSectionStub.java create mode 100644 src/test/resources/plugin-configs/ci-management-plugin-with-ci-section-config.xml diff --git a/src/main/java/org/apache/maven/report/projectinfo/CiManagementReport.java b/src/main/java/org/apache/maven/report/projectinfo/CiManagementReport.java index e6848a96..ad0d0db6 100644 --- a/src/main/java/org/apache/maven/report/projectinfo/CiManagementReport.java +++ b/src/main/java/org/apache/maven/report/projectinfo/CiManagementReport.java @@ -158,6 +158,10 @@ else if ( isCiManagementSystem( system, "luntbuild" ) ) { linkPatternedText( getI18nString( "luntbuild.intro" ) ); } + else if ( isCiManagementSystem( system, "teamcity" ) ) + { + linkPatternedText( getI18nString( "teamcity.intro" ) ); + } else if ( isCiManagementSystem( system, "travis" ) ) { linkPatternedText( getI18nString( "travis.intro" ) ); diff --git a/src/main/resources/project-info-reports.properties b/src/main/resources/project-info-reports.properties index a7ae0bec..b5b0ca9d 100644 --- a/src/main/resources/project-info-reports.properties +++ b/src/main/resources/project-info-reports.properties @@ -26,6 +26,7 @@ report.ci-management.general.intro = This projec report.ci-management.hudson.intro = This project uses {Hudson, http://hudson-ci.org/}. report.ci-management.jenkins.intro = This project uses {Jenkins, https://www.jenkins.io/}. report.ci-management.luntbuild.intro = This project uses {Luntbuild, http://luntbuild.javaforge.com/}. +report.ci-management.teamcity.intro = This project uses {TeamCity, https://www.jetbrains.com/teamcity/}. report.ci-management.travis.intro = This project uses {Travis CI, https://travis-ci.org/}. report.ci-management.name = CI Management report.ci-management.nocim = No continuous integration management system is defined. Please check back at a later date. diff --git a/src/main/resources/project-info-reports_cs.properties b/src/main/resources/project-info-reports_cs.properties index f746e281..8c9f86f8 100644 --- a/src/main/resources/project-info-reports_cs.properties +++ b/src/main/resources/project-info-reports_cs.properties @@ -27,6 +27,7 @@ report.ci-management.hudson.intro = Tento proje report.ci-management.jenkins.intro = Tento projekt pou\u017e\u00edv\u00e1 {Jenkins, https://www.jenkins.io/}. report.ci-management.luntbuild.intro = Tento projekt pou\u017e\u00edv\u00e1 {Luntbuild, http://luntbuild.javaforge.com/}. report.ci-management.travis.intro = Tento projekt pou\u017e\u00edv\u00e1 {Travis CI, https://travis-ci.org/}. +report.ci-management.teamcity.intro = Tento projekt pou\u017e\u00edv\u00e1 {TeamCity, https://www.jetbrains.com/teamcity/}. report.ci-management.name = Nep\u0159etr\u017eit\u00e1 integrace report.ci-management.nocim = Projekt nem\u00e1 stanoven\u00fd \u017e\u00e1dn\u00fd syst\u00e9m nep\u0159etr\u017eit\u00e9 integrace. Zkuste se pod\u00edvat pozd\u011bji. report.ci-management.notifiers.column.address = Adresa diff --git a/src/main/resources/project-info-reports_de.properties b/src/main/resources/project-info-reports_de.properties index 124b175f..7e20b042 100644 --- a/src/main/resources/project-info-reports_de.properties +++ b/src/main/resources/project-info-reports_de.properties @@ -26,6 +26,7 @@ report.ci-management.general.intro = Dieses Proj report.ci-management.hudson.intro = Dieses Projekt verwendet {Hudson, http://hudson-ci.org/}. report.ci-management.jenkins.intro = Dieses Projekt verwendet {Jenkins, https://www.jenkins.io/}. report.ci-management.luntbuild.intro = Dieses Projekt verwendet {Luntbuild, http://luntbuild.javaforge.com/}. +report.ci-management.teamcity.intro = Dieses Projekt verwendet {TeamCity, https://www.jetbrains.com/teamcity/}. report.ci-management.travis.intro = Dieses Projekt verwendet {Travis CI, https://travis-ci.org/}. report.ci-management.name = Continuous-Integration report.ci-management.nocim = Es wurde kein System zur kontinuierlichen Integration definiert. diff --git a/src/main/resources/project-info-reports_es.properties b/src/main/resources/project-info-reports_es.properties index 3427994b..f500696f 100644 --- a/src/main/resources/project-info-reports_es.properties +++ b/src/main/resources/project-info-reports_es.properties @@ -26,6 +26,7 @@ report.ci-management.general.intro = Este proyec report.ci-management.hudson.intro = Este proyecto usa {Hudson, http://hudson-ci.org/}. report.ci-management.jenkins.intro = Este proyecto usa {Jenkins, https://www.jenkins.io/}. report.ci-management.luntbuild.intro = Este proyecto usa {Luntbuild, http://luntbuild.javaforge.com/}. +report.ci-management.teamcity.intro = Este proyecto usa {TeamCity, https://www.jetbrains.com/teamcity/}. report.ci-management.travis.intro = Este proyecto usa {Travis CI, https://travis-ci.org/}. report.ci-management.name = Integraci\u00f3n Continua report.ci-management.nocim = No hay ning\u00fan sistema de integraci\u00f3n continua definido. Compruebe de nuevo dentro de algunos d\u00edas. diff --git a/src/main/resources/project-info-reports_fr.properties b/src/main/resources/project-info-reports_fr.properties index 90569ffe..4c212dd8 100644 --- a/src/main/resources/project-info-reports_fr.properties +++ b/src/main/resources/project-info-reports_fr.properties @@ -26,6 +26,7 @@ report.ci-management.general.intro = Ce projet u report.ci-management.hudson.intro = Ce projet utilise {Hudson, http://hudson-ci.org/}. report.ci-management.jenkins.intro = Ce projet utilise {Jenkins, https://www.jenkins.io/}. report.ci-management.luntbuild.intro = Ce projet utilise {Luntbuild, http://luntbuild.javaforge.com/}. +report.ci-management.teamcity.intro = Ce projet utilise {TeamCity, https://www.jetbrains.com/teamcity/}. report.ci-management.travis.intro = Ce projet utilise {Travis CI, https://travis-ci.org/}. report.ci-management.name = Int\u00e9gration continue report.ci-management.nocim = Aucun syst\u00e8me d'int\u00e9gration continue n'est d\u00e9fini. V\u00e9rifiez plus tard si un syst\u00e8me d'int\u00e9gration continue a \u00e9t\u00e9 ajout\u00e9. diff --git a/src/main/resources/project-info-reports_gl.properties b/src/main/resources/project-info-reports_gl.properties index 1d5fa647..e555c951 100644 --- a/src/main/resources/project-info-reports_gl.properties +++ b/src/main/resources/project-info-reports_gl.properties @@ -26,6 +26,7 @@ report.ci-management.general.intro = Este proxec report.ci-management.hudson.intro = Este proxecto usa {Hudson, http://hudson-ci.org/}. report.ci-management.jenkins.intro = Este proxecto usa {Jenkins, https://www.jenkins.io/}. report.ci-management.luntbuild.intro = Este proxecto usa {Luntbuild, http://luntbuild.javaforge.com/}. +report.ci-management.teamcity.intro = Este proxecto usa {TeamCity, https://www.jetbrains.com/teamcity/}. report.ci-management.travis.intro = Este proxecto usa {Travis CI, https://travis-ci.org/}. report.ci-management.name = Integraci\u00f3n Continua report.ci-management.nocim = Non hai ning\u00fan sistema de integraci\u00f3n continua definido. Comprobe de novo dentro dalg\u00FAns d\u00edas. diff --git a/src/main/resources/project-info-reports_hu.properties b/src/main/resources/project-info-reports_hu.properties index 512cd22f..5a3d9279 100644 --- a/src/main/resources/project-info-reports_hu.properties +++ b/src/main/resources/project-info-reports_hu.properties @@ -27,6 +27,7 @@ report.ci-management.hudson.intro = Ez a projek report.ci-management.jenkins.intro = Ez a projekt {Jenkins, https://www.jenkins.io/} rendszert haszn\u00C3\u00A1l. report.ci-management.luntbuild.intro = Ez a projekt {Luntbuild, http://luntbuild.javaforge.com/} rendszert haszn\u00C3\u00A1l. report.ci-management.travis.intro = Ez a projekt {Travis CI, https://travis-ci.org/} rendszert haszn\u00C3\u00A1l. +report.ci-management.teamcity.intro = Ez a projekt {TeamCity, https://travis-ci.org/} rendszert haszn\u00C3\u00A1l. report.ci-management.name = Continuous Integration report.ci-management.nocim = No continuous integration management system is defined. Please check back at a later date. report.ci-management.notifiers.column.address = C\u00edm diff --git a/src/main/resources/project-info-reports_it.properties b/src/main/resources/project-info-reports_it.properties index 5d1dc9ee..f5884818 100644 --- a/src/main/resources/project-info-reports_it.properties +++ b/src/main/resources/project-info-reports_it.properties @@ -24,6 +24,7 @@ report.ci-management.cruisecontrol.intro = Questo prog report.ci-management.hudson.intro = Questo progetto usa {Hudson, http://hudson-ci.org/}. report.ci-management.jenkins.intro = Questo progetto usa {Jenkins, https://www.jenkins.io/}. report.ci-management.luntbuild.intro = Questo progetto usa {Luntbuild, http://luntbuild.javaforge.com/}. +report.ci-management.teamcity.intro = Questo progetto usa {TeamCity, https://www.jetbrains.com/teamcity/}. report.ci-management.travis.intro = Questo progetto usa {Travis CI, https://travis-ci.org/}. report.dependencies.graph.tables.licenses = Licenze report.dependencies.graph.tables.unknown = Non definita diff --git a/src/main/resources/project-info-reports_ja.properties b/src/main/resources/project-info-reports_ja.properties index 756e2a92..73091699 100644 --- a/src/main/resources/project-info-reports_ja.properties +++ b/src/main/resources/project-info-reports_ja.properties @@ -26,6 +26,7 @@ report.ci-management.general.intro = \u3053\u306 report.ci-management.hudson.intro = \u3053\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306F {Hudson, http://hudson-ci.org/} \u3092\u4F7F\u7528\u3057\u3066\u3044\u307E\u3059\u3002 report.ci-management.jenkins.intro = \u3053\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306F {Jenkins, https://www.jenkins.io/} \u3092\u4F7F\u7528\u3057\u3066\u3044\u307E\u3059\u3002 report.ci-management.luntbuild.intro = \u3053\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306F {Luntbuild, http://luntbuild.javaforge.com/} \u3092\u4F7F\u7528\u3057\u3066\u3044\u307E\u3059\u3002 +report.ci-management.teamcity.intro = \u3053\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306F {TeamCity, https://www.jetbrains.com/teamcity/} \u3092\u4F7F\u7528\u3057\u3066\u3044\u307E\u3059\u3002 report.ci-management.travis.intro = \u3053\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306F {Travis CI, https://travis-ci.org/} \u3092\u4F7F\u7528\u3057\u3066\u3044\u307E\u3059\u3002 report.ci-management.name = \u7D99\u7D9A\u7684\u7D50\u5408 report.ci-management.nocim = \u7D99\u7D9A\u7684\u7D50\u5408\u7BA1\u7406\u30B7\u30B9\u30C6\u30E0\u306F\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u5F8C\u3067\u307E\u305F\u30C1\u30A7\u30C3\u30AF\u3057\u3066\u304F\u3060\u3055\u3044\u3002 diff --git a/src/main/resources/project-info-reports_ko.properties b/src/main/resources/project-info-reports_ko.properties index cb2a5e00..9cbd28e8 100644 --- a/src/main/resources/project-info-reports_ko.properties +++ b/src/main/resources/project-info-reports_ko.properties @@ -24,6 +24,7 @@ report.ci-management.cruisecontrol.intro = \uc774 \ud5 report.ci-management.hudson.intro = \uc774 \ud504\ub85c\uc81d\ud2b8\ub294 {Hudson, http://hudson-ci.org/}\uc744 \uc0ac\uc6a9\ud569\ub2c8\ub2e4. report.ci-management.jenkins.intro = \uc774 \ud504\ub85c\uc81d\ud2b8\ub294 {Jenkins, https://www.jenkins.io/}\uc744 \uc0ac\uc6a9\ud569\ub2c8\ub2e4. report.ci-management.luntbuild.intro = \uc774 \ud504\ub85c\uc81d\ud2b8\ub294 {Luntbuild, http://luntbuild.javaforge.com/}\uc744 \uc0ac\uc6a9\ud569\ub2c8\ub2e4. +report.ci-management.teamcity.intro = \uc774 \ud504\ub85c\uc81d\ud2b8\ub294 {TeamCity, https://www.jetbrains.com/teamcity/}\uc744 \uc0ac\uc6a9\ud569\ub2c8\ub2e4. report.ci-management.travis.intro = \uc774 \ud504\ub85c\uc81d\ud2b8\ub294 {Travis CI, https://travis-ci.org/}\uc744 \uc0ac\uc6a9\ud569\ub2c8\ub2e4. report.ci-management.description = \uc774\ub294 \uc815\uae30\uc801\uc73c\ub85c \uc218\ud589\ud558\ub294 \ube4c\ub4dc/\ud14c\uc2a4\ud2b8\uc5d0 \ub300\ud55c \uc5f0\uc18d \ud1b5\ud569 \uacf5\uc815\uc5d0 \ub300\ud55c \ub9c1\ud06c\uc785\ub2c8\ub2e4. report.ci-management.general.intro = \uc774 \ud504\ub85c\uc81d\ud2b8\ub294 \uc5f0\uc18d\ud1b5\ud569\uc2dc\uc2a4\ud15c(Continuous Integration System)\uc744 \uc0ac\uc6a9\ud569\ub2c8\ub2e4. diff --git a/src/main/resources/project-info-reports_lt.properties b/src/main/resources/project-info-reports_lt.properties index 278b31cb..1ec53843 100644 --- a/src/main/resources/project-info-reports_lt.properties +++ b/src/main/resources/project-info-reports_lt.properties @@ -26,6 +26,7 @@ report.ci-management.general.intro = \u0160is pr report.ci-management.hudson.intro = \u0160is projektas naudoja {Hudson, http://hudson-ci.org/}. report.ci-management.jenkins.intro = \u0160is projektas naudoja {Jenkins, https://www.jenkins.io/}. report.ci-management.luntbuild.intro = \u0160is projektas naudoja {Luntbuild, http://luntbuild.javaforge.com/}. +report.ci-management.teamcity.intro = \u0160is projektas naudoja {TeamCity, https://www.jetbrains.com/teamcity/}. report.ci-management.travis.intro = \u0160is projektas naudoja {Travis CI, https://travis-ci.org/}. report.ci-management.name = Testinis integravimas report.ci-management.nocim = Testinio integravimo sistema nenaudojama. Pabandykit v\u0117liau. diff --git a/src/main/resources/project-info-reports_nl.properties b/src/main/resources/project-info-reports_nl.properties index b05c584b..2a566730 100644 --- a/src/main/resources/project-info-reports_nl.properties +++ b/src/main/resources/project-info-reports_nl.properties @@ -25,6 +25,7 @@ report.ci-management.general.intro = Dit project report.ci-management.hudson.intro = Dit project gebruikt {Hudson, http://hudson-ci.org/}. report.ci-management.jenkins.intro = Dit project gebruikt {Jenkins, https://www.jenkins.io/}. report.ci-management.luntbuild.intro = Dit project gebruikt {Luntbuild, http://luntbuild.javaforge.com/}. +report.ci-management.teamcity.intro = Dit project gebruikt {TeamCity, https://www.jetbrains.com/teamcity/}. report.ci-management.travis.intro = Dit project gebruikt {Travis CI, https://travis-ci.org/}. report.dependencies.file.details.columntitle.debuginformation = Geeft aan of deze afhankelijkheden met debug-informatie gecompileerd zijn. report.dependencies.graph.tables.licenses = Vergunningen diff --git a/src/main/resources/project-info-reports_no.properties b/src/main/resources/project-info-reports_no.properties index baa92bea..977e8adb 100644 --- a/src/main/resources/project-info-reports_no.properties +++ b/src/main/resources/project-info-reports_no.properties @@ -26,6 +26,7 @@ report.ci-management.general.intro = Dette prosj report.ci-management.hudson.intro = Dette prosjektet bruker {Hudson, http://hudson-ci.org/}. report.ci-management.jenkins.intro = Dette prosjektet bruker {Jenkins, https://www.jenkins.io/}. report.ci-management.luntbuild.intro = Dette prosjektet bruker {Luntbuild, http://luntbuild.javaforge.com/}. +report.ci-management.teamcity.intro = Dette prosjektet bruker {TeamCity, https://www.jetbrains.com/teamcity/}. report.ci-management.travis.intro = Dette prosjektet bruker {Travis CI, https://travis-ci.org/}. report.ci-management.name = Kontinueriig integrasjon report.ci-management.nocim = Intet kontinuerlig integrasjons administrasjons system er definert. Vennligst sjekk igjen ved en senere anledning. diff --git a/src/main/resources/project-info-reports_pl.properties b/src/main/resources/project-info-reports_pl.properties index 2c523a6e..c23243f2 100644 --- a/src/main/resources/project-info-reports_pl.properties +++ b/src/main/resources/project-info-reports_pl.properties @@ -26,6 +26,7 @@ report.ci-management.general.intro = Projekt ten report.ci-management.hudson.intro = Projekt ten u\u017Cywa systemu {Hudson, http://hudson-ci.org/}. report.ci-management.jenkins.intro = Projekt ten u\u017Cywa systemu {Jenkins, https://www.jenkins.io/}. report.ci-management.luntbuild.intro = Projekt ten u\u017Cywa systemu {Luntbuild, http://luntbuild.javaforge.com/}. +report.ci-management.teamcity.intro = Projekt ten u\u017Cywa systemu {TeamCity, https://www.jetbrains.com/teamcity/}. report.ci-management.travis.intro = Projekt ten u\u017Cywa systemu {Travis CI, https://travis-ci.org/}. report.ci-management.name = Continuous Integration report.ci-management.nocim = Nie zdefiniowano system\u00F3w Continuous Integration dla tego projektu. Prosz\u0119 spr\u00F3bowa\u0107 w p\u00F3\u017Aniejszym terminie. diff --git a/src/main/resources/project-info-reports_pt.properties b/src/main/resources/project-info-reports_pt.properties index cbeb3076..9f3f71cf 100644 --- a/src/main/resources/project-info-reports_pt.properties +++ b/src/main/resources/project-info-reports_pt.properties @@ -26,6 +26,7 @@ report.ci-management.general.intro = Este projec report.ci-management.hudson.intro = Este projecto usa o {Hudson, http://hudson-ci.org/}. report.ci-management.jenkins.intro = Este projecto usa o {Jenkins, https://www.jenkins.io/}. report.ci-management.luntbuild.intro = Este projecto usa o {Luntbuild, http://luntbuild.javaforge.com/}. +report.ci-management.teamcity.intro = Este projecto usa o {TeamCity, https://www.jetbrains.com/teamcity/}. report.ci-management.travis.intro = Este projecto usa o {Travis CI, https://travis-ci.org/}. report.ci-management.name = Integra\u00e7\u00e3o Cont\u00ednua report.ci-management.nocim = Nenhum sistema de integra\u00e7\u00e3o cont\u00ednua foi definido. Por favor verifique novamente numa data futura. diff --git a/src/main/resources/project-info-reports_pt_BR.properties b/src/main/resources/project-info-reports_pt_BR.properties index 90f74a2b..cbe32c23 100644 --- a/src/main/resources/project-info-reports_pt_BR.properties +++ b/src/main/resources/project-info-reports_pt_BR.properties @@ -26,6 +26,7 @@ report.ci-management.general.intro = Este projet report.ci-management.hudson.intro = Este projeto utiliza o {Hudson, http://hudson-ci.org/}. report.ci-management.jenkins.intro = Este projeto utiliza o {Jenkins, https://www.jenkins.io/}. report.ci-management.luntbuild.intro = Este projeto utiliza o {Luntbuild, http://luntbuild.javaforge.com/}. +report.ci-management.teamcity.intro = Este projeto utiliza o {TeamCity, https://www.jetbrains.com/teamcity/}. report.ci-management.travis.intro = Este projeto utiliza o {Travis CI, https://travis-ci.org/}. report.ci-management.name = Integra\u00e7\u00e3o Cont\u00ednua report.ci-management.nocim = Nenhum sistema de integra\u00e7\u00e3o cont\u00ednua foi definido. Favor verificar novamente numa data futura. diff --git a/src/main/resources/project-info-reports_ru.properties b/src/main/resources/project-info-reports_ru.properties index 75ce3f2c..b5752b64 100644 --- a/src/main/resources/project-info-reports_ru.properties +++ b/src/main/resources/project-info-reports_ru.properties @@ -26,6 +26,7 @@ report.ci-management.general.intro = \u0414\u043 report.ci-management.hudson.intro = \u0414\u0430\u043D\u043D\u044B\u0439 \u043F\u0440\u043E\u0435\u043A\u0442 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0435\u0442 {Hudson, http://hudson-ci.org/}. report.ci-management.jenkins.intro = \u0414\u0430\u043D\u043D\u044B\u0439 \u043F\u0440\u043E\u0435\u043A\u0442 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0435\u0442 {Jenkins, https://www.jenkins.io/}. report.ci-management.luntbuild.intro = \u0414\u0430\u043D\u043D\u044B\u0439 \u043F\u0440\u043E\u0435\u043A\u0442 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0435\u0442 {Luntbuild, http://luntbuild.javaforge.com/}. +report.ci-management.teamcity.intro = \u0414\u0430\u043D\u043D\u044B\u0439 \u043F\u0440\u043E\u0435\u043A\u0442 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0435\u0442 {TeamCity, https://www.jetbrains.com/teamcity/}. report.ci-management.travis.intro = \u0414\u0430\u043D\u043D\u044B\u0439 \u043F\u0440\u043E\u0435\u043A\u0442 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0435\u0442 {Travis CI, https://travis-ci.org/}. report.ci-management.name = \u0423\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 \u041D\u0435\u043F\u0440\u0435\u0440\u044B\u0432\u043D\u043E\u0439 \u0418\u043D\u0442\u0435\u0433\u0440\u0430\u0446\u0438\u0435\u0439 report.ci-management.nocim = \u0421\u0438\u0441\u0442\u0435\u043C\u0430 \u0443\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u044F \u043D\u0435\u043F\u0440\u0435\u0440\u044B\u0432\u043D\u043E\u0439 \u0438\u043D\u0442\u0435\u0433\u0440\u0430\u0446\u0438\u0435\u0439 \u043D\u0435 \u043E\u043F\u0440\u0435\u0434\u0435\u043B\u0435\u043D\u0430. \u041F\u043E\u0436\u0430\u043B\u0443\u0439\u0441\u0442\u0430, \u043F\u043E\u043F\u0440\u043E\u0431\u0443\u0439\u0442\u0435 \u043F\u043E\u0441\u0435\u0442\u0438\u0442\u044C \u044D\u0442\u0443 \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0443 \u043F\u043E\u0437\u0434\u043D\u0435\u0435. diff --git a/src/main/resources/project-info-reports_sk.properties b/src/main/resources/project-info-reports_sk.properties index 37c49863..c7373861 100644 --- a/src/main/resources/project-info-reports_sk.properties +++ b/src/main/resources/project-info-reports_sk.properties @@ -26,6 +26,7 @@ report.ci-management.general.intro = Tento proje report.ci-management.hudson.intro = Tento projekt pou\u017e\u00edva {Hudson, http://hudson-ci.org/}. report.ci-management.jenkins.intro = Tento projekt pou\u017e\u00edva {Jenkins, https://www.jenkins.io/}. report.ci-management.luntbuild.intro = Tento projekt pou\u017e\u00edva {Luntbuild, http://luntbuild.javaforge.com/}. +report.ci-management.teamcity.intro = Tento projekt pou\u017e\u00edva {TeamCity, https://www.jetbrains.com/teamcity/}. report.ci-management.travis.intro = Tento projekt pou\u017e\u00edva {Travis CI, https://travis-ci.org/}. report.ci-management.name = Syst\u00e9m priebe\u017enej integr\u00e1cie (Continuous Integration) report.ci-management.nocim = \u017diadny priebe\u017en\u00fd integra\u010dn\u00fd syst\u00e9m nie je definovan\u00fd, pros\u00edm sk\u00faste nesk\u00f4r. diff --git a/src/main/resources/project-info-reports_sv.properties b/src/main/resources/project-info-reports_sv.properties index ac4b18cf..24befbf3 100644 --- a/src/main/resources/project-info-reports_sv.properties +++ b/src/main/resources/project-info-reports_sv.properties @@ -26,6 +26,7 @@ report.ci-management.general.intro = Detta proje report.ci-management.hudson.intro = Detta projekt anv\u00e4nder {Hudson, http://hudson-ci.org/}. report.ci-management.jenkins.intro = Detta projekt anv\u00e4nder {Jenkins, https://www.jenkins.io/}. report.ci-management.luntbuild.intro = Detta projekt anv\u00e4nder {Luntbuild, http://luntbuild.javaforge.com/}. +report.ci-management.teamcity.intro = Detta projekt anv\u00e4nder {TeamCity, https://www.jetbrains.com/teamcity/}. report.ci-management.travis.intro = Detta projekt anv\u00e4nder {Travis CI, https://travis-ci.org/}. report.ci-management.name = Continuous Integration report.ci-management.nocim = Projektet har inget continuous integration-system definierat. F\u00f6rs\u00f6k igen senare. diff --git a/src/main/resources/project-info-reports_tr.properties b/src/main/resources/project-info-reports_tr.properties index c3626f80..6cc8e173 100644 --- a/src/main/resources/project-info-reports_tr.properties +++ b/src/main/resources/project-info-reports_tr.properties @@ -26,6 +26,7 @@ report.ci-management.general.intro = Bu proje S\ report.ci-management.hudson.intro = This project uses {Hudson, http://hudson-ci.org/}. report.ci-management.jenkins.intro = This project uses {Jenkins, https://www.jenkins.io/}. report.ci-management.luntbuild.intro = This project uses {Luntbuild, http://luntbuild.javaforge.com/}. +report.ci-management.teamcity.intro = This project uses {TeamCity, https://www.jetbrains.com/teamcity/}. report.ci-management.travis.intro = This project uses {Travis CI, https://travis-ci.org/}. report.ci-management.name = S\u00fcrekli Entegrasyon report.ci-management.nocim = Herhangi bir S\u00fcrekli Entegrasyon Y\u00f6netim Sistemi tan\u00fdmlanmam\u00fd\u00fet\u00fdr. L\u00fctfen ileri bir tarihte tekrar kontrol ediniz. diff --git a/src/main/resources/project-info-reports_zh_CN.properties b/src/main/resources/project-info-reports_zh_CN.properties index 15da09a8..e8f39670 100644 --- a/src/main/resources/project-info-reports_zh_CN.properties +++ b/src/main/resources/project-info-reports_zh_CN.properties @@ -26,6 +26,7 @@ report.ci-management.general.intro = \u672C\u987 report.ci-management.hudson.intro = \u672C\u9879\u76EE\u4F7F\u7528 {Hudson, http://hudson-ci.org/}\u3002 report.ci-management.jenkins.intro = \u672C\u9879\u76EE\u4F7F\u7528 {Jenkins, https://www.jenkins.io/}\u3002 report.ci-management.luntbuild.intro = \u672C\u9879\u76EE\u4F7F\u7528 {Luntbuild, http://luntbuild.javaforge.com/}\u3002 +report.ci-management.teamcity.intro = \u672C\u9879\u76EE\u4F7F\u7528 {TeamCity, https://www.jetbrains.com/teamcity/}\u3002 report.ci-management.travis.intro = \u672C\u9879\u76EE\u4F7F\u7528 {Travis CI, https://travis-ci.org/}\u3002 report.ci-management.name = \u6301\u7EED\u96C6\u6210 report.ci-management.nocim = \u672A\u5B9A\u4E49\u4EFB\u4F55\u6301\u7EED\u96C6\u6210\u7BA1\u7406\u7CFB\u7EDF\uFF0C\u8BF7\u8FC7\u4E00\u6BB5\u65F6\u95F4\u518D\u67E5\u770B\u3002 diff --git a/src/main/resources/project-info-reports_zh_TW.properties b/src/main/resources/project-info-reports_zh_TW.properties index 0482f0a5..a9303247 100644 --- a/src/main/resources/project-info-reports_zh_TW.properties +++ b/src/main/resources/project-info-reports_zh_TW.properties @@ -26,6 +26,7 @@ report.ci-management.general.intro = \u672c\u5c0 report.ci-management.hudson.intro = \u672c\u5c08\u6848\u4f7f\u7528 {Hudson, http://hudson-ci.org/}\u3002 report.ci-management.jenkins.intro = \u672c\u5c08\u6848\u4f7f\u7528 {Jenkins, https://www.jenkins.io/}\u3002 report.ci-management.luntbuild.intro = \u672c\u5c08\u6848\u4f7f\u7528 {Luntbuild, http://luntbuild.javaforge.com/}\u3002 +report.ci-management.teamcity.intro = \u672c\u5c08\u6848\u4f7f\u7528 {TeamCity, https://www.jetbrains.com/teamcity/}\u3002 report.ci-management.travis.intro = \u672c\u5c08\u6848\u4f7f\u7528 {Travis CI, https://travis-ci.org/}\u3002 report.ci-management.name = \u6301\u7e8c\u6574\u5408 (Continuous Integration) report.ci-management.nocim = \u672c\u5c08\u6848\u672a\u5b9a\u7fa9\u6301\u7e8c\u6574\u5408\u7ba1\u7406\u7cfb\u7d71 (Continuous Integration System)\u3002\u8acb\u7a0d\u5f8c\u518d\u67e5\u770b\u3002 diff --git a/src/test/java/org/apache/maven/report/projectinfo/CiManagementReportTest.java b/src/test/java/org/apache/maven/report/projectinfo/CiManagementReportTest.java index 3b2b408e..c438fc01 100644 --- a/src/test/java/org/apache/maven/report/projectinfo/CiManagementReportTest.java +++ b/src/test/java/org/apache/maven/report/projectinfo/CiManagementReportTest.java @@ -26,6 +26,7 @@ import com.meterware.httpunit.WebConversation; import com.meterware.httpunit.WebRequest; import com.meterware.httpunit.WebResponse; +import org.w3c.dom.html.HTMLAnchorElement; /** * @author Edwin Punzalan @@ -72,4 +73,36 @@ public void testReport() assertEquals( getString( "report.ci-management.name" ), textBlocks[0].getText() ); assertEquals( getString( "report.ci-management.nocim" ), textBlocks[1].getText() ); } + + /** + * When a ciManagement section is present, test that the correct name and link text are chosen + * from the 'system' property. + * + * @throws Exception if any + */ + public void testCiNameReport() + throws Exception + { + generateReport( "ci-management", "ci-management-plugin-with-ci-section-config.xml" ); + assertTrue( "Test html generated", getGeneratedReport( "ci-management.html" ).exists() ); + + URL reportURL = getGeneratedReport( "ci-management.html" ).toURI().toURL(); + assertNotNull( reportURL ); + + // HTTPUnit + WebRequest request = new GetMethodWebRequest( reportURL.toString() ); + WebResponse response = WEB_CONVERSATION.getResponse( request ); + + // Basic HTML tests + assertTrue( response.isHTML() ); + assertTrue( response.getContentLength() > 0 ); + + // Test the texts + TextBlock[] textBlocks = response.getTextBlocks(); + assertTrue( textBlocks[1].getText().startsWith( "This project uses " ) ); + assertEquals(3, textBlocks[1].getNode().getChildNodes().getLength()); + HTMLAnchorElement anchor = (HTMLAnchorElement) textBlocks[1].getNode().getChildNodes().item( 1 ); + assertEquals( "https://www.jetbrains.com/teamcity/", anchor.getAttribute( "href" ) ); + assertEquals( "TeamCity", anchor.getFirstChild().getNodeValue() ); + } } diff --git a/src/test/java/org/apache/maven/report/projectinfo/stubs/CiManagementWithCiSectionStub.java b/src/test/java/org/apache/maven/report/projectinfo/stubs/CiManagementWithCiSectionStub.java new file mode 100644 index 00000000..b5b2a446 --- /dev/null +++ b/src/test/java/org/apache/maven/report/projectinfo/stubs/CiManagementWithCiSectionStub.java @@ -0,0 +1,30 @@ +package org.apache.maven.report.projectinfo.stubs; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +public class CiManagementWithCiSectionStub + extends ProjectInfoProjectStub +{ + @Override + protected String getPOM() + { + return "ci-management-plugin-with-ci-section-config.xml"; + } +} diff --git a/src/test/resources/plugin-configs/ci-management-plugin-with-ci-section-config.xml b/src/test/resources/plugin-configs/ci-management-plugin-with-ci-section-config.xml new file mode 100644 index 00000000..3ec898ed --- /dev/null +++ b/src/test/resources/plugin-configs/ci-management-plugin-with-ci-section-config.xml @@ -0,0 +1,51 @@ + + + + 4.0.0 + org.apache.maven.plugin.projectinfo.tests + ci-management-with-ci-section + 1.0-SNAPSHOT + jar + ci management project info + + + junit + junit + 3.8.1 + test + + + + + + maven-project-info-reports-plugin + + target/test-harness/ci-management-with-ci-section + ${localRepository} + + + + + + + TeamCity + https://example.com + + \ No newline at end of file