branch develop updated (cdd3bb2 -> d02f007)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository izi-eval. See http://git.codelutin.com/izi-eval.git from cdd3bb2 Prepare next iteration new 40ca88c Utilisation codelutinpom 3 new d02f007 Ajout .gitignore The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit d02f00769271af31071be6702acd706eda8656af Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Dec 1 15:52:05 2015 +0100 Ajout .gitignore commit 40ca88c6ea47ae79f2dc0b3302b6231c4b5106bc Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Dec 1 15:51:55 2015 +0100 Utilisation codelutinpom 3 Summary of changes: .gitignore | 13 ++++++ masc-ui/pom.xml | 19 ++++++--- pom.xml | 129 ++++++++++++++++++++++++++++++++------------------------ 3 files changed, 101 insertions(+), 60 deletions(-) create mode 100644 .gitignore -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository izi-eval. See http://git.codelutin.com/izi-eval.git commit 40ca88c6ea47ae79f2dc0b3302b6231c4b5106bc Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Dec 1 15:51:55 2015 +0100 Utilisation codelutinpom 3 --- masc-ui/pom.xml | 19 ++++++--- pom.xml | 129 ++++++++++++++++++++++++++++++++------------------------ 2 files changed, 88 insertions(+), 60 deletions(-) diff --git a/masc-ui/pom.xml b/masc-ui/pom.xml index 9190189..018dc05 100644 --- a/masc-ui/pom.xml +++ b/masc-ui/pom.xml @@ -34,6 +34,13 @@ <!-- generate license bundled files --> <license.generateBundle>true</license.generateBundle> + + <skipPostRelease>false</skipPostRelease> + + <redmine.releaseFiles> + target/${projectId}-${project.version}.zip + </redmine.releaseFiles> + </properties> <dependencies> @@ -236,7 +243,7 @@ <configuration> <entries> <entry> - <basedir>${maven.gen.dir}/java/</basedir> + <basedir>${project.build.directory}/generated-sources/java/</basedir> </entry> </entries> </configuration> @@ -317,7 +324,7 @@ </activation> <build> - <defaultGoal>verify</defaultGoal> + <defaultGoal>package</defaultGoal> <plugins> <!-- key store secrets availables --> <plugin> @@ -369,12 +376,12 @@ </property> </activation> <build> - <defaultGoal>verify</defaultGoal> + <defaultGoal>package</defaultGoal> <plugins> <plugin> <artifactId>maven-assembly-plugin</artifactId> <configuration> - <finalName>izi-eval-${project.version}</finalName> + <finalName>${projectId}-${project.version}</finalName> <descriptors> <descriptor>src/main/assembly/bin.xml</descriptor> </descriptors> @@ -383,7 +390,7 @@ <executions> <execution> <id>create-assemblies</id> - <phase>verify</phase> + <phase>package</phase> <goals> <goal>single</goal> </goals> @@ -393,7 +400,7 @@ </plugins> </build> </profile> -1 + <!-- by default jnlp is only perform on a release stage when using the maven-release-plugin --> <profile> <id>reporting</id> diff --git a/pom.xml b/pom.xml index 4a18b2d..658e9d3 100644 --- a/pom.xml +++ b/pom.xml @@ -5,8 +5,8 @@ <parent> <groupId>org.nuiton</groupId> - <artifactId>mavenpom4labs</artifactId> - <version>3.4.11</version> + <artifactId>codelutinpom</artifactId> + <version>3</version> </parent> <groupId>fr.inra</groupId> @@ -92,11 +92,44 @@ </distributionManagement--> <scm> - <developerConnection> - scm:svn:svn+ssh://echatellier@scm.mulcyber.toulouse.inra.fr/svnroot/interfacemasc/trunk - </developerConnection> + <connection>scm:git:git@gitlab.nuiton.org:codelutin/izi-eval.git</connection> + <developerConnection>scm:git:git@gitlab.nuiton.org:codelutin/izi-eval.git</developerConnection> + <!--developerConnection>https://gitlab.nuiton.org/codelutin/izi-eval</developerConnection--> + <url>https://gitlab.nuiton.org/codelutin/izi-eval</url> </scm> + <repositories> + + <repository> + <id>masc-nexus-repository</id> + <url>http://nexus.nuiton.org/nexus/content/groups/masc</url> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + + </repositories> + + <pluginRepositories> + + <pluginRepository> + + <id>masc-nexus-repository</id> + <url>http://nexus.nuiton.org/nexus/content/groups/masc</url> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </pluginRepository> + + </pluginRepositories> + + <dependencyManagement> <dependencies> @@ -209,11 +242,48 @@ </dependency> <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.3</version> + </dependency> + + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.1</version> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.1</version> + </dependency> + + <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> <version>2.4</version> </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>14.0.1</version> + </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.17</version> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.11</version> + <scope>test</scope> + </dependency> + <!-- xml parser --> <dependency> <groupId>xpp3</groupId> @@ -358,53 +428,4 @@ </build> - <!--Any mailing lists for the project --> - <mailingLists> - - <mailingList> - <name>${projectId}-users</name> - <subscribe> - http://${labs.list.host}/mailman/listinfo/${projectId}-users - </subscribe> - <unsubscribe> - http://${labs.list.host}/mailman/listinfo/${projectId}-users - </unsubscribe> - <post>${projectId}-users@${labs.list.host}</post> - <archive>http://${labs.list.host}/pipermail/${projectId}-users/ - </archive> - </mailingList> - - <mailingList> - <name>${projectId}-devel</name> - <subscribe> - http://${labs.list.host}/mailman/listinfo/${projectId}-devel - </subscribe> - <unsubscribe> - http://${labs.list.host}/mailman/listinfo/${projectId}-devel - </unsubscribe> - <post>${projectId}-devel@${labs.list.host}</post> - <archive>http://${labs.list.host}/pipermail/${projectId}-devel/ - </archive> - </mailingList> - - <mailingList> - <name>${projectId}-commits</name> - <subscribe> - http://${labs.list.host}/mailman/listinfo/${projectId}-commits - </subscribe> - <unsubscribe> - http://${labs.list.host}/mailman/listinfo/${projectId}-commits - </unsubscribe> - <post>${projectId}-commits@${labs.list.host}</post> - <archive>http://${labs.list.host}/pipermail/${projectId}-commits/ - </archive> - </mailingList> - - </mailingLists> - - <issueManagement> - <system>gforge</system> - <url>https://${platform}/tracker?group_id=${labs.id}</url> - </issueManagement> - </project> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository izi-eval. See http://git.codelutin.com/izi-eval.git commit d02f00769271af31071be6702acd706eda8656af Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Dec 1 15:52:05 2015 +0100 Ajout .gitignore --- .gitignore | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5236b75 --- /dev/null +++ b/.gitignore @@ -0,0 +1,13 @@ +/target +/*/target +/*.ipr +/*/*.ipr +/.idea +/*.iws +/*/*.iws +/*.iml +/*/*.iml +/*~ +/*/*~ +D:* +*~ \ No newline at end of file -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm