This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-validator. See http://git.nuiton.org/nuiton-validator.git commit 8c20695a38ed10bbde9481624d852e32ef7e7f11 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Aug 3 10:47:32 2014 +0200 fixes #3397: Migrates to git fixes #3401: Updates to nuiton-3.0-rc-5 fixes #3402: Updates i18n to 3.3 fixes #3404: Updates xworks to 2.3.16.3 fixes #3405: Use org.javassist:javassist instead of javassist:javassist --- .gitignore | 12 ++++ pom.xml | 89 +++++++++++------------------- src/license/THIRD-PARTY.properties | 3 +- src/site/site.xml | 62 +++++++++++++++++++++ src/site/site_fr.xml | 110 ------------------------------------- 5 files changed, 106 insertions(+), 170 deletions(-) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d14ee6f --- /dev/null +++ b/.gitignore @@ -0,0 +1,12 @@ +/target +/*/target +/*.ipr +/*/*.ipr +/.idea +/*.iws +/*/*.iws +/*.iml +/*/*.iml +/*~ +/*/*~ + diff --git a/pom.xml b/pom.xml index 1e05ee9..e78bfdc 100644 --- a/pom.xml +++ b/pom.xml @@ -4,8 +4,8 @@ <parent> <groupId>org.nuiton</groupId> - <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>4.7</version> + <artifactId>nuitonpom</artifactId> + <version>1.2</version> </parent> <artifactId>nuiton-validator</artifactId> @@ -13,7 +13,7 @@ <name>Nuiton Validator</name> <description>Simple Validator API</description> - <url>https://maven-site.nuiton.org/nuiton-validator</url> + <url>https://doc.nuiton.org/nuiton-validator</url> <inceptionYear>2013</inceptionYear> <developers> @@ -21,7 +21,7 @@ <developer> <name>Tony Chemit</name> <id>tchemit</id> - <email>chemit at codelutin dot com</email> + <email>chemit@codelutin.com</email> <organization>CodeLutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> <timezone>Europe/Paris</timezone> @@ -33,18 +33,15 @@ </developers> <scm> - <connection> - scm:svn:https://nuiton.org/svn/nuiton-validator/trunk - </connection> - <developerConnection> - scm:svn:https://nuiton.org/svn/nuiton-validator/trunk - </developerConnection> - <url>https://nuiton.org/projects/nuiton-validator/repository/show/trunk</url> + <connection>scm:git:http://git.nuiton.org/nuiton-validator.git</connection> + <developerConnection>scm:git:https://git.nuiton.org/nuiton-validator.git</developerConnection> + <url>https://gitweb.nuiton.org/nuiton-validator.git</url> </scm> + <distributionManagement> <site> - <id>${platform}</id> - <url>${our.site.repository}/${projectId}</url> + <id>${site.server}</id> + <url>${site.url}</url> </site> </distributionManagement> @@ -52,7 +49,7 @@ <projectId>nuiton-validator</projectId> - <nuitonI18nVersion>3.0</nuitonI18nVersion> + <nuitonI18nVersion>3.3</nuitonI18nVersion> <!-- i18n configuration --> <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> @@ -72,7 +69,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>3.0-rc-2</version> + <version>3.0-rc-5</version> </dependency> <dependency> @@ -84,7 +81,7 @@ <dependency> <groupId>org.apache.struts.xwork</groupId> <artifactId>xwork-core</artifactId> - <version>2.3.16</version> + <version>2.3.16.3</version> <exclusions> <exclusion> <groupId>asm</groupId> @@ -94,43 +91,61 @@ <groupId>asm</groupId> <artifactId>asm-commons</artifactId> </exclusion> + <exclusion> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + </exclusion> </exclusions> </dependency> <dependency> + <groupId>org.javassist</groupId> + <artifactId>javassist</artifactId> + <version>3.18.2-GA</version> + <scope>runtime</scope> + </dependency> + + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> + <version>1.2</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> + <version>3.3.2</version> </dependency> <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> + <version>1.9.2</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-collections4</artifactId> + <version>4.0</version> </dependency> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> + <version>17.0</version> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> + <version>4.11</version> <scope>test</scope> </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> + <version>1.2.17</version> <scope>provided</scope> </dependency> @@ -185,48 +200,6 @@ </build> <profiles> - - <profile> - <id>reporting</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - - <reporting> - <plugins> - - <plugin> - <artifactId>maven-project-info-reports-plugin</artifactId> - <version>${projectInfoReportsPluginVersion}</version> - <reportSets> - <reportSet> - <reports> - <report>project-team</report> - <report>mailing-list</report> - <report>cim</report> - <report>issue-tracking</report> - <report>license</report> - <report>scm</report> - <report>dependency-info</report> - <report>dependencies</report> - <report>dependency-convergence</report> - <report>plugin-management</report> - <report>plugins</report> - <report>dependency-management</report> - <report>summary</report> - </reports> - </reportSet> - </reportSets> - </plugin> - - </plugins> - </reporting> - - </profile> - <!-- create assemblies at release time --> <profile> <id>assembly-profile</id> diff --git a/src/license/THIRD-PARTY.properties b/src/license/THIRD-PARTY.properties index df76be0..676f0cb 100644 --- a/src/license/THIRD-PARTY.properties +++ b/src/license/THIRD-PARTY.properties @@ -15,6 +15,5 @@ # Please fill the missing licenses for dependencies : # # -#Sat Jul 20 16:25:49 CEST 2013 +#Sun Aug 03 10:35:12 CEST 2014 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -javassist--javassist--3.11.0.GA=The Apache Software License, Version 2.0 diff --git a/src/site/site.xml b/src/site/site.xml new file mode 100644 index 0000000..a3ed98d --- /dev/null +++ b/src/site/site.xml @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Nuiton Validator + $Id$ + $HeadURL$ + %% + Copyright (C) 2013 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Lesser Public License for more details. + + You should have received a copy of the GNU General Lesser Public + License along with this program. If not, see + <http://www.gnu.org/licenses/lgpl-3.0.html>. + #L% + --> + + +<project name="${project.name}"> + + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> + + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>https://www.codelutin.com</href> + </bannerRight> + + <body> + + <links> + <item name="Nuiton.org" href="http://forge.nuiton.org"/> + <item name="Code Lutin" href="http://www.codelutin.com"/> + <item name="Libre entreprise" href="http://www.libre-entreprise.org"/> + </links> + + <breadcrumbs> + <item name="${project.name}" + href="${project.url}/index.html"/> + <item name="${project.version}" + href="${project.url}/${siteDeployClassifier}/index.html"/> + </breadcrumbs> + + <menu name="Utilisateur"> + <item name="Accueil" href="index.html"/> + <item name="Note de versions" href="versions.html"/> + </menu> + + <menu ref="reports"/> + + </body> +</project> diff --git a/src/site/site_fr.xml b/src/site/site_fr.xml deleted file mode 100644 index d93cb29..0000000 --- a/src/site/site_fr.xml +++ /dev/null @@ -1,110 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - Nuiton Validator - $Id$ - $HeadURL$ - %% - Copyright (C) 2013 CodeLutin - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Lesser Public License for more details. - - You should have received a copy of the GNU General Lesser Public - License along with this program. If not, see - <http://www.gnu.org/licenses/lgpl-3.0.html>. - #L% - --> - - -<project name="${project.name}"> - - <skin> - <groupId>org.apache.maven.skins</groupId> - <artifactId>maven-fluido-skin</artifactId> - <version>${fluidoSkinVersion}</version> - </skin> - - <custom> - <fluidoSkin> - <topBarEnabled>false</topBarEnabled> - <googleSearch/> - <sideBarEnabled>true</sideBarEnabled> - <searchEnabled>true</searchEnabled> - <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> - </fluidoSkin> - </custom> - - <bannerLeft> - <name>${project.name}</name> - <href>index.html</href> - </bannerLeft> - - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</href> - </bannerRight> - - <publishDate position="right" /> - <version position="right" /> - - <poweredBy> - - <logo href="http://maven.apache.org" name="Maven" - img="${mavenpomSiteCommonResourcesUrl}/public/images/logos/maven-feather.png"/> - - </poweredBy> - - <body> - - <head> - <script type="text/javascript" - src="${mavenpomSiteCommonResourcesUrl}/public/js/mavenpom-site.js"> - </script> - - <link rel="stylesheet" type="text/css" - href="${mavenpomSiteCommonResourcesUrl}/public/css/mavenpom-site.css"/> - </head> - - <links> - <item name="Nuiton.org" href="http://nuiton.org"/> - <item name="Code Lutin" href="http://www.codelutin.com"/> - <item name="Libre entreprise" href="http://www.libre-entreprise.org"/> - </links> - - <breadcrumbs> - <item name="${project.name}" - href="${project.url}/index.html"/> - </breadcrumbs> - - <menu name="Utilisateur"> - <item name="Accueil" href="index.html"/> - <item name="Note de versions" href="versions.html"/> - </menu> - - <menu ref="reports"/> - - <footer> - - <div id='projectMetas' locale='fr' - projectversion='${project.version}' - platform='${project.platform}' - projectid='${project.projectId}' - scm='${project.scm.developerConnection}' - scmwebeditorenabled='${project.scmwebeditorEnabled}' - scmwebeditorurl='${project.scmwebeditorUrl}' - siteSourcesType='${project.siteSourcesType}' - piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}' - scmwebeditor_skipDefaultFiles="true"> - </div> - </footer> - </body> -</project> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.