You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2018/02/25 17:40:17 UTC
svn commit: r1825317 - in /maven/archetypes/trunk:
maven-archetype-plugin-site/src/main/resources-filtered/archetype-resources/
maven-archetype-plugin-site/src/main/resources/archetype-resources/src/site/
maven-archetype-simple/src/main/resources-filte...
Author: hboutemy
Date: Sun Feb 25 17:40:16 2018
New Revision: 1825317
URL: http://svn.apache.org/viewvc?rev=1825317&view=rev
Log:
[MARCHETYPES-55] configure Fluido skin
Modified:
maven/archetypes/trunk/maven-archetype-plugin-site/src/main/resources-filtered/archetype-resources/pom.xml
maven/archetypes/trunk/maven-archetype-plugin-site/src/main/resources/archetype-resources/src/site/site.xml
maven/archetypes/trunk/maven-archetype-simple/src/main/resources-filtered/archetype-resources/pom.xml
maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/src/site/site.xml
maven/archetypes/trunk/maven-archetype-site-simple/src/main/resources-filtered/archetype-resources/pom.xml
maven/archetypes/trunk/maven-archetype-site-simple/src/main/resources/archetype-resources/src/site/site.xml
maven/archetypes/trunk/maven-archetype-site-simple/src/test/resources/projects/it-basic/reference/pom.xml
maven/archetypes/trunk/maven-archetype-site-simple/src/test/resources/projects/it-basic/reference/src/site/site.xml
maven/archetypes/trunk/maven-archetype-site/src/main/resources-filtered/archetype-resources/pom.xml
maven/archetypes/trunk/maven-archetype-site/src/main/resources/archetype-resources/src/site/apt/format.apt
maven/archetypes/trunk/maven-archetype-site/src/main/resources/archetype-resources/src/site/fr/apt/format.apt
maven/archetypes/trunk/maven-archetype-site/src/main/resources/archetype-resources/src/site/site.xml
maven/archetypes/trunk/maven-archetype-site/src/main/resources/archetype-resources/src/site/site_fr.xml
Modified: maven/archetypes/trunk/maven-archetype-plugin-site/src/main/resources-filtered/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-plugin-site/src/main/resources-filtered/archetype-resources/pom.xml?rev=1825317&r1=1825316&r2=1825317&view=diff
==============================================================================
--- maven/archetypes/trunk/maven-archetype-plugin-site/src/main/resources-filtered/archetype-resources/pom.xml (original)
+++ maven/archetypes/trunk/maven-archetype-plugin-site/src/main/resources-filtered/archetype-resources/pom.xml Sun Feb 25 17:40:16 2018
@@ -8,7 +8,7 @@
<artifactId>\${artifactId}</artifactId>
<version>\${version}</version>
- <name>Maven</name>
+ <name>\${artifactId}</name>
<!-- FIXME change it to the project's website -->
<url>http://maven.apache.org/</url>
<inceptionYear>2001</inceptionYear>
@@ -24,9 +24,31 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
+ <build>
+ <pluginManagement><!-- lock down plugins versions to avoid using Maven defaults (may be moved to parent pom) -->
+ <plugins>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>${clean}</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>${site}</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>${pir}</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
<reporting>
<plugins>
<plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<reportSets>
Modified: maven/archetypes/trunk/maven-archetype-plugin-site/src/main/resources/archetype-resources/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-plugin-site/src/main/resources/archetype-resources/src/site/site.xml?rev=1825317&r1=1825316&r2=1825317&view=diff
==============================================================================
--- maven/archetypes/trunk/maven-archetype-plugin-site/src/main/resources/archetype-resources/src/site/site.xml (original)
+++ maven/archetypes/trunk/maven-archetype-plugin-site/src/main/resources/archetype-resources/src/site/site.xml Sun Feb 25 17:40:16 2018
@@ -18,8 +18,25 @@
*/
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
+<project name="${artifactId}" xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
+ <bannerLeft>
+ <name>${artifactId}</name>
+ <src>https://maven.apache.org/images/apache-maven-project.png</src>
+ <href>https://www.apache.org/</href>
+ </bannerLeft>
+
+ <bannerRight>
+ <src>https://maven.apache.org/images/maven-logo-black-on-white.png</src>
+ <href>https://maven.apache.org/</href>
+ </bannerRight>
+
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>1.7</version>
+ </skin>
+
<body>
<menu name="Overview">
<item name="Introduction" href="index.html"/>
@@ -36,5 +53,7 @@
<item name="Alternate Location for the changes.xml File" href="examples/alternate-changes-xml-location.html"/>
<item name="SMTP Authentication" href="examples/smtp-authentication.html"/>
</menu>
+
+ <menu ref="reports" />
</body>
</project>
Modified: maven/archetypes/trunk/maven-archetype-simple/src/main/resources-filtered/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-simple/src/main/resources-filtered/archetype-resources/pom.xml?rev=1825317&r1=1825316&r2=1825317&view=diff
==============================================================================
--- maven/archetypes/trunk/maven-archetype-simple/src/main/resources-filtered/archetype-resources/pom.xml (original)
+++ maven/archetypes/trunk/maven-archetype-simple/src/main/resources-filtered/archetype-resources/pom.xml Sun Feb 25 17:40:16 2018
@@ -70,4 +70,12 @@
</plugins>
</pluginManagement>
</build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
Modified: maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/src/site/site.xml?rev=1825317&r1=1825316&r2=1825317&view=diff
==============================================================================
--- maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/src/site/site.xml (original)
+++ maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/src/site/site.xml Sun Feb 25 17:40:16 2018
@@ -1,8 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
+<project name="${artifactId}" xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
+ <bannerLeft>
+ <name>${artifactId}</name>
+ <src>https://maven.apache.org/images/apache-maven-project.png</src>
+ <href>https://www.apache.org/</href>
+ </bannerLeft>
+
+ <bannerRight>
+ <src>https://maven.apache.org/images/maven-logo-black-on-white.png</src>
+ <href>https://maven.apache.org/</href>
+ </bannerRight>
+
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>1.7</version>
+ </skin>
+
<body>
<menu ref="parent" />
+ <menu ref="reports" />
</body>
</project>
\ No newline at end of file
Modified: maven/archetypes/trunk/maven-archetype-site-simple/src/main/resources-filtered/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-site-simple/src/main/resources-filtered/archetype-resources/pom.xml?rev=1825317&r1=1825316&r2=1825317&view=diff
==============================================================================
--- maven/archetypes/trunk/maven-archetype-site-simple/src/main/resources-filtered/archetype-resources/pom.xml (original)
+++ maven/archetypes/trunk/maven-archetype-site-simple/src/main/resources-filtered/archetype-resources/pom.xml Sun Feb 25 17:40:16 2018
@@ -39,4 +39,11 @@
</pluginManagement>
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
Modified: maven/archetypes/trunk/maven-archetype-site-simple/src/main/resources/archetype-resources/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-site-simple/src/main/resources/archetype-resources/src/site/site.xml?rev=1825317&r1=1825316&r2=1825317&view=diff
==============================================================================
--- maven/archetypes/trunk/maven-archetype-site-simple/src/main/resources/archetype-resources/src/site/site.xml (original)
+++ maven/archetypes/trunk/maven-archetype-site-simple/src/main/resources/archetype-resources/src/site/site.xml Sun Feb 25 17:40:16 2018
@@ -1,14 +1,33 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<project name="Maven" xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
+<project name="${artifactId}" xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
+ <bannerLeft>
+ <name>${artifactId}</name>
+ <src>https://maven.apache.org/images/apache-maven-project.png</src>
+ <href>https://www.apache.org/</href>
+ </bannerLeft>
+
+ <bannerRight>
+ <src>https://maven.apache.org/images/maven-logo-black-on-white.png</src>
+ <href>https://maven.apache.org/</href>
+ </bannerRight>
+
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>1.7</version>
+ </skin>
+
<body>
<links>
- <item name="Maven" href="http://maven.apache.org/"/>
+ <item name="Maven" href="https://maven.apache.org/"/>
</links>
<menu name="Documentation">
<!--<item name="Xdoc Example" href="xdoc.html"/>-->
</menu>
+
+ <menu ref="reports" />
</body>
</project>
Modified: maven/archetypes/trunk/maven-archetype-site-simple/src/test/resources/projects/it-basic/reference/pom.xml
URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-site-simple/src/test/resources/projects/it-basic/reference/pom.xml?rev=1825317&r1=1825316&r2=1825317&view=diff
==============================================================================
--- maven/archetypes/trunk/maven-archetype-site-simple/src/test/resources/projects/it-basic/reference/pom.xml (original)
+++ maven/archetypes/trunk/maven-archetype-site-simple/src/test/resources/projects/it-basic/reference/pom.xml Sun Feb 25 17:40:16 2018
@@ -39,4 +39,11 @@
</pluginManagement>
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
Modified: maven/archetypes/trunk/maven-archetype-site-simple/src/test/resources/projects/it-basic/reference/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-site-simple/src/test/resources/projects/it-basic/reference/src/site/site.xml?rev=1825317&r1=1825316&r2=1825317&view=diff
==============================================================================
--- maven/archetypes/trunk/maven-archetype-site-simple/src/test/resources/projects/it-basic/reference/src/site/site.xml (original)
+++ maven/archetypes/trunk/maven-archetype-site-simple/src/test/resources/projects/it-basic/reference/src/site/site.xml Sun Feb 25 17:40:16 2018
@@ -1,14 +1,33 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<project name="Maven" xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
+<project name="${artifactId}" xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
+ <bannerLeft>
+ <name>${artifactId}</name>
+ <src>https://maven.apache.org/images/apache-maven-project.png</src>
+ <href>https://www.apache.org/</href>
+ </bannerLeft>
+
+ <bannerRight>
+ <src>https://maven.apache.org/images/maven-logo-black-on-white.png</src>
+ <href>https://maven.apache.org/</href>
+ </bannerRight>
+
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>1.7</version>
+ </skin>
+
<body>
<links>
- <item name="Maven" href="http://maven.apache.org/"/>
+ <item name="Maven" href="https://maven.apache.org/"/>
</links>
<menu name="Documentation">
<!--<item name="Xdoc Example" href="xdoc.html"/>-->
</menu>
+
+ <menu ref="reports" />
</body>
</project>
Modified: maven/archetypes/trunk/maven-archetype-site/src/main/resources-filtered/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-site/src/main/resources-filtered/archetype-resources/pom.xml?rev=1825317&r1=1825316&r2=1825317&view=diff
==============================================================================
--- maven/archetypes/trunk/maven-archetype-site/src/main/resources-filtered/archetype-resources/pom.xml (original)
+++ maven/archetypes/trunk/maven-archetype-site/src/main/resources-filtered/archetype-resources/pom.xml Sun Feb 25 17:40:16 2018
@@ -51,4 +51,12 @@
</plugin>
</plugins>
</build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
Modified: maven/archetypes/trunk/maven-archetype-site/src/main/resources/archetype-resources/src/site/apt/format.apt
URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-site/src/main/resources/archetype-resources/src/site/apt/format.apt?rev=1825317&r1=1825316&r2=1825317&view=diff
==============================================================================
--- maven/archetypes/trunk/maven-archetype-site/src/main/resources/archetype-resources/src/site/apt/format.apt (original)
+++ maven/archetypes/trunk/maven-archetype-site/src/main/resources/archetype-resources/src/site/apt/format.apt Sun Feb 25 17:40:16 2018
@@ -130,7 +130,7 @@ other lines of the paragraph.
Paragraph 2, line 2.
+----------------------+
- Paragraphs are indented. They have already been described in the {{document
+ Paragraphs are indented. They have already been described in the {{Document
structure}} section.
*** Section
Modified: maven/archetypes/trunk/maven-archetype-site/src/main/resources/archetype-resources/src/site/fr/apt/format.apt
URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-site/src/main/resources/archetype-resources/src/site/fr/apt/format.apt?rev=1825317&r1=1825316&r2=1825317&view=diff
==============================================================================
--- maven/archetypes/trunk/maven-archetype-site/src/main/resources/archetype-resources/src/site/fr/apt/format.apt (original)
+++ maven/archetypes/trunk/maven-archetype-site/src/main/resources/archetype-resources/src/site/fr/apt/format.apt Sun Feb 25 17:40:16 2018
@@ -130,7 +130,7 @@ other lines of the paragraph.
Paragraph 2, line 2.
+----------------------+
- Paragraphs are indented. They have already been described in the {{document
+ Paragraphs are indented. They have already been described in the {{Document
structure}} section.
*** Section
Modified: maven/archetypes/trunk/maven-archetype-site/src/main/resources/archetype-resources/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-site/src/main/resources/archetype-resources/src/site/site.xml?rev=1825317&r1=1825316&r2=1825317&view=diff
==============================================================================
--- maven/archetypes/trunk/maven-archetype-site/src/main/resources/archetype-resources/src/site/site.xml (original)
+++ maven/archetypes/trunk/maven-archetype-site/src/main/resources/archetype-resources/src/site/site.xml Sun Feb 25 17:40:16 2018
@@ -1,27 +1,36 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<project name="Maven" xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
+<project name="${artifactId}" xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
<bannerLeft>
- <name>Maven</name>
- <src>http://maven.apache.org/images/apache-maven-project.png</src>
- <href>http://maven.apache.org/</href>
+ <name>${artifactId}</name>
+ <src>https://maven.apache.org/images/apache-maven-project.png</src>
+ <href>https://www.apache.org/</href>
</bannerLeft>
+
<bannerRight>
- <src>http://maven.apache.org/images/maven-small.gif</src>
+ <src>https://maven.apache.org/images/maven-logo-black-on-white.png</src>
+ <href>https://maven.apache.org/</href>
</bannerRight>
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>1.7</version>
+ </skin>
+
<body>
<links>
<item name="Apache" href="http://www.apache.org/" />
- <item name="Maven 1.0" href="http://maven.apache.org/"/>
- <item name="Maven 2" href="http://maven.apache.org/maven2/"/>
+ <item name="Maven" href="https://maven.apache.org/"/>
</links>
- <menu name="Maven 2.0">
+ <menu name="Examples">
<item name="APT Format" href="format.html"/>
<item name="FAQ" href="faq.html"/>
<item name="Xdoc Example" href="xdoc.html"/>
</menu>
+
+ <menu ref="reports" />
</body>
</project>
Modified: maven/archetypes/trunk/maven-archetype-site/src/main/resources/archetype-resources/src/site/site_fr.xml
URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-site/src/main/resources/archetype-resources/src/site/site_fr.xml?rev=1825317&r1=1825316&r2=1825317&view=diff
==============================================================================
--- maven/archetypes/trunk/maven-archetype-site/src/main/resources/archetype-resources/src/site/site_fr.xml (original)
+++ maven/archetypes/trunk/maven-archetype-site/src/main/resources/archetype-resources/src/site/site_fr.xml Sun Feb 25 17:40:16 2018
@@ -3,25 +3,34 @@
<project name="Maven" xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
<bannerLeft>
- <name>Maven</name>
- <src>http://maven.apache.org/images/apache-maven-project.png</src>
- <href>http://maven.apache.org/</href>
+ <name>${artifactId}</name>
+ <src>https://maven.apache.org/images/apache-maven-project.png</src>
+ <href>https://www.apache.org/</href>
</bannerLeft>
+
<bannerRight>
- <src>http://maven.apache.org/images/maven-small.gif</src>
+ <src>https://maven.apache.org/images/maven-logo-black-on-white.png</src>
+ <href>https://maven.apache.org/</href>
</bannerRight>
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>1.7</version>
+ </skin>
+
<body>
<links>
<item name="Apache" href="http://www.apache.org/" />
- <item name="Maven 1.0" href="http://maven.apache.org/"/>
- <item name="Maven 2" href="http://maven.apache.org/maven2/"/>
+ <item name="Maven" href="https://maven.apache.org/"/>
</links>
- <menu name="Maven 2.0">
+ <menu name="Exemples">
<item name="Format APT" href="format.html"/>
<item name="FAQ" href="faq.html"/>
<item name="Exemple Xdoc" href="xdoc.html"/>
</menu>
+
+ <menu ref="reports" />
</body>
</project>