This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See http://git.codelutin.com/echobase.git commit e410d3b092f2352a5ecb372331e46fa2c684e377 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Oct 3 21:40:31 2014 +0200 fixes #5919: Migrates to git --- .gitignore | 15 +++++ echobase-domain/pom.xml | 5 +- pom.xml | 153 +++++++++++++++++++++++++++--------------------- 3 files changed, 103 insertions(+), 70 deletions(-) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..64dc679 --- /dev/null +++ b/.gitignore @@ -0,0 +1,15 @@ +/atlassian-ide-plugin.xml +/.idea +/*/.idea +/target +/*/target/ +/*.iml +/*/*.iml +/*.ipr +/*/*.ipr +/*.iws +/*/*.iws +/tutti-service/src/test/data +/tutti-persistence/src/test/data +/*~ +/*/*~ \ No newline at end of file diff --git a/echobase-domain/pom.xml b/echobase-domain/pom.xml index 6a2a06c..e84e295 100644 --- a/echobase-domain/pom.xml +++ b/echobase-domain/pom.xml @@ -87,7 +87,7 @@ <configuration> <entries> <entry> - <basedir>${maven.gen.dir}/java/</basedir> + <basedir>${project.build.directory}/generated-sources/java/</basedir> <excludes> <param>**/*DAOAbstract.java</param> </excludes> @@ -116,17 +116,14 @@ <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> </dependency> - <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> </dependency> - <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-config</artifactId> </dependency> - <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-csv</artifactId> diff --git a/pom.xml b/pom.xml index 8140fc4..b9e8d97 100644 --- a/pom.xml +++ b/pom.xml @@ -5,8 +5,8 @@ <parent> <groupId>org.nuiton</groupId> - <artifactId>mavenpom4redmine</artifactId> - <version>5.0.8</version> + <artifactId>codelutinpom</artifactId> + <version>1.3</version> </parent> <groupId>fr.ifremer</groupId> @@ -49,7 +49,7 @@ <developer> <id>chemit</id> <name>Tony Chemit</name> - <email>chemit at codelutin dot com</email> + <email>chemit@codelutin.com</email> <organization>CodeLutin</organization> <organizationUrl>http://codelutin.com</organizationUrl> <roles> @@ -61,7 +61,7 @@ <developer> <id>letellier</id> <name>Sylvain Letellier</name> - <email>letellier at codelutin dot com</email> + <email>letellier@codelutin.com</email> <organization>CodeLutin</organization> <organizationUrl>http://codelutin.com</organizationUrl> <roles> @@ -73,7 +73,7 @@ <developer> <id>mdoray</id> <name>Mathieu Doray</name> - <email>mathieu dot doray at ifremer dot fr</email> + <email>mathieu dot doray@ifremer.fr</email> <organization>Ifremer</organization> <organizationUrl>http://ifremer.fr</organizationUrl> <roles> @@ -84,19 +84,14 @@ </developers> <scm> - <url>https://svn.codelutin.com/projects/echobase/repository/show/trunk</url> - <connection> - scm:svn:https://svn.codelutin.com/echobase/trunk - </connection> - <developerConnection> - scm:svn:https://svn.codelutin.com/echobase/trunk - </developerConnection> + <url>https://gitweb.codelutin.com/echobase.git</url> + <connection>scm:git:http://git.codelutin.com/echobase.git</connection> + <developerConnection>scm:git:https://git.codelutin.com/echobase.git</developerConnection> </scm> - <distributionManagement> <site> - <id>doc.${platform}</id> - <url>${our.site.repository}/${projectId}</url> + <id>${site.server}</id> + <url>${site.url}</url> </site> </distributionManagement> @@ -171,6 +166,9 @@ <!--Site configuration --> <locales>fr,en</locales> + <!-- Can't use version 3.4 since jrst is not compatible --> + <!-- see https://forge.nuiton.org/issues/3342 --> + <sitePluginVersion>3.3</sitePluginVersion> <!-- name of embedded war file basename --> <embeddedWarName>echobase-embedded-${project.version}</embeddedWarName> @@ -188,6 +186,66 @@ <version>1.5-rc-1</version> </dependency> + <!-- Commons --> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> + <version>4.0</version> + </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.9.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-lang3</artifactId> + <version>3.3.2</version> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>2.4</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-exec</artifactId> + <version>1.1</version> + </dependency> + <dependency> + <groupId>commons-configuration</groupId> + <artifactId>commons-configuration</artifactId> + <version>1.10</version> + </dependency> + + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + <version>4.3.2</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>4.3.3</version> + </dependency> + + <!-- Google --> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>18.0</version> + </dependency> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <version>2.2.4</version> + </dependency> + <!-- librairie des lutins--> <dependency> @@ -260,25 +318,6 @@ <version>4.3.5.Final</version> </dependency> - <!-- Commons --> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-exec</artifactId> - <version>1.1</version> - </dependency> - - <dependency> - <groupId>commons-configuration</groupId> - <artifactId>commons-configuration</artifactId> - <version>1.10</version> - </dependency> - - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - <version>2.2.4</version> - </dependency> - <!-- base postgres --> <dependency> <groupId>org.postgresql</groupId> @@ -314,31 +353,26 @@ </exclusion> </exclusions> </dependency> - <dependency> <groupId>com.jgeppert.struts2.jquery</groupId> <artifactId>struts2-jquery-plugin</artifactId> <version>${jqueryPluginVersion}</version> </dependency> - <dependency> <groupId>com.jgeppert.struts2.jquery</groupId> <artifactId>struts2-jquery-grid-plugin</artifactId> <version>${jqueryPluginVersion}</version> </dependency> - <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-json-plugin</artifactId> <version>${struts2Version}</version> </dependency> - <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-sitemesh-plugin</artifactId> <version>${struts2Version}</version> </dependency> - <dependency> <groupId>org.apache.struts.xwork</groupId> <artifactId>xwork-core</artifactId> @@ -372,20 +406,31 @@ <scope>provided</scope> </dependency> - <!-- loggin libraries --> - + <!-- Logging --> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.17</version> + </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-jcl</artifactId> <version>${slf4jVersion}</version> </dependency> - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> <version>${slf4jVersion}</version> </dependency> + <!-- Test --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.11</version> + <scope>test</scope> + </dependency> + </dependencies> </dependencyManagement> @@ -522,30 +567,6 @@ <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>dependencies</report> - <report>dependency-info</report> - <report>dependency-convergence</report> - <report>plugin-management</report> - <report>plugins</report> - <report>dependency-management</report> - <report>summary</report> - </reports> - </reportSet> - </reportSets> - </plugin> - - <plugin> <groupId>org.nuiton</groupId> <artifactId>nuiton-maven-report-plugin</artifactId> <version>3.0</version> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.