This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-profiling. See http://git.nuiton.org/nuiton-profiling.git commit 0ec13af6f161444708c02d7469d12cae26470cac Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Oct 26 08:55:34 2014 +0100 fixes #3541: Migrates to git --- .gitignore | 7 +++ pom.xml | 54 ++++++++------------- src/main/java/org/nuiton/profiling/Counter.java | 2 - .../java/org/nuiton/profiling/NuitonTrace.java | 2 +- src/main/java/org/nuiton/profiling/Statistic.java | 2 - .../java/org/nuiton/profiling/StatisticMemory.java | 2 - .../java/org/nuiton/profiling/StatisticMethod.java | 2 - .../java/org/nuiton/profiling/StatisticTrace.java | 2 - src/main/java/org/nuiton/profiling/Trace.java | 2 +- src/main/java/org/nuiton/profiling/Unit.java | 2 - src/main/java/org/nuiton/profiling/WebService.java | 2 - src/main/resources/nuiton-js/wro.properties | 2 - src/main/resources/nuiton-js/wro.xml | 2 - .../resources/org/nuiton/profiling/web/index.html | 2 - .../org/nuiton/profiling/web/nuiton-profiling.css | 2 - .../org/nuiton/profiling/web/nuiton-profiling.js | 2 - src/site/apt/index.apt.vm | 5 +- src/site/apt/other-usage.apt.vm | 21 +++++++++ src/site/apt/screenshot.apt.vm | 5 +- src/site/apt/simple-usage.apt.vm | 21 +++++++++ src/site/{site_fr.xml => site.xml} | 55 +++++----------------- .../java/org/nuiton/profiling/NuitonTraceTest.java | 5 +- src/test/java/org/nuiton/profiling/UnitTest.java | 2 - src/test/resources/META-INF/aop.xml | 5 +- src/test/resources/log4j.properties | 5 +- 25 files changed, 86 insertions(+), 127 deletions(-) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..340ab47 --- /dev/null +++ b/.gitignore @@ -0,0 +1,7 @@ +/target +/.idea +/*.ipr +/*.iml +/*.iws +/*~ +/*~ \ No newline at end of file diff --git a/pom.xml b/pom.xml index 375f852..91f3465 100644 --- a/pom.xml +++ b/pom.xml @@ -25,8 +25,8 @@ <parent> <groupId>org.nuiton</groupId> - <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>5.0.9</version> + <artifactId>nuitonpom</artifactId> + <version>1.5</version> </parent> <artifactId>nuiton-profiling</artifactId> @@ -35,7 +35,7 @@ <name>Nuiton Profiling</name> <description>Library of perform profiling in any project.</description> <inceptionYear>2004</inceptionYear> - <url>http://doc.nuiton.org/nuiton-profiling</url> + <url>http://nuiton-profiling.nuiton.org</url> <developers> <developer> @@ -76,23 +76,23 @@ </developers> <scm> - <connection> - scm:svn:https://svn.nuiton.org/nuiton-profiling/trunk - </connection> - <developerConnection> - scm:svn:https://svn.nuiton.org/nuiton-profiling/trunk - </developerConnection> - <url>https://forge.nuiton.org/projects/nuiton-profiling/repository/show/trunk</url> + <connection>scm:git:http://git.nuiton.org/nuiton-profiling.git</connection> + <developerConnection>scm:git:https://git.nuiton.org/nuiton-profiling.git</developerConnection> + <url>https://gitweb.nuiton.org/nuiton-profiling.git</url> </scm> + <distributionManagement> <site> - <id>doc.${platform}</id> - <url>${our.site.repository}/${projectId}</url> + <id>${site.server}</id> + <url>${site.url}</url> </site> </distributionManagement> <properties> + <!-- redmine project Id --> + <projectId>nuiton-profiling</projectId> + <aspectjVersion>1.8.2</aspectjVersion> <!-- Documentation is in apt format --> @@ -107,6 +107,8 @@ </maven.surefire.debug> <!--<maven.surefire.debug>-javaagent:${settings.localRepository}/org/aspectj/aspectjweaver/${aspectjVersion}/aspectjweaver-1.6.11.jar</maven.surefire.debug>--> + <locales>fr</locales> + <!-- Post Release configuration --> <skipPostRelease>false</skipPostRelease> @@ -122,16 +124,19 @@ <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> + <version>2.4</version> </dependency> <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> + <version>1.1.3</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> + <version>3.3.2</version> </dependency> <!-- aspectJ --> @@ -144,12 +149,14 @@ <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>test</scope> </dependency> @@ -298,29 +305,6 @@ </links> </configuration> </plugin> - - <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>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> diff --git a/src/main/java/org/nuiton/profiling/Counter.java b/src/main/java/org/nuiton/profiling/Counter.java index caf7f89..efabb13 100644 --- a/src/main/java/org/nuiton/profiling/Counter.java +++ b/src/main/java/org/nuiton/profiling/Counter.java @@ -3,8 +3,6 @@ package org.nuiton.profiling; /* * #%L * Nuiton Profiling - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2014 CodeLutin * %% diff --git a/src/main/java/org/nuiton/profiling/NuitonTrace.java b/src/main/java/org/nuiton/profiling/NuitonTrace.java index 48dcc51..06cbe16 100644 --- a/src/main/java/org/nuiton/profiling/NuitonTrace.java +++ b/src/main/java/org/nuiton/profiling/NuitonTrace.java @@ -1,6 +1,6 @@ /* * #%L - * Nuiton Utils :: Nuiton Profiling + * Nuiton Profiling * %% * Copyright (C) 2006 - 2014 CodeLutin * %% diff --git a/src/main/java/org/nuiton/profiling/Statistic.java b/src/main/java/org/nuiton/profiling/Statistic.java index 469eae8..9499c6f 100644 --- a/src/main/java/org/nuiton/profiling/Statistic.java +++ b/src/main/java/org/nuiton/profiling/Statistic.java @@ -3,8 +3,6 @@ package org.nuiton.profiling; /* * #%L * Nuiton Profiling - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2014 CodeLutin * %% diff --git a/src/main/java/org/nuiton/profiling/StatisticMemory.java b/src/main/java/org/nuiton/profiling/StatisticMemory.java index 73486e8..5df7653 100644 --- a/src/main/java/org/nuiton/profiling/StatisticMemory.java +++ b/src/main/java/org/nuiton/profiling/StatisticMemory.java @@ -3,8 +3,6 @@ package org.nuiton.profiling; /* * #%L * Nuiton Profiling - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2014 CodeLutin * %% diff --git a/src/main/java/org/nuiton/profiling/StatisticMethod.java b/src/main/java/org/nuiton/profiling/StatisticMethod.java index d9b5159..66a74ba 100644 --- a/src/main/java/org/nuiton/profiling/StatisticMethod.java +++ b/src/main/java/org/nuiton/profiling/StatisticMethod.java @@ -3,8 +3,6 @@ package org.nuiton.profiling; /* * #%L * Nuiton Profiling - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2014 CodeLutin * %% diff --git a/src/main/java/org/nuiton/profiling/StatisticTrace.java b/src/main/java/org/nuiton/profiling/StatisticTrace.java index 0866d56..f482664 100644 --- a/src/main/java/org/nuiton/profiling/StatisticTrace.java +++ b/src/main/java/org/nuiton/profiling/StatisticTrace.java @@ -3,8 +3,6 @@ package org.nuiton.profiling; /* * #%L * Nuiton Profiling - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2014 CodeLutin * %% diff --git a/src/main/java/org/nuiton/profiling/Trace.java b/src/main/java/org/nuiton/profiling/Trace.java index 6b73c78..5940b02 100644 --- a/src/main/java/org/nuiton/profiling/Trace.java +++ b/src/main/java/org/nuiton/profiling/Trace.java @@ -1,6 +1,6 @@ /* * #%L - * Nuiton Utils :: Nuiton Profiling + * Nuiton Profiling * %% * Copyright (C) 2006 - 2014 CodeLutin * %% diff --git a/src/main/java/org/nuiton/profiling/Unit.java b/src/main/java/org/nuiton/profiling/Unit.java index e99bd49..5ace436 100644 --- a/src/main/java/org/nuiton/profiling/Unit.java +++ b/src/main/java/org/nuiton/profiling/Unit.java @@ -3,8 +3,6 @@ package org.nuiton.profiling; /* * #%L * Nuiton Profiling - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2014 CodeLutin * %% diff --git a/src/main/java/org/nuiton/profiling/WebService.java b/src/main/java/org/nuiton/profiling/WebService.java index e00d485..f72d84a 100644 --- a/src/main/java/org/nuiton/profiling/WebService.java +++ b/src/main/java/org/nuiton/profiling/WebService.java @@ -3,8 +3,6 @@ package org.nuiton.profiling; /* * #%L * Nuiton Profiling - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2014 CodeLutin * %% diff --git a/src/main/resources/nuiton-js/wro.properties b/src/main/resources/nuiton-js/wro.properties index 6a18d4c..b680c14 100644 --- a/src/main/resources/nuiton-js/wro.properties +++ b/src/main/resources/nuiton-js/wro.properties @@ -1,8 +1,6 @@ ### # #%L # Nuiton Profiling -# $Id$ -# $HeadURL$ # %% # Copyright (C) 2004 - 2013 CodeLutin # %% diff --git a/src/main/resources/nuiton-js/wro.xml b/src/main/resources/nuiton-js/wro.xml index c5b7cd1..4959d2e 100644 --- a/src/main/resources/nuiton-js/wro.xml +++ b/src/main/resources/nuiton-js/wro.xml @@ -1,8 +1,6 @@ <!-- #%L Nuiton Profiling - $Id$ - $HeadURL$ %% Copyright (C) 2004 - 2013 CodeLutin %% diff --git a/src/main/resources/org/nuiton/profiling/web/index.html b/src/main/resources/org/nuiton/profiling/web/index.html index a2e915c..17135e6 100644 --- a/src/main/resources/org/nuiton/profiling/web/index.html +++ b/src/main/resources/org/nuiton/profiling/web/index.html @@ -1,8 +1,6 @@ <!-- #%L Nuiton Profiling - $Id$ - $HeadURL$ %% Copyright (C) 2004 - 2013 CodeLutin %% diff --git a/src/main/resources/org/nuiton/profiling/web/nuiton-profiling.css b/src/main/resources/org/nuiton/profiling/web/nuiton-profiling.css index b3af4f9..fe04cf5 100644 --- a/src/main/resources/org/nuiton/profiling/web/nuiton-profiling.css +++ b/src/main/resources/org/nuiton/profiling/web/nuiton-profiling.css @@ -1,8 +1,6 @@ /* * #%L * Nuiton Profiling - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2004 - 2013 CodeLutin * %% diff --git a/src/main/resources/org/nuiton/profiling/web/nuiton-profiling.js b/src/main/resources/org/nuiton/profiling/web/nuiton-profiling.js index 6db6df7..faf1bf9 100644 --- a/src/main/resources/org/nuiton/profiling/web/nuiton-profiling.js +++ b/src/main/resources/org/nuiton/profiling/web/nuiton-profiling.js @@ -1,8 +1,6 @@ /* * #%L * Nuiton Profiling - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2004 - 2013 CodeLutin * %% diff --git a/src/site/apt/index.apt.vm b/src/site/apt/index.apt.vm index 65412d7..9283d0c 100644 --- a/src/site/apt/index.apt.vm +++ b/src/site/apt/index.apt.vm @@ -1,9 +1,6 @@ ~~~ ~~ #%L -~~ Nuiton Utils :: Nuiton Profiling -~~ -~~ $Id$ -~~ $HeadURL$ +~~ Nuiton Profiling ~~ %% ~~ Copyright (C) 2004 - 2010 CodeLutin ~~ %% diff --git a/src/site/apt/other-usage.apt.vm b/src/site/apt/other-usage.apt.vm index 3fe1268..5117729 100644 --- a/src/site/apt/other-usage.apt.vm +++ b/src/site/apt/other-usage.apt.vm @@ -1,3 +1,24 @@ +~~~ +~~ #%L +~~ Nuiton Profiling +~~ %% +~~ Copyright (C) 2004 - 2010 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% +~~~ ---- Nuiton Profiling ---- diff --git a/src/site/apt/screenshot.apt.vm b/src/site/apt/screenshot.apt.vm index e7681ce..d740390 100644 --- a/src/site/apt/screenshot.apt.vm +++ b/src/site/apt/screenshot.apt.vm @@ -1,9 +1,6 @@ ~~~ ~~ #%L -~~ Nuiton Utils :: Nuiton Profiling -~~ -~~ $Id$ -~~ $HeadURL$ +~~ Nuiton Profiling ~~ %% ~~ Copyright (C) 2004 - 2010 CodeLutin ~~ %% diff --git a/src/site/apt/simple-usage.apt.vm b/src/site/apt/simple-usage.apt.vm index 9308463..3624a9b 100644 --- a/src/site/apt/simple-usage.apt.vm +++ b/src/site/apt/simple-usage.apt.vm @@ -1,3 +1,24 @@ +~~~ +~~ #%L +~~ Nuiton Profiling +~~ %% +~~ Copyright (C) 2004 - 2010 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% +~~~ ---- Nuiton Profiling ---- diff --git a/src/site/site_fr.xml b/src/site/site.xml similarity index 61% rename from src/site/site_fr.xml rename to src/site/site.xml index 5ed7b73..5539918 100644 --- a/src/site/site_fr.xml +++ b/src/site/site.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- #%L - Nuiton Utils :: Nuiton Profiling - - $Id$ - $HeadURL$ + Nuiton Profiling %% Copyright (C) 2004 - 2010 CodeLutin %% @@ -24,7 +21,9 @@ #L% --> -<project name="${project.name}"> +<project name="${project.name}" xmlns="http://maven.apache.org/DECORATION/1.4.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"> <skin> <groupId>org.apache.maven.skins</groupId> @@ -32,16 +31,6 @@ <version>1.3.1</version> </skin> - <custom> - <fluidoSkin> - <topBarEnabled>false</topBarEnabled> - <googleSearch>false</googleSearch> - <sideBarEnabled>true</sideBarEnabled> - <searchEnabled>true</searchEnabled> - <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> - </fluidoSkin> - </custom> - <bannerLeft> <name>${project.name}</name> <href>index.html</href> @@ -49,25 +38,17 @@ <body> - <head> - <script type="text/javascript" - src="http://maven-site.chorem.org/public/js/mavenpom-site.js"> - </script> - - <link rel="stylesheet" type="text/css" - href="http://maven-site.chorem.org/public/css/mavenpom-site.css"/> - </head> + <links> + <item name="Nuiton.org" href="https://forge.nuiton.org"/> + <item name="Code Lutin" href="https://www.codelutin.com"/> + <item name="Libre entreprise" href="http://www.libre-entreprise.org"/> + </links> <breadcrumbs> - <item name="${project.name}" href="index.html"/> + <item name="${project.name}" href="${project.url}/index.html"/> + <item name="${project.version}" href="${project.url}/v/${siteDeployClassifier}/index.html"/> </breadcrumbs> - <links> - <item name="nuiton.org" href="http://www.nuiton.org"/> - <item name="CodeLutin" href="http://codelutin.com"/> - <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> - </links> - <menu name="Utilisateur"> <item name="Accueil" href="index.html"/> <item name="Usage simple" href="simple-usage.html"/> @@ -95,19 +76,5 @@ <menu ref="reports"/> - <footer> - - <div id='projectMetas' - 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}' locale='fr'> - </div> - </footer> </body> </project> diff --git a/src/test/java/org/nuiton/profiling/NuitonTraceTest.java b/src/test/java/org/nuiton/profiling/NuitonTraceTest.java index 5a2afb2..138d63e 100644 --- a/src/test/java/org/nuiton/profiling/NuitonTraceTest.java +++ b/src/test/java/org/nuiton/profiling/NuitonTraceTest.java @@ -1,9 +1,6 @@ /* * #%L - * Nuiton Utils :: Nuiton Profiling - * - * $Id$ - * $HeadURL$ + * Nuiton Profiling * %% * Copyright (C) 2004 - 2014 CodeLutin, Tony Chemit * %% diff --git a/src/test/java/org/nuiton/profiling/UnitTest.java b/src/test/java/org/nuiton/profiling/UnitTest.java index 7c0251b..9769efb 100644 --- a/src/test/java/org/nuiton/profiling/UnitTest.java +++ b/src/test/java/org/nuiton/profiling/UnitTest.java @@ -3,8 +3,6 @@ package org.nuiton.profiling; /* * #%L * Nuiton Profiling - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2014 CodeLutin * %% diff --git a/src/test/resources/META-INF/aop.xml b/src/test/resources/META-INF/aop.xml index 7409be8..40255a1 100644 --- a/src/test/resources/META-INF/aop.xml +++ b/src/test/resources/META-INF/aop.xml @@ -1,9 +1,6 @@ <!-- #%L - Nuiton Utils :: Nuiton Profiling - - $Id$ - $HeadURL$ + Nuiton Profiling %% Copyright (C) 2004 - 2011 CodeLutin %% diff --git a/src/test/resources/log4j.properties b/src/test/resources/log4j.properties index 9fd2eb2..9aec107 100644 --- a/src/test/resources/log4j.properties +++ b/src/test/resources/log4j.properties @@ -1,9 +1,6 @@ ### # #%L -# Nuiton Utils -# -# $Id$ -# $HeadURL$ +# Nuiton Profiling # %% # Copyright (C) 2004 - 2011 CodeLutin, Chatellier Eric # %% -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.