Author: hboutemy Date: Tue Mar 13 22:02:08 2018 New Revision: 1826685 URL: http://svn.apache.org/viewvc?rev=1826685&view=rev Log: fixed warnings in generated projects from archetypes
Modified: maven/archetypes/trunk/maven-archetype-archetype/src/main/resources-filtered/archetype-resources/src/main/resources/archetype-resources/pom.xml maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources-filtered/archetype-resources/pom.xml maven/archetypes/trunk/maven-archetype-plugin-site/src/main/resources-filtered/archetype-resources/pom.xml maven/archetypes/trunk/maven-archetype-portlet/src/main/resources-filtered/archetype-resources/pom.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/apt/index.apt 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/apt/index.apt maven/archetypes/trunk/maven-archetype-site-skin/src/main/resources/archetype-resources/src/it/sample/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/fml/faq.fml maven/archetypes/trunk/plugin-versions.properties Modified: maven/archetypes/trunk/maven-archetype-archetype/src/main/resources-filtered/archetype-resources/src/main/resources/archetype-resources/pom.xml URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-archetype/src/main/resources-filtered/archetype-resources/src/main/resources/archetype-resources/pom.xml?rev=1826685&r1=1826684&r2=1826685&view=diff ============================================================================== --- maven/archetypes/trunk/maven-archetype-archetype/src/main/resources-filtered/archetype-resources/src/main/resources/archetype-resources/pom.xml (original) +++ maven/archetypes/trunk/maven-archetype-archetype/src/main/resources-filtered/archetype-resources/src/main/resources/archetype-resources/pom.xml Tue Mar 13 22:02:08 2018 @@ -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> Modified: maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources-filtered/archetype-resources/pom.xml URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources-filtered/archetype-resources/pom.xml?rev=1826685&r1=1826684&r2=1826685&view=diff ============================================================================== --- maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources-filtered/archetype-resources/pom.xml (original) +++ maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources-filtered/archetype-resources/pom.xml Tue Mar 13 22:02:08 2018 @@ -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> 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=1826685&r1=1826684&r2=1826685&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 Tue Mar 13 22:02:08 2018 @@ -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> Modified: maven/archetypes/trunk/maven-archetype-portlet/src/main/resources-filtered/archetype-resources/pom.xml URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-portlet/src/main/resources-filtered/archetype-resources/pom.xml?rev=1826685&r1=1826684&r2=1826685&view=diff ============================================================================== --- maven/archetypes/trunk/maven-archetype-portlet/src/main/resources-filtered/archetype-resources/pom.xml (original) +++ maven/archetypes/trunk/maven-archetype-portlet/src/main/resources-filtered/archetype-resources/pom.xml Tue Mar 13 22:02:08 2018 @@ -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> 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=1826685&r1=1826684&r2=1826685&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 Tue Mar 13 22:02:08 2018 @@ -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> Modified: maven/archetypes/trunk/maven-archetype-site-simple/src/main/resources/archetype-resources/src/site/apt/index.apt URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-site-simple/src/main/resources/archetype-resources/src/site/apt/index.apt?rev=1826685&r1=1826684&r2=1826685&view=diff ============================================================================== --- maven/archetypes/trunk/maven-archetype-site-simple/src/main/resources/archetype-resources/src/site/apt/index.apt (original) +++ maven/archetypes/trunk/maven-archetype-site-simple/src/main/resources/archetype-resources/src/site/apt/index.apt Tue Mar 13 22:02:08 2018 @@ -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: +-----+ 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=1826685&r1=1826684&r2=1826685&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 Tue Mar 13 22:02:08 2018 @@ -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> Modified: maven/archetypes/trunk/maven-archetype-site-simple/src/test/resources/projects/it-basic/reference/src/site/apt/index.apt URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-site-simple/src/test/resources/projects/it-basic/reference/src/site/apt/index.apt?rev=1826685&r1=1826684&r2=1826685&view=diff ============================================================================== --- maven/archetypes/trunk/maven-archetype-site-simple/src/test/resources/projects/it-basic/reference/src/site/apt/index.apt (original) +++ maven/archetypes/trunk/maven-archetype-site-simple/src/test/resources/projects/it-basic/reference/src/site/apt/index.apt Tue Mar 13 22:02:08 2018 @@ -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: +-----+ Modified: maven/archetypes/trunk/maven-archetype-site-skin/src/main/resources/archetype-resources/src/it/sample/pom.xml URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-site-skin/src/main/resources/archetype-resources/src/it/sample/pom.xml?rev=1826685&r1=1826684&r2=1826685&view=diff ============================================================================== --- maven/archetypes/trunk/maven-archetype-site-skin/src/main/resources/archetype-resources/src/it/sample/pom.xml (original) +++ maven/archetypes/trunk/maven-archetype-site-skin/src/main/resources/archetype-resources/src/it/sample/pom.xml Tue Mar 13 22:02:08 2018 @@ -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> 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=1826685&r1=1826684&r2=1826685&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 Tue Mar 13 22:02:08 2018 @@ -100,7 +100,7 @@ other lines of the paragraph. 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 Modified: maven/archetypes/trunk/maven-archetype-site/src/main/resources/archetype-resources/src/site/fml/faq.fml URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-site/src/main/resources/archetype-resources/src/site/fml/faq.fml?rev=1826685&r1=1826684&r2=1826685&view=diff ============================================================================== --- maven/archetypes/trunk/maven-archetype-site/src/main/resources/archetype-resources/src/site/fml/faq.fml (original) +++ maven/archetypes/trunk/maven-archetype-site/src/main/resources/archetype-resources/src/site/fml/faq.fml Tue Mar 13 22:02:08 2018 @@ -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"> Modified: maven/archetypes/trunk/plugin-versions.properties URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/plugin-versions.properties?rev=1826685&r1=1826684&r2=1826685&view=diff ============================================================================== --- maven/archetypes/trunk/plugin-versions.properties (original) +++ maven/archetypes/trunk/plugin-versions.properties Tue Mar 13 22:02:08 2018 @@ -14,3 +14,4 @@ rar 2.4 archetype 3.0.1 invoker 3.0.1 pir 2.9 +javadoc 3.0.0 \ No newline at end of file