This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-csv. See http://git.nuiton.org/nuiton-csv.git commit 3b9a1c244c316c0ed8436e963c85dba673424f93 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 4 12:21:26 2014 +0200 fixes #3412: Migrate to Git --- .gitignore | 12 +++++++++ pom.xml | 71 ++++++++++++-------------------------------------- src/site/apt/index.apt | 4 +-- src/site/site_fr.xml | 53 +------------------------------------ 4 files changed, 32 insertions(+), 108 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 1c6746c..d3413d5 100644 --- a/pom.xml +++ b/pom.xml @@ -4,8 +4,8 @@ <parent> <groupId>org.nuiton</groupId> - <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>5.1</version> + <artifactId>nuitonpom</artifactId> + <version>1.2</version> </parent> <artifactId>nuiton-csv</artifactId> @@ -45,18 +45,15 @@ </developers> <scm> - <connection> - scm:svn:https://svn.nuiton.org/nuiton-csv/trunk - </connection> - <developerConnection> - scm:svn:https://svn.nuiton.org/nuiton-csv/trunk - </developerConnection> - <url>https://forge.nuiton.org/projects/nuiton-csv/repository/show/trunk</url> + <connection>scm:git:http://git.nuiton.org/nuiton-csv.git</connection> + <developerConnection>scm:git:https://git.nuiton.org/nuiton-csv.git</developerConnection> + <url>https://gitweb.nuiton.org/nuiton-csv.git</url> </scm> + <distributionManagement> <site> - <id>${siteDeployId}</id> - <url>${siteDeployUrl}</url> + <id>${site.server}</id> + <url>${site.url}</url> </site> </distributionManagement> @@ -65,7 +62,6 @@ <projectId>nuiton-csv</projectId> <nuitonI18nVersion>3.3</nuitonI18nVersion> - <nuitonUtilsVersion>3.0-rc-5</nuitonUtilsVersion> <!-- i18n configuration --> <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> @@ -85,7 +81,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>${nuitonUtilsVersion}</version> + <version>3.0-rc-5</version> </dependency> <dependency> @@ -103,43 +99,51 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> + <version>3.3.2</version> </dependency> <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> + <version>1.2</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-collections4</artifactId> + <version>4.0</version> </dependency> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> + <version>2.4</version> </dependency> <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> + <version>1.9.2</version> </dependency> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> + <version>17.0</version> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> + <version>4.11</version> </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <scope>provided</scope> + <version>1.2.17</version> </dependency> </dependencies> @@ -182,47 +186,6 @@ <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/site/apt/index.apt b/src/site/apt/index.apt index 8ebd3d5..5543c2b 100644 --- a/src/site/apt/index.apt +++ b/src/site/apt/index.apt @@ -38,11 +38,11 @@ Note Voici quelques liens sur le nouveau projet: - * {{{http://svn.nuiton.org/nuiton-csv}svn}} + * {{{http://gitweb.nuiton.org/nuiton-csv.git}git}} * {{{http://forge.nuiton.org/projects/nuiton-csv}forge}} - * {{{http://doc.nuiton.org/nuiton-csv}site}} + * {{{http://doc.nuiton.org/nuiton-csv}documentation}} [] diff --git a/src/site/site_fr.xml b/src/site/site_fr.xml index aa49c8f..5eb30d2 100644 --- a/src/site/site_fr.xml +++ b/src/site/site_fr.xml @@ -21,25 +21,8 @@ #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> @@ -50,27 +33,8 @@ <href>http://www.codelutin.com</href> </bannerRight> - <publishDate position="right" /> - <version position="right" /> - - <poweredBy> - - <logo href="http://maven.apache.org" name="Maven" - img="${mavenpomSiteCommonResourcesUrl}/images/logos/maven-feather.png"/> - - </poweredBy> - <body> - <head> - <script type="text/javascript" - src="${mavenpomSiteCommonResourcesUrl}/js/mavenpom-site.js"> - </script> - - <link rel="stylesheet" type="text/css" - href="${mavenpomSiteCommonResourcesUrl}/css/mavenpom-site.css"/> - </head> - <links> <item name="Nuiton.org" href="http://forge.nuiton.org"/> <item name="Code Lutin" href="http://www.codelutin.com"/> @@ -88,23 +52,8 @@ <item name="Accueil" href="index.html"/> <item name="Note de versions" href="versions.html"/> </menu> - - <menu ref="reports"/> - <footer> + <menu ref="reports"/> - <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>.