This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See http://git.codelutin.com/faxtomail.git commit 1c4e35679c0cc216173a6effb5c19b37476bb524 Author: Kevin Morin <morin@codelutin.com> Date: Mon Jan 19 15:26:34 2015 +0100 passage sous git --- .gitignore | 158 +++++++++++++++++++++ faxtomail-service/pom.xml | 2 +- faxtomail-ui-swing/pom.xml | 6 +- .../src/license/THIRD-PARTY.properties | 4 +- faxtomail-ui-web/pom.xml | 2 +- pom.xml | 18 +-- 6 files changed, 175 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f09b769 --- /dev/null +++ b/.gitignore @@ -0,0 +1,158 @@ +# Created by .ignore support plugin (hsz.mobi) +### Eclipse template +*.pydevproject +.metadata +.gradle +bin/ +tmp/ +*.tmp +*.bak +*.swp +*~.nib +local.properties +.settings/ +.loadpath + +# External tool builders +.externalToolBuilders/ + +# Locally stored "Eclipse launch configurations" +*.launch + +# CDT-specific +.cproject + +# PDT-specific +.buildpath + +# sbteclipse plugin +.target + +# TeXlipse plugin +.texlipse + + +### JetBrains template +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm + +*.iml + +## Directory-based project format: +.idea/ +# if you remove the above rule, at least ignore the following: + +# User-specific stuff: +# .idea/workspace.xml +# .idea/tasks.xml +# .idea/dictionaries + +# Sensitive or high-churn files: +# .idea/dataSources.ids +# .idea/dataSources.xml +# .idea/sqlDataSources.xml +# .idea/dynamic.xml +# .idea/uiDesigner.xml + +# Gradle: +# .idea/gradle.xml +# .idea/libraries + +# Mongo Explorer plugin: +# .idea/mongoSettings.xml + +## File-based project format: +*.ipr +*.iws + +## Plugin-specific files: + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties + + +### Java template +*.class + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.ear + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + + + +.gitignore +### JetBrains template +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm + +*.iml + +## Directory-based project format: +.idea/ +# if you remove the above rule, at least ignore the following: + +# User-specific stuff: +# .idea/workspace.xml +# .idea/tasks.xml +# .idea/dictionaries + +# Sensitive or high-churn files: +# .idea/dataSources.ids +# .idea/dataSources.xml +# .idea/sqlDataSources.xml +# .idea/dynamic.xml +# .idea/uiDesigner.xml + +# Gradle: +# .idea/gradle.xml +# .idea/libraries + +# Mongo Explorer plugin: +# .idea/mongoSettings.xml + +## File-based project format: +*.ipr +*.iws + +## Plugin-specific files: + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties + + +### Maven template +target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next +release.properties + + diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index bb4d328..557936b 100644 --- a/faxtomail-service/pom.xml +++ b/faxtomail-service/pom.xml @@ -233,7 +233,7 @@ <entries> <entry> <specificGoal>parserValidation</specificGoal> - <basedir>${maven.src.dir}/main/java/</basedir> + <basedir>${project.basedir}/src/main/java/</basedir> <includes> <param>**/**-validation.xml</param> </includes> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 98dff0f..cad659b 100644 --- a/faxtomail-ui-swing/pom.xml +++ b/faxtomail-ui-swing/pom.xml @@ -54,7 +54,7 @@ <i18n.bundleOutputName>faxtomail-i18n</i18n.bundleOutputName> <i18n.generateCsvFile>true</i18n.generateCsvFile> <i18n.bundleCsvFile> - ${maven.gen.dir}/resources/META-INF/${i18n.bundleOutputName}.csv + ${project.build.directory}/generated-sources/resources/META-INF/${i18n.bundleOutputName}.csv </i18n.bundleCsvFile> <!-- generate license bundled files --> @@ -317,13 +317,13 @@ <entries> <entry> <specificGoal>parserValidation</specificGoal> - <basedir>${maven.src.dir}/main/java/</basedir> + <basedir>${project.basedir}/src/main/java/</basedir> <includes> <param>**/**-validation.xml</param> </includes> </entry> <entry> - <basedir>${maven.gen.dir}/java/</basedir> + <basedir>${project.build.directory}/generated-sources/java/</basedir> </entry> </entries> </configuration> diff --git a/faxtomail-ui-swing/src/license/THIRD-PARTY.properties b/faxtomail-ui-swing/src/license/THIRD-PARTY.properties index cd70ea4..528f0a9 100644 --- a/faxtomail-ui-swing/src/license/THIRD-PARTY.properties +++ b/faxtomail-ui-swing/src/license/THIRD-PARTY.properties @@ -6,6 +6,7 @@ # - Apache License 2.0 # - Apache License, version 2.0 # - BSD License +# - Bouncy Castle Licence # - CDDL # - Common Development and Distribution License # - Common Development and Distribution License (CDDL) v1.0 @@ -40,7 +41,8 @@ # Please fill the missing licenses for dependencies : # # -#Wed Dec 24 11:31:43 CET 2014 +#Mon Jan 19 15:24:41 CET 2015 +commons-codec--commons-codec--1.2=The Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License gui.ava--html2image--2.0.1=GNU Lesser General Public License, Version 2.1 diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index f350fd1..ab1a8b1 100644 --- a/faxtomail-ui-web/pom.xml +++ b/faxtomail-ui-web/pom.xml @@ -353,7 +353,7 @@ <entries> <entry> <specificGoal>parserValidation</specificGoal> - <basedir>${maven.src.dir}/main/java/</basedir> + <basedir>${project.basedir}/src/main/java/</basedir> <includes> <param>**/**-validation.xml</param> </includes> diff --git a/pom.xml b/pom.xml index baf7f74..de9f740 100644 --- a/pom.xml +++ b/pom.xml @@ -26,8 +26,8 @@ <parent> <groupId>org.nuiton</groupId> - <artifactId>mavenpom4redmine</artifactId> - <version>6</version> + <artifactId>codelutinpom</artifactId> + <version>1.8</version> </parent> <groupId>com.franciaflex</groupId> @@ -71,14 +71,16 @@ </modules> <scm> - <url>https://svn.codelutin.com/faxtomail/trunk</url> - <connection>scm:svn:https://svn.codelutin.com/faxtomail/trunk</connection> - <developerConnection>scm:svn:http://svn.codelutin.com/faxtomail/trunk</developerConnection> + <connection>scm:git:http://git.codelutin.com/fatxomail.git</connection> + <developerConnection> + scm:git:https://git.codelutin.com/fatxomail.git + </developerConnection> + <url>https://gitweb.codelutin.com/fatxomail.git</url> </scm> <distributionManagement> <site> - <id>${siteDeployId}</id> - <url>${siteDeployUrl}</url> + <id>${site.server}</id> + <url>${site.url}</url> </site> <snapshotRepository> <id>nuiton-nexus-deploy</id> @@ -92,8 +94,6 @@ <platform>codelutin.com</platform> <projectId>faxtomail</projectId> - <siteDeployClassifier /> - <sitePluginVersion>3.3</sitePluginVersion> <!-- libraries version --> <nuitonI18nVersion>3.3</nuitonI18nVersion> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.