This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository maven-site-plugin.
commit 2b50be4646a9f2899beca522d0b3724f94ff828b Merge: f61e4de 264521f Author: Emmanuel Bourg <[email protected]> Date: Fri Jul 28 13:29:57 2017 +0200 Updated version 2.4 from 'upstream/2.4' with Debian dir fc903900ba14c09f0369d8e45ef003e769ff4c16 pom.xml | 36 +- src/it/MSITE-159/verify.bsh | 2 +- src/it/MSITE-265/src/site/site.xml | 1 + src/it/MSITE-265/verify.bsh | 2 +- src/it/MSITE-304/verify.bsh | 2 +- src/it/MSITE-312/verify.bsh | 2 +- src/it/MSITE-322/verify.bsh | 2 +- src/it/MSITE-354/verify.bsh | 2 +- src/it/MSITE-456/verify.bsh | 2 +- src/it/MSITE-458/first/pom.xml | 22 + src/it/MSITE-458/invoker.properties | 3 + src/it/MSITE-458/pom.xml | 47 ++ src/it/MSITE-458/second/pom.xml | 13 + src/it/MSITE-458/src/site/apt/index.apt | 32 + src/it/MSITE-458/src/site/site.xml | 5 + src/it/{MSITE-159 => MSITE-458}/verify.bsh | 21 +- src/it/MSITE-497/apps/app/pom.xml | 26 + .../app/src/main/java/org/apache/maven/App.java | 12 + .../src/test/java/org/apache/maven/AppTest.java | 38 ++ src/it/MSITE-497/apps/pom.xml | 17 + src/it/MSITE-497/invoker.properties | 1 + src/it/MSITE-497/pom.xml | 76 +++ src/it/MSITE-497/src/site/apt/index.apt | 18 + src/it/MSITE-497/src/site/site.xml | 14 + src/it/MSITE-504/invoker.properties | 1 + src/it/MSITE-504/maven-plugin-consumer/pom.xml | 24 + src/it/MSITE-504/maven-plugin/pom.xml | 23 + .../src/main/java/msite504/mavenplugin/MyMojo.java | 48 ++ src/it/MSITE-504/pom.xml | 35 + src/it/MSITE-506/invoker.properties | 1 + src/it/MSITE-506/pom.xml | 43 ++ .../MSITE-506/src/main/java/mavenjavadoc/App.java | 13 + .../src/test/java/mavenjavadoc/AppTest.java | 38 ++ src/it/MSITE-507/invoker.properties | 1 + src/it/MSITE-507/pom.xml | 749 +++++++++++++++++++++ .../MSITE-507/src/main/java/my/group/id/App.java | 10 + .../src/test/java/my/group/id/AppTest.java | 18 + .../invoker.properties | 0 src/it/MSITE-512/parent-usage-test/pom.xml | 67 ++ .../parent-usage-test/src/main/java/App.java | 12 + .../main/java/org/apache/maven/titi/AppFoo.java | 12 + .../src/main/java/org/apache/maven/toto/App.java | 12 + .../src/main/javadoc/stylesheet.css | 32 + .../parent-usage-test/src/test/java/AppTest.java | 36 + src/it/MSITE-512/pom.xml | 26 + .../{surefire-report => MSITE-512}/verify.groovy | 13 +- src/it/MSITE-537/verify.bsh | 2 +- src/it/MSITE-548/verify.bsh | 2 +- src/it/MSITE-550/pom.xml | 30 + src/it/MSITE-550/src/site/apt/index.apt | 17 + src/it/MSITE-550/src/site/site.vm | 2 + src/it/MSITE-550/src/site/site.xml | 14 + src/it/{MSITE-537 => MSITE-550}/verify.bsh | 22 +- src/it/MSITE-566/verify.bsh | 2 +- src/it/MSITE-582/child/pom.xml | 35 + .../child}/src/site/site.xml | 20 +- src/it/MSITE-582/pom.xml | 65 ++ src/it/{MSITE-265 => MSITE-582}/src/site/site.xml | 22 +- .../{surefire-report => MSITE-582}/verify.groovy | 11 +- src/it/emma-plugin-it/a/pom.xml | 15 + .../a/src/main/java/hello/Hello.java | 10 + .../a/src/test/java/hello/HelloTest.java | 13 + src/it/emma-plugin-it/b/pom.xml | 15 + .../b/src/main/java/byebye/ByeBye.java | 10 + .../b/src/test/java/byebye/ByeByeTest.java | 14 + .../invoker.properties | 0 src/it/emma-plugin-it/pom.xml | 63 ++ src/it/emma-plugin-it/verify.bsh | 29 + src/it/empty-report-set/pom.xml | 58 ++ src/it/empty-report-set/verify.bsh | 10 + src/it/full-reporting/invoker.properties | 1 + src/it/full-reporting/pom.xml | 54 +- src/it/full-reporting/profiles.txt | 1 - src/it/full-reporting/verify.groovy | 86 ++- src/it/inheritedMenus/invoker.properties | 1 + .../parentAsRef/childAsRef/grandChildAsRef/pom.xml | 16 - .../inheritedMenus/parentAsRef/childAsRef/pom.xml | 16 - .../childNotAsRef/grandChildNotAsRef/pom.xml | 16 - .../parentNotAsRef/childNotAsRef/pom.xml | 16 - src/it/inheritedMenus/verify.bsh | 25 +- .../child}/pom.xml | 16 +- src/it/inheritedReports/invoker.properties | 4 + src/it/inheritedReports/pom.xml | 46 ++ src/it/{MSITE-537 => inheritedReports}/verify.bsh | 32 +- src/it/interpolation/invoker.properties | 2 + src/it/interpolation/parent/pom.xml | 45 ++ src/it/interpolation/pom.xml | 67 ++ .../{MSITE-265 => interpolation}/src/site/site.xml | 17 +- .../src/site/xdoc/index.xml} | 25 +- src/it/{MSITE-159 => interpolation}/verify.bsh | 27 +- src/it/it-plugin-test/pom.xml | 37 + .../java/org/apache/maven/plugins/it/MyMojo.java | 81 +++ .../invoker.properties | 0 src/it/{full-reporting => no-version}/pom.xml | 32 +- .../org/apache/maven/plugins/site/its/App.java | 13 + .../org/apache/maven/plugins/site/its/AppTest.java | 44 ++ .../{surefire-report => no-version}/verify.groovy | 60 +- .../invoker.properties | 0 src/it/report-changes-generation/pom.xml | 112 +++ .../src/changes/changes.xml | 65 ++ src/it/report-changes-generation/verify.bsh | 81 +++ src/it/site-attach-descriptor/verify.bsh | 3 +- src/it/site-deploy/verify.bsh | 4 +- src/it/site-inheritance/verify.bsh | 2 +- src/it/site-jar/verify.bsh | 3 +- src/it/site-skip/invoker.properties | 2 + src/it/site-skip/pom.xml | 38 ++ src/it/site-skip/site/pom.xml | 15 + src/it/site-skip/skip-site-deploy/pom.xml | 27 + src/it/site-skip/skip-site/pom.xml | 28 + src/it/site-skip/verify.bsh | 159 +++++ src/it/site-stage-deploy/verify.bsh | 2 +- src/it/surefire-report/verify.groovy | 10 +- .../top-parent-different-site/invoker.properties | 2 + src/it/top-parent-different-site/module1/pom.xml | 16 + src/it/top-parent-different-site/pom.xml | 31 + src/it/top-parent-different-site/root/pom.xml | 33 + .../verify.bsh | 25 +- src/it/top-parent-no-site/verify.bsh | 2 +- .../maven/plugins/site/AbstractDeployMojo.java | 126 ++-- .../plugins/site/AbstractSiteRenderingMojo.java | 10 +- .../maven/plugins/site/ReportDocumentRenderer.java | 4 +- .../apache/maven/plugins/site/SiteDeployMojo.java | 14 +- .../org/apache/maven/plugins/site/SiteMojo.java | 16 +- .../maven/plugins/site/SiteStageDeployMojo.java | 10 +- .../apache/maven/plugins/site/SiteStageMojo.java | 6 +- src/main/resources/site-plugin_fr.properties | 6 +- src/site/apt/index.apt | 10 +- src/site/apt/migrate.apt | 9 - src/site/fml/faq.fml | 6 +- src/site/xdoc/i18n.xml | 381 +---------- 131 files changed, 3339 insertions(+), 790 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-site-plugin.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
