[pollen] branch develop-1.x updated (b1a38ac -> 09e4d9a)
This is an automated email from the git hooks/post-receive script. New change to branch develop-1.x in repository pollen. See http://git.chorem.org/pollen.git from b1a38ac add .gitignore new 09e4d9a use chorempom 1.3 The 1 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 09e4d9aefdb46e5521820118a859fed9b3eddcd5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Sep 19 15:16:05 2014 +0200 use chorempom 1.3 Summary of changes: pollen-persistence/pom.xml | 2 +- pom.xml | 281 ++++++++++++++++++++++----------------------- 2 files changed, 140 insertions(+), 143 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-1.x in repository pollen. See http://git.chorem.org/pollen.git commit 09e4d9aefdb46e5521820118a859fed9b3eddcd5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Sep 19 15:16:05 2014 +0200 use chorempom 1.3 --- pollen-persistence/pom.xml | 2 +- pom.xml | 281 ++++++++++++++++++++++----------------------- 2 files changed, 140 insertions(+), 143 deletions(-) diff --git a/pollen-persistence/pom.xml b/pollen-persistence/pom.xml index 7589919..49d2e37 100644 --- a/pollen-persistence/pom.xml +++ b/pollen-persistence/pom.xml @@ -140,7 +140,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 4c0cc74..dd761de 100644 --- a/pom.xml +++ b/pom.xml @@ -5,27 +5,19 @@ <parent> <groupId>org.nuiton</groupId> - <artifactId>mavenpom4redmine</artifactId> - <version>5.0.4</version> + <artifactId>chorempom</artifactId> + <version>1.3</version> </parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> <version>1.5.6-SNAPSHOT</version> - - <modules> - <module>pollen-votecounting-api</module> - <module>pollen-votecounting-aggregator</module> - <module>pollen-persistence</module> - <module>pollen-services</module> - <module>pollen-ui-struts2</module> - </modules> + <packaging>pom</packaging> <name>Pollen</name> <description>Application de vote Pollen</description> - <inceptionYear>2009</inceptionYear> <url>http://doc.chorem.org/pollen</url> - + <inceptionYear>2009</inceptionYear> <licenses> <license> <name>GNU Affero General Public License version 3</name> @@ -38,7 +30,7 @@ <developer> <id>echatellier</id> <name>Éric Chatellier</name> - <email>chatellier at codelutin.com</email> + <email>chatellier@codelutin.com</email> <organization>CodeLutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> <timezone>Europe/Paris</timezone> @@ -49,7 +41,7 @@ <developer> <id>tchemit</id> <name>Tony Chemit</name> - <email>chemit at codelutin dot com</email> + <email>chemit@codelutin.com</email> <organization>Code Lutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> <timezone>Europe/Paris</timezone> @@ -61,7 +53,7 @@ <developer> <id>jcouteau</id> <name>Jean Couteau</name> - <email>couteau at codelutin dot com</email> + <email>couteau@codelutin.com</email> <organization>Code Lutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> <timezone>Europe/Paris</timezone> @@ -71,9 +63,9 @@ </roles> </developer> <developer> - <id>fdesbois</id> - <name>Florian Desbois</name> - <email>desbois at codelutin dot com</email> + <id>kmorin</id> + <name>Kevin Morin</name> + <email>morin@codelutin.com</email> <organization>Code Lutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> <timezone>Europe/Paris</timezone> @@ -82,20 +74,22 @@ </roles> </developer> <developer> - <id>kmorin</id> - <name>Kevin Morin</name> - <email>morin at codelutin dot com</email> - <organization>Code Lutin</organization> - <organizationUrl>http://www.codelutin.com/</organizationUrl> + <id>dralagen</id> + <name>Adrien Garandel</name> + <email>a.garandel@dralagen.fr</email> + <organizationUrl>http://dralagen.fr</organizationUrl> <timezone>Europe/Paris</timezone> <roles> <role>developer</role> </roles> </developer> </developers> - <contributors> <contributor> + <name>Florian Desbois</name> + <timezone>Europe/Paris</timezone> + </contributor> + <contributor> <name>Erwan NEMA</name> <email>nemawan@hotmail.com</email> <organization>ALMA - Code Lutin</organization> @@ -132,19 +126,37 @@ </contributor> <contributor> <name>Nolwenn RANNOU</name> - <email>rannou at codelutin.com</email> + <email>rannou@codelutin.com</email> <organization>Code Lutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> <timezone>Europe/Paris</timezone> </contributor> </contributors> - <packaging>pom</packaging> + <modules> + <module>pollen-votecounting-api</module> + <module>pollen-votecounting-aggregator</module> + <module>pollen-persistence</module> + <module>pollen-services</module> + <module>pollen-ui-struts2</module> + </modules> + + <scm> + <connection>scm:git:http://git.chorem.org/pollen.git</connection> + <developerConnection> + scm:git:https://git.chorem.org/pollen.git + </developerConnection> + <url>https://gitweb.chorem.org/pollen.git</url> + </scm> + <distributionManagement> + <site> + <id>${site.server}</id> + <url>${site.url}</url> + </site> + </distributionManagement> <properties> - <!-- redmine configuration --> - <platform>chorem.org</platform> <projectId>pollen</projectId> <!-- customized versions --> @@ -182,9 +194,75 @@ <signatureVersion>1.0</signatureVersion--> </properties> + <repositories> + + <repository> + <id>chorem-group</id> + <name>Chorem Group</name> + <url>http://nexus.nuiton.org/nexus/content/groups/pollen-group</url> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + + </repositories> + <pluginRepositories> + + <pluginRepository> + + <id>chorem-group</id> + <name>Chorem Group</name> + <url>http://nexus.nuiton.org/nexus/content/groups/pollen-group</url> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </pluginRepository> + + </pluginRepositories> + <dependencyManagement> <dependencies> + <!-- Commons --> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.3.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.commons</groupId> + <artifactId>commons-email</artifactId> + <version>1.3.2</version> + </dependency> + + <!-- Guava --> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>17.0</version> + </dependency> + <!-- ToPIA (and db) --> <dependency> @@ -227,12 +305,6 @@ <dependency> <groupId>org.nuiton</groupId> - <artifactId>nuiton-csv</artifactId> - <version>${nuitonUtilsVersion}</version> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> <version>${nuitonUtilsVersion}</version> </dependency> @@ -284,12 +356,6 @@ <version>1.0.17</version> </dependency> - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - <version>3.12.1.GA</version> - </dependency> - <!-- Rome (rss) --> <dependency> @@ -370,6 +436,12 @@ <scope>runtime</scope> </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.17</version> + </dependency> + <!-- Others --> <dependency> @@ -461,6 +533,22 @@ <scope>test</scope> </dependency> + <!-- Test --> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-validator</artifactId> + <version>${nuitonValidatorVersion}</version> + <scope>test</scope> + <classifier>tests</classifier> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.11</version> + <scope>test</scope> + </dependency> + </dependencies> </dependencyManagement> @@ -538,94 +626,6 @@ </resources> </build> - <scm> - <connection> - scm:svn:http://svn.chorem.org/pollen/branches/pollen-1.5.x - </connection> - <developerConnection> - scm:svn:https://svn.chorem.org/pollen/branches/pollen-1.5.x - </developerConnection> - <url> - http://forge.chorem.org/projects/pollen/repository/show/branches/pollen-1.5.... - </url> - </scm> - - <distributionManagement> - <site> - <id>doc.${platform}</id> - <url>${our.site.repository}/${projectId}</url> - </site> - </distributionManagement> - - <repositories> - - <!-- depot des releases nuiton --> - - <repository> - <id>nuiton.release</id> - <name>NuitonReleaseRepository</name> - <url>http://nexus.nuiton.org/nexus/content/groups/public/</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </releases> - </repository> - - <!-- depot des snapshots nuiton --> - - <repository> - <id>nuiton.snapshot</id> - <name>NuitonSnapshotRepository</name> - <url>http://nexus.nuiton.org/nexus/content/repositories/snapshots/</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </snapshots> - <releases> - <enabled>false</enabled> - </releases> - </repository> - - </repositories> - - <pluginRepositories> - - <!-- depot des releases nuiton --> - - <pluginRepository> - - <id>nuiton.release</id> - <name>NuitonReleaseRepository</name> - <url>http://nexus.nuiton.org/nexus/content/groups/public/</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </releases> - </pluginRepository> - - <!-- depot des snapshots nuiton --> - - <pluginRepository> - <id>nuiton.snapshot</id> - <name>NuitonSnapshotRepository</name> - <url>http://nexus.nuiton.org/nexus/content/repositories/snapshots/</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </snapshots> - <releases> - <enabled>false</enabled> - </releases> - </pluginRepository> - - </pluginRepositories> - <reporting> <!-- par defaut pas de report pour les sites --> @@ -648,12 +648,12 @@ <plugins> <plugin> <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils-maven-report-plugin</artifactId> - <version>${nuitonUtilsVersion}</version> + <artifactId>nuiton-maven-report-plugin</artifactId> + <version>3.0-rc-1</version> <reportSets> <reportSet> <reports> - <report>aggregate-application-config-report</report> + <report>aggregate-config-report</report> </reports> </reportSet> </reportSets> @@ -686,23 +686,20 @@ </profile> - <!-- do not generate site if no src/site is found for module --> <profile> - <id>not-site</id> + <id>release-quality-profile</id> <activation> - <file> - <missing>src/site</missing> - </file> + <property> + <name>performRelease</name> + <value>true</value> + </property> </activation> - - <properties> - <!-- no site generation --> - <maven.site.skip>true</maven.site.skip> - <maven.site.deploy.skip>true</maven.site.deploy.skip> + <helper.skipCheckAutocontainer>true</helper.skipCheckAutocontainer> </properties> - </profile> + + </profiles> </project> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm