fixed warnings in generated projects from archetypes
git-svn-id: https://svn.apache.org/repos/asf/maven/archetypes/trunk@1826685 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/maven-archetype-archetype/src/main/resources-filtered/archetype-resources/src/main/resources/archetype-resources/pom.xml b/maven-archetype-archetype/src/main/resources-filtered/archetype-resources/src/main/resources/archetype-resources/pom.xml
index 5f24e3b..2e4b270 100644
--- a/maven-archetype-archetype/src/main/resources-filtered/archetype-resources/src/main/resources/archetype-resources/pom.xml
+++ b/maven-archetype-archetype/src/main/resources-filtered/archetype-resources/src/main/resources/archetype-resources/pom.xml
@@ -8,6 +8,12 @@
<artifactId>\${artifactId}</artifactId>
<version>\${version}</version>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.compiler.source>1.7</project.compiler.source>
+ <project.compiler.target>1.7</project.compiler.target>
+ </properties>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
diff --git a/maven-archetype-j2ee-simple/src/main/resources-filtered/archetype-resources/pom.xml b/maven-archetype-j2ee-simple/src/main/resources-filtered/archetype-resources/pom.xml
index 0809893..c454f7d 100644
--- a/maven-archetype-j2ee-simple/src/main/resources-filtered/archetype-resources/pom.xml
+++ b/maven-archetype-j2ee-simple/src/main/resources-filtered/archetype-resources/pom.xml
@@ -102,6 +102,10 @@
<artifactId>maven-deploy-plugin</artifactId>
<version>${deploy}</version>
</plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${javadoc}</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
diff --git a/maven-archetype-plugin-site/src/main/resources-filtered/archetype-resources/pom.xml b/maven-archetype-plugin-site/src/main/resources-filtered/archetype-resources/pom.xml
index 2c49227..b56344f 100644
--- a/maven-archetype-plugin-site/src/main/resources-filtered/archetype-resources/pom.xml
+++ b/maven-archetype-plugin-site/src/main/resources-filtered/archetype-resources/pom.xml
@@ -39,6 +39,10 @@
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>${pir}</version>
</plugin>
+ <plugin>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>${plugin}</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
diff --git a/maven-archetype-portlet/src/main/resources-filtered/archetype-resources/pom.xml b/maven-archetype-portlet/src/main/resources-filtered/archetype-resources/pom.xml
index 4b5de57..ad728d2 100644
--- a/maven-archetype-portlet/src/main/resources-filtered/archetype-resources/pom.xml
+++ b/maven-archetype-portlet/src/main/resources-filtered/archetype-resources/pom.xml
@@ -27,7 +27,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>jstl</groupId>
+ <groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<version>1.0.2</version>
</dependency>
diff --git a/maven-archetype-site-simple/src/main/resources-filtered/archetype-resources/pom.xml b/maven-archetype-site-simple/src/main/resources-filtered/archetype-resources/pom.xml
index 4d5d2d3..d79488d 100644
--- a/maven-archetype-site-simple/src/main/resources-filtered/archetype-resources/pom.xml
+++ b/maven-archetype-site-simple/src/main/resources-filtered/archetype-resources/pom.xml
@@ -9,6 +9,9 @@
<version>\${version}</version>
<packaging>pom</packaging>
+ <!-- FIXME change it to the project's website -->
+ <url>http://www.example.com</url>
+
<distributionManagement>
<site>
<id>website</id>
diff --git a/maven-archetype-site-simple/src/main/resources/archetype-resources/src/site/apt/index.apt b/maven-archetype-site-simple/src/main/resources/archetype-resources/src/site/apt/index.apt
index 31b6246..cf4c309 100644
--- a/maven-archetype-site-simple/src/main/resources/archetype-resources/src/site/apt/index.apt
+++ b/maven-archetype-site-simple/src/main/resources/archetype-resources/src/site/apt/index.apt
@@ -3,13 +3,13 @@
-----
Author Here
-----
- Date Here
+ Date Here (AAAA-MM-DD)
-----
Maven Site for your project
Congratulations! If you are looking at this page then you have successfully generated a
- template site employing the site archetype and you have run:
+ template site employing the simple site archetype and you have run:
+-----+
diff --git a/maven-archetype-site-simple/src/test/resources/projects/it-basic/reference/pom.xml b/maven-archetype-site-simple/src/test/resources/projects/it-basic/reference/pom.xml
index cc1dca2..4a3f680 100644
--- a/maven-archetype-site-simple/src/test/resources/projects/it-basic/reference/pom.xml
+++ b/maven-archetype-site-simple/src/test/resources/projects/it-basic/reference/pom.xml
@@ -9,6 +9,9 @@
<version>0.1-SNAPSHOT</version>
<packaging>pom</packaging>
+ <!-- FIXME change it to the project's website -->
+ <url>http://www.example.com</url>
+
<distributionManagement>
<site>
<id>website</id>
diff --git a/maven-archetype-site-simple/src/test/resources/projects/it-basic/reference/src/site/apt/index.apt b/maven-archetype-site-simple/src/test/resources/projects/it-basic/reference/src/site/apt/index.apt
index 31b6246..cf4c309 100644
--- a/maven-archetype-site-simple/src/test/resources/projects/it-basic/reference/src/site/apt/index.apt
+++ b/maven-archetype-site-simple/src/test/resources/projects/it-basic/reference/src/site/apt/index.apt
@@ -3,13 +3,13 @@
-----
Author Here
-----
- Date Here
+ Date Here (AAAA-MM-DD)
-----
Maven Site for your project
Congratulations! If you are looking at this page then you have successfully generated a
- template site employing the site archetype and you have run:
+ template site employing the simple site archetype and you have run:
+-----+
diff --git a/maven-archetype-site-skin/src/main/resources/archetype-resources/src/it/sample/pom.xml b/maven-archetype-site-skin/src/main/resources/archetype-resources/src/it/sample/pom.xml
index 66962df..5090b63 100644
--- a/maven-archetype-site-skin/src/main/resources/archetype-resources/src/it/sample/pom.xml
+++ b/maven-archetype-site-skin/src/main/resources/archetype-resources/src/it/sample/pom.xml
@@ -10,12 +10,15 @@
<packaging>jar</packaging>
<name>@project.artifactId@ IT</name>
+ <!-- FIXME change it to the project's website -->
+ <url>http://www.example.com</url>
<properties>
<skinName>@project.name@</skinName>
<skinGroupId>@project.groupId@</skinGroupId>
<skinArtifactId>@project.artifactId@</skinArtifactId>
<skinVersion>@project.version@</skinVersion>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
diff --git a/maven-archetype-site/src/main/resources/archetype-resources/src/site/apt/format.apt b/maven-archetype-site/src/main/resources/archetype-resources/src/site/apt/format.apt
index 33ae451..39bb340 100644
--- a/maven-archetype-site/src/main/resources/archetype-resources/src/site/apt/format.apt
+++ b/maven-archetype-site/src/main/resources/archetype-resources/src/site/apt/format.apt
@@ -100,7 +100,7 @@
several consecutive lines of text which specifies the author of the
document.
- The author sub-block may optionaly be followed by a date sub-block using the
+ The author sub-block may optionally be followed by a date sub-block using the
same syntax.
The following example is used for a document with an title and a date but
diff --git a/maven-archetype-site/src/main/resources/archetype-resources/src/site/fml/faq.fml b/maven-archetype-site/src/main/resources/archetype-resources/src/site/fml/faq.fml
index b8c4d47..ba39c83 100644
--- a/maven-archetype-site/src/main/resources/archetype-resources/src/site/fml/faq.fml
+++ b/maven-archetype-site/src/main/resources/archetype-resources/src/site/fml/faq.fml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<faqs xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/FML/1.0"
- xsi:schemaLocation="http://maven.apache.org/FML/1.0 http://maven.apache.org/xsd/fml-1.0.xsd"
+<faqs xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://maven.apache.org/FML/1.0"
+ xsi:schemaLocation="https://maven.apache.org/FML/1.0 https://maven.apache.org/xsd/fml-1.0.xsd"
id="General FAQ">
<part id="General">
<faq id="where">
diff --git a/plugin-versions.properties b/plugin-versions.properties
index db1c658..6252126 100644
--- a/plugin-versions.properties
+++ b/plugin-versions.properties
@@ -14,3 +14,4 @@
archetype 3.0.1
invoker 3.0.1
pir 2.9
+javadoc 3.0.0
\ No newline at end of file
