Author: tchemit Date: 2013-12-25 17:56:23 +0100 (Wed, 25 Dec 2013) New Revision: 293 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/293 Log: refs #2987: updates mavenpom to 4.5 + tidy poms and site.xml Modified: trunk/nuiton-gwt/pom.xml trunk/nuiton-rss/pom.xml trunk/nuiton-rss/src/site/site_fr.xml trunk/nuiton-struts2/pom.xml trunk/nuiton-struts2/src/site/site_fr.xml trunk/nuiton-tapestry/pom.xml trunk/nuiton-web/pom.xml trunk/nuiton-web/src/site/site_fr.xml trunk/pom.xml trunk/src/site/site_fr.xml Modified: trunk/nuiton-gwt/pom.xml =================================================================== --- trunk/nuiton-gwt/pom.xml 2013-12-20 16:56:21 UTC (rev 292) +++ trunk/nuiton-gwt/pom.xml 2013-12-25 16:56:23 UTC (rev 293) @@ -3,10 +3,6 @@ <modelVersion>4.0.0</modelVersion> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> - <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> @@ -25,20 +21,9 @@ </dependencies> - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> - <name>Nuiton Web :: Nuiton GWT</name> <description>Extra classes for GWT based applications</description> - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> - - <packaging>jar</packaging> - - <build> <plugins> <plugin> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2013-12-20 16:56:21 UTC (rev 292) +++ trunk/nuiton-rss/pom.xml 2013-12-25 16:56:23 UTC (rev 293) @@ -26,10 +26,6 @@ <modelVersion>4.0.0</modelVersion> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> - <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> @@ -88,21 +84,12 @@ </dependencies> - - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> - <name>Nuiton Web :: Nuiton RSS</name> <description>Servlet pouvant etre appeler depuis du JS pour recuperer un flux RSS </description> <inceptionYear>2008</inceptionYear> - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> - <packaging>war</packaging> <properties> @@ -152,10 +139,6 @@ </pluginManagement> </build> - <!-- ************************************************************* --> - <!-- *** Build Environment ************************************** --> - <!-- ************************************************************* --> - <profiles> <profile> <id>reporting</id> Modified: trunk/nuiton-rss/src/site/site_fr.xml =================================================================== --- trunk/nuiton-rss/src/site/site_fr.xml 2013-12-20 16:56:21 UTC (rev 292) +++ trunk/nuiton-rss/src/site/site_fr.xml 2013-12-25 16:56:23 UTC (rev 293) @@ -61,7 +61,7 @@ <footer> <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + src="${mavenpomSiteCommonResourcesUrl}/js/maven-site-nuiton.org.js"> </script> <div id='projectMetas' @@ -73,7 +73,9 @@ scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> + piwikId='${project.piwikId}' + scmwebeditor_skipDefaultFiles="true" + > </div> </footer> </body> Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2013-12-20 16:56:21 UTC (rev 292) +++ trunk/nuiton-struts2/pom.xml 2013-12-25 16:56:23 UTC (rev 293) @@ -3,10 +3,6 @@ <modelVersion>4.0.0</modelVersion> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> - <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> Modified: trunk/nuiton-struts2/src/site/site_fr.xml =================================================================== --- trunk/nuiton-struts2/src/site/site_fr.xml 2013-12-20 16:56:21 UTC (rev 292) +++ trunk/nuiton-struts2/src/site/site_fr.xml 2013-12-25 16:56:23 UTC (rev 293) @@ -61,7 +61,7 @@ <footer> <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + src="${mavenpomSiteCommonResourcesUrl}/js/maven-site-nuiton.org.js"> </script> <div id='projectMetas' @@ -73,7 +73,9 @@ scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> + piwikId='${project.piwikId}' + scmwebeditor_skipDefaultFiles="true" + > </div> </footer> </body> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2013-12-20 16:56:21 UTC (rev 292) +++ trunk/nuiton-tapestry/pom.xml 2013-12-25 16:56:23 UTC (rev 293) @@ -3,10 +3,6 @@ <modelVersion>4.0.0</modelVersion> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> - <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> @@ -59,20 +55,9 @@ </dependencies> - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> - <name>Nuiton Web :: Nuiton Tapestry</name> <description>Extra classes for Tapestry based applications</description> - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> - - <packaging>jar</packaging> - - <build> <plugins> <plugin> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2013-12-20 16:56:21 UTC (rev 292) +++ trunk/nuiton-web/pom.xml 2013-12-25 16:56:23 UTC (rev 293) @@ -4,10 +4,6 @@ <modelVersion>4.0.0</modelVersion> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> - <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> @@ -61,19 +57,10 @@ </dependencies> - - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> - <name>Nuiton Web :: Nuiton Web</name> <description>Usefull classes for web developpement.</description> <inceptionYear>2011</inceptionYear> - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> - <properties> <!-- extra files to include in release --> @@ -85,10 +72,6 @@ </build> - <!-- ************************************************************* --> - <!-- *** Build Environment ************************************** --> - <!-- ************************************************************* --> - <profiles> <!-- create assemblies at release time --> Modified: trunk/nuiton-web/src/site/site_fr.xml =================================================================== --- trunk/nuiton-web/src/site/site_fr.xml 2013-12-20 16:56:21 UTC (rev 292) +++ trunk/nuiton-web/src/site/site_fr.xml 2013-12-25 16:56:23 UTC (rev 293) @@ -63,7 +63,7 @@ <footer> <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + src="${mavenpomSiteCommonResourcesUrl}/js/maven-site-nuiton.org.js"> </script> <div id='projectMetas' @@ -75,7 +75,10 @@ scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> + piwikId='${project.piwikId}' + scmwebeditor_vmFiles=",MonitoringFilter.html,TopiaFilter.html,WarLauncher.html," + scmwebeditor_skipDefaultFiles="true" + > </div> </footer> </body> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-12-20 16:56:21 UTC (rev 292) +++ trunk/pom.xml 2013-12-25 16:56:23 UTC (rev 293) @@ -3,14 +3,10 @@ <modelVersion>4.0.0</modelVersion> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> - <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>4.4</version> + <version>4.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.web</groupId> @@ -201,16 +197,11 @@ </dependencyManagement> - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> - <name>Nuiton Web</name> <description>Common ressources for web applications</description> <inceptionYear>2010</inceptionYear> <url>http://maven-site.nuiton.org/nuiton-web/</url> - <!-- Developpers, contributors... --> <developers> <developer> <id>fdesbois</id> @@ -254,10 +245,6 @@ </developer> </developers> - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> - <packaging>pom</packaging> <properties> @@ -347,16 +334,12 @@ <excludeDefaults>true</excludeDefaults> </reporting> - <!-- ************************************************************* --> - <!-- *** Build Environment ************************************** --> - <!-- ************************************************************* --> - <scm> <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk</connection> <developerConnection> scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk </developerConnection> - <url>http://www.nuiton.org/projects/nuiton-web/repository/show/trunk</url> + <url>http://nuiton.org/projects/nuiton-web/repository/show/trunk</url> </scm> <distributionManagement> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2013-12-20 16:56:21 UTC (rev 292) +++ trunk/src/site/site_fr.xml 2013-12-25 16:56:23 UTC (rev 293) @@ -30,7 +30,7 @@ <skin> <groupId>org.apache.maven.skins</groupId> <artifactId>maven-fluido-skin</artifactId> - <version>1.2.1</version> + <version>${fluidoSkinVersion}</version> </skin> <custom> @@ -84,7 +84,7 @@ <footer> <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + src="${mavenpomSiteCommonResourcesUrl}/js/maven-site-nuiton.org.js"> </script> <div id='projectMetas' @@ -96,7 +96,9 @@ scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> + piwikId='${project.piwikId}' + scmwebeditor_skipDefaultFiles="true" + > </div> </footer>