This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit e43814a219ae892bb6e606cc748503bb2935dc46 Author: Eric Chatellier <chatellier@codelutin.com> Date: Thu Mar 3 15:08:28 2016 +0100 Update parent pom --- README.txt => README.md | 0 changelog.txt | 46 ---------------------- pollen-persistence/{README.txt => README.md} | 0 pollen-persistence/changelog.txt | 4 -- pollen-rest-api/{README.txt => README.md} | 0 pollen-rest-api/changelog.txt | 0 .../changelog.txt => pollen-services/README.md | 0 pollen-services/README.txt | 0 pollen-services/changelog.txt | 0 pollen-ui-angular/.gitignore | 1 + pollen-ui-angular/{README.txt => README.md} | 0 pollen-ui-angular/changelog.txt | 40 ------------------- .../README.md | 0 pollen-votecounting-aggregator/README.txt | 0 pollen-votecounting-aggregator/changelog.txt | 0 .../README.md | 0 pollen-votecounting-api/README.txt | 0 pollen-votecounting-api/changelog.txt | 0 .../README.md | 0 pollen-votecounting-borda/README.txt | 0 pollen-votecounting-borda/changelog.txt | 0 .../README.md | 0 pollen-votecounting-condorcet/README.txt | 0 pollen-votecounting-condorcet/changelog.txt | 0 .../README.md | 0 .../{changelog.txt => README.md} | 0 .../README.md | 0 .../README.md | 0 .../README.md | 0 pom.xml | 13 +++--- 30 files changed, 7 insertions(+), 97 deletions(-) diff --git a/README.txt b/README.md similarity index 100% rename from README.txt rename to README.md diff --git a/changelog.txt b/changelog.txt deleted file mode 100644 index 6d69dd1..0000000 --- a/changelog.txt +++ /dev/null @@ -1,46 +0,0 @@ -ChangeLog -========= - -changelog is generated it from the redmine issues: - -http://doc.chorem.org/pollen/changes-report.html - - -1.2.3 -- Anomalie #101: Sondage à type de dépouillement: Number - -1.2.2 -- Rename favicon to favicon.png -- Use war launcher from nuiton-utils project -- Evolution #96: Nouveau type de consultation: un nombre - -1.2.1 -- Erreur lors de la modification de son vote Issue: 87 - -1.2.0 -- Fixed a performance problem in the file upload with Winstone. -- Global dependencies update -- Use hudson version of winstone web server (original seam unmaintained) -- Fix slf4j dependency bug between api & impl -- Evol #54 -- Ano #49 - -1.1.0 -- liste de votants à partir d'un serveur ldap -- export de sondage -- flux de syndication atom -- création d'un sondage par copie d'un ancien -- sondages par groupes -- administration des sondages et des utilisateurs -- suppression de choix, de votes et de commentaires -- liste des sondages auxquels l'utilisateur a participé -- URL forgée pour les votes restreints - -1.0.1 -- refonte de la création de sondage -- sondages restreints -- listes de votants -- service de migration - -1.0.0 -- initiale release diff --git a/pollen-persistence/README.txt b/pollen-persistence/README.md similarity index 100% rename from pollen-persistence/README.txt rename to pollen-persistence/README.md diff --git a/pollen-persistence/changelog.txt b/pollen-persistence/changelog.txt deleted file mode 100644 index ede781f..0000000 --- a/pollen-persistence/changelog.txt +++ /dev/null @@ -1,4 +0,0 @@ -ChangeLog - -2.0 -- initiale release diff --git a/pollen-rest-api/README.txt b/pollen-rest-api/README.md similarity index 100% rename from pollen-rest-api/README.txt rename to pollen-rest-api/README.md diff --git a/pollen-rest-api/changelog.txt b/pollen-rest-api/changelog.txt deleted file mode 100644 index e69de29..0000000 diff --git a/pollen-votecounting-percentage/changelog.txt b/pollen-services/README.md similarity index 100% rename from pollen-votecounting-percentage/changelog.txt rename to pollen-services/README.md diff --git a/pollen-services/README.txt b/pollen-services/README.txt deleted file mode 100644 index e69de29..0000000 diff --git a/pollen-services/changelog.txt b/pollen-services/changelog.txt deleted file mode 100644 index e69de29..0000000 diff --git a/pollen-ui-angular/.gitignore b/pollen-ui-angular/.gitignore index aeec6e0..30f945d 100644 --- a/pollen-ui-angular/.gitignore +++ b/pollen-ui-angular/.gitignore @@ -6,3 +6,4 @@ src/main/webapp/css/style.css src/main/webapp/js/conf.js src/main/webapp/version.txt +/target/ diff --git a/pollen-ui-angular/README.txt b/pollen-ui-angular/README.md similarity index 100% rename from pollen-ui-angular/README.txt rename to pollen-ui-angular/README.md diff --git a/pollen-ui-angular/changelog.txt b/pollen-ui-angular/changelog.txt deleted file mode 100644 index e1efb15..0000000 --- a/pollen-ui-angular/changelog.txt +++ /dev/null @@ -1,40 +0,0 @@ -ChangeLog -========= -1.2.3 -- Anomalie #101: Sondage à type de dépouillement: Number - -1.2.2 -- Rename favicon to favicon.png -- Use war launcher from nuiton-utils project -- Evolution #96: Nouveau type de consultation: un nombre - -1.2.1 -- Erreur lors de la modification de son vote Issue: 87 - -1.2.0 -- Fixed a performance problem in the file upload with Winstone. -- Global dependencies update -- Use hudson version of winstone web server (original seam unmaintained) -- Fix slf4j dependency bug between api & impl -- Evol #54 -- Ano #49 - -1.1.0 -- liste de votants à partir d'un serveur ldap -- export de sondage -- flux de syndication atom -- création d'un sondage par copie d'un ancien -- sondages par groupes -- administration des sondages et des utilisateurs -- suppression de choix, de votes et de commentaires -- liste des sondages auxquels l'utilisateur a participé -- URL forgée pour les votes restreints - -1.0.1 -- refonte de la création de sondage -- sondages restreints -- listes de votants -- service de migration - -1.0.0 -- initiale release diff --git a/pollen-votecounting-percentage/README.txt b/pollen-votecounting-aggregator/README.md similarity index 100% rename from pollen-votecounting-percentage/README.txt rename to pollen-votecounting-aggregator/README.md diff --git a/pollen-votecounting-aggregator/README.txt b/pollen-votecounting-aggregator/README.txt deleted file mode 100644 index e69de29..0000000 diff --git a/pollen-votecounting-aggregator/changelog.txt b/pollen-votecounting-aggregator/changelog.txt deleted file mode 100644 index e69de29..0000000 diff --git a/pollen-votecounting-number/changelog.txt b/pollen-votecounting-api/README.md similarity index 100% rename from pollen-votecounting-number/changelog.txt rename to pollen-votecounting-api/README.md diff --git a/pollen-votecounting-api/README.txt b/pollen-votecounting-api/README.txt deleted file mode 100644 index e69de29..0000000 diff --git a/pollen-votecounting-api/changelog.txt b/pollen-votecounting-api/changelog.txt deleted file mode 100644 index e69de29..0000000 diff --git a/pollen-votecounting-number/README.txt b/pollen-votecounting-borda/README.md similarity index 100% rename from pollen-votecounting-number/README.txt rename to pollen-votecounting-borda/README.md diff --git a/pollen-votecounting-borda/README.txt b/pollen-votecounting-borda/README.txt deleted file mode 100644 index e69de29..0000000 diff --git a/pollen-votecounting-borda/changelog.txt b/pollen-votecounting-borda/changelog.txt deleted file mode 100644 index e69de29..0000000 diff --git a/pollen-votecounting-normal/changelog.txt b/pollen-votecounting-condorcet/README.md similarity index 100% rename from pollen-votecounting-normal/changelog.txt rename to pollen-votecounting-condorcet/README.md diff --git a/pollen-votecounting-condorcet/README.txt b/pollen-votecounting-condorcet/README.txt deleted file mode 100644 index e69de29..0000000 diff --git a/pollen-votecounting-condorcet/changelog.txt b/pollen-votecounting-condorcet/changelog.txt deleted file mode 100644 index e69de29..0000000 diff --git a/pollen-votecounting-normal/README.txt b/pollen-votecounting-coombs/README.md similarity index 100% rename from pollen-votecounting-normal/README.txt rename to pollen-votecounting-coombs/README.md diff --git a/pollen-votecounting-instant-runoff/changelog.txt b/pollen-votecounting-instant-runoff/README.md similarity index 100% rename from pollen-votecounting-instant-runoff/changelog.txt rename to pollen-votecounting-instant-runoff/README.md diff --git a/pollen-votecounting-instant-runoff/README.txt b/pollen-votecounting-normal/README.md similarity index 100% rename from pollen-votecounting-instant-runoff/README.txt rename to pollen-votecounting-normal/README.md diff --git a/pollen-votecounting-coombs/changelog.txt b/pollen-votecounting-number/README.md similarity index 100% rename from pollen-votecounting-coombs/changelog.txt rename to pollen-votecounting-number/README.md diff --git a/pollen-votecounting-coombs/README.txt b/pollen-votecounting-percentage/README.md similarity index 100% rename from pollen-votecounting-coombs/README.txt rename to pollen-votecounting-percentage/README.md diff --git a/pom.xml b/pom.xml index 9fbfbcd..ca452a3 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>chorempom</artifactId> - <version>5-rc-2</version> + <version>9</version> </parent> <groupId>org.chorem</groupId> @@ -147,12 +147,6 @@ <connection>scm:git:git@gitlab.nuiton.org:chorem/pollen.git</connection> <developerConnection>scm:git:git@gitlab.nuiton.org:chorem/pollen.git</developerConnection> </scm> - <distributionManagement> - <site> - <id>${site.server}</id> - <url>${site.url}</url> - </site> - </distributionManagement> <properties> @@ -188,6 +182,11 @@ <!--Site configuration --> <locales>en,fr</locales> <siteSourcesType>rst</siteSourcesType> + + <ciViewId>Pollen</ciViewId> + <javaVersion>1.7</javaVersion> + <signatureArtifactId>java17</signatureArtifactId> + <signatureVersion>1.0</signatureVersion> </properties> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.