This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coser. See http://git.codelutin.com/coser.git commit 69acaa7af1f023afeafa9a5b55bdf2e825cbb030 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Oct 3 19:20:17 2014 +0200 fixes #5918: Migration Git --- .gitignore | 15 ++++++ coser-ui/pom.xml | 2 +- pom.xml | 143 ++++++++++++++++++++++++++++++++++--------------------- 3 files changed, 106 insertions(+), 54 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/coser-ui/pom.xml b/coser-ui/pom.xml index d1aa7c8..84f6c72 100644 --- a/coser-ui/pom.xml +++ b/coser-ui/pom.xml @@ -213,7 +213,7 @@ <configuration> <entries> <entry> - <basedir>${maven.gen.dir}/java/</basedir> + <basedir>${project.build.directory}/generated-sources/java/</basedir> </entry> </entries> </configuration> diff --git a/pom.xml b/pom.xml index 3ac6902..cc438d4 100644 --- a/pom.xml +++ b/pom.xml @@ -4,8 +4,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> @@ -59,20 +59,19 @@ </modules> <scm> - <connection>scm:svn:https://svn.codelutin.com/coser/trunk</connection> - <developerConnection>scm:svn:https://svn.codelutin.com/coser/trunk</developerConnection> - <url>https://forge.codelutin.com/projects/coser/repository/show/trunk</url> + <url>https://gitweb.codelutin.com/codelutin.git</url> + <connection>scm:git:http://git.codelutin.com/codelutin.git</connection> + <developerConnection>scm:git:https://git.codelutin.com/codelutin.git</developerConnection> </scm> <distributionManagement> <site> - <id>doc.${platform}</id> - <url>${our.site.repository}/coser</url> + <id>${site.server}</id> + <url>${site.url}</url> </site> </distributionManagement> <properties> <projectId>coser</projectId> - <platform>codelutin.com</platform> <!-- license configuration --> <license.licenseName>lgpl_v3</license.licenseName> @@ -93,6 +92,12 @@ <strutsVersion>2.3.16.1</strutsVersion> <nuitonReportPluginVersion>3.0</nuitonReportPluginVersion> + <!-- Site configuration --> + <locales>fr</locales> + <!-- Can't use version 3.4 since jrst is not compatible --> + <!-- see https://forge.nuiton.org/issues/3342 --> + <sitePluginVersion>3.3</sitePluginVersion> + </properties> <repositories> @@ -111,6 +116,67 @@ <dependencyManagement> <dependencies> + <!-- Commons --> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> + <version>4.0</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.3.2</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-email</artifactId> + <version>1.3.2</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-math</artifactId> + <version>2.2</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>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>2.4</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> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpmime</artifactId> + <version>4.3.3</version> + </dependency> + + <!-- Guava --> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>17.0</version> + </dependency> + <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> @@ -134,7 +200,6 @@ <artifactId>nuiton-matrix</artifactId> <version>${nuitonMatrixVersion}</version> </dependency> - <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix-gui</artifactId> @@ -146,7 +211,6 @@ <artifactId>nuiton-i18n</artifactId> <version>${nuitonI18nVersion}</version> </dependency> - <dependency> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-struts2</artifactId> @@ -158,19 +222,16 @@ <artifactId>jaxx-runtime</artifactId> <version>${jaxxVersion}</version> </dependency> - <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-validator</artifactId> <version>${jaxxVersion}</version> </dependency> - <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-widgets-extra</artifactId> <version>${jaxxVersion}</version> </dependency> - <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-widgets</artifactId> @@ -300,6 +361,22 @@ <artifactId>freemarker</artifactId> <version>2.3.20</version> </dependency> + + <!-- Logging --> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.17</version> + </dependency> + + <!-- Test --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.11</version> + <scope>test</scope> + </dependency> + </dependencies> </dependencyManagement> @@ -365,46 +442,6 @@ </properties> </profile> - <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>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> - - </plugins> - </reporting> - - </profile> </profiles> </project> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.