branch develop updated (f0a0847 -> 6d26882)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen_1.x. See http://git.chorem.org/pollen_1.x.git from f0a0847 Center logo on home page. new 6d26882 Update parent pom 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 6d26882b3d3c12be2857d6f1855e407c544a1571 Author: Eric Chatellier <chatellier@codelutin.com> Date: Thu Mar 3 15:08:04 2016 +0100 Update parent pom Summary of changes: README.txt => README.md | 0 changelog.txt | 40 ---------------------- pollen-persistence/{README.txt => README.md} | 0 pollen-persistence/changelog.txt | 4 --- pollen-services/{README.txt => README.md} | 0 pollen-services/changelog.txt | 4 --- .../changelog.txt => pollen-ui-struts2/README.md | 0 pollen-ui-struts2/README.txt | 0 pollen-ui-struts2/changelog.txt | 0 .../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 | 15 +++----- 27 files changed, 5 insertions(+), 58 deletions(-) rename README.txt => README.md (100%) delete mode 100644 changelog.txt rename pollen-persistence/{README.txt => README.md} (100%) delete mode 100644 pollen-persistence/changelog.txt rename pollen-services/{README.txt => README.md} (100%) delete mode 100644 pollen-services/changelog.txt rename pollen-votecounting-percentage/changelog.txt => pollen-ui-struts2/README.md (100%) delete mode 100644 pollen-ui-struts2/README.txt delete mode 100644 pollen-ui-struts2/changelog.txt rename pollen-votecounting-percentage/README.txt => pollen-votecounting-aggregator/README.md (100%) delete mode 100644 pollen-votecounting-aggregator/README.txt delete mode 100644 pollen-votecounting-aggregator/changelog.txt rename pollen-votecounting-number/changelog.txt => pollen-votecounting-api/README.md (100%) delete mode 100644 pollen-votecounting-api/README.txt delete mode 100644 pollen-votecounting-api/changelog.txt rename pollen-votecounting-number/README.txt => pollen-votecounting-borda/README.md (100%) delete mode 100644 pollen-votecounting-borda/README.txt delete mode 100644 pollen-votecounting-borda/changelog.txt rename pollen-votecounting-normal/changelog.txt => pollen-votecounting-condorcet/README.md (100%) delete mode 100644 pollen-votecounting-condorcet/README.txt delete mode 100644 pollen-votecounting-condorcet/changelog.txt rename pollen-votecounting-normal/README.txt => pollen-votecounting-coombs/README.md (100%) rename pollen-votecounting-instant-runoff/{changelog.txt => README.md} (100%) rename pollen-votecounting-instant-runoff/README.txt => pollen-votecounting-normal/README.md (100%) rename pollen-votecounting-coombs/changelog.txt => pollen-votecounting-number/README.md (100%) rename pollen-votecounting-coombs/README.txt => pollen-votecounting-percentage/README.md (100%) -- 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 in repository pollen_1.x. See http://git.chorem.org/pollen_1.x.git commit 6d26882b3d3c12be2857d6f1855e407c544a1571 Author: Eric Chatellier <chatellier@codelutin.com> Date: Thu Mar 3 15:08:04 2016 +0100 Update parent pom --- README.txt => README.md | 0 changelog.txt | 40 ---------------------- pollen-persistence/{README.txt => README.md} | 0 pollen-persistence/changelog.txt | 4 --- pollen-services/{README.txt => README.md} | 0 pollen-services/changelog.txt | 4 --- .../changelog.txt => pollen-ui-struts2/README.md | 0 pollen-ui-struts2/README.txt | 0 pollen-ui-struts2/changelog.txt | 0 .../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 | 15 +++----- 27 files changed, 5 insertions(+), 58 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 e1efb15..0000000 --- a/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-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 d6bd141..0000000 --- a/pollen-persistence/changelog.txt +++ /dev/null @@ -1,4 +0,0 @@ -ChangeLog - -1.0.0 -- initiale release diff --git a/pollen-services/README.txt b/pollen-services/README.md similarity index 100% rename from pollen-services/README.txt rename to pollen-services/README.md diff --git a/pollen-services/changelog.txt b/pollen-services/changelog.txt deleted file mode 100644 index d6bd141..0000000 --- a/pollen-services/changelog.txt +++ /dev/null @@ -1,4 +0,0 @@ -ChangeLog - -1.0.0 -- initiale release diff --git a/pollen-votecounting-percentage/changelog.txt b/pollen-ui-struts2/README.md similarity index 100% rename from pollen-votecounting-percentage/changelog.txt rename to pollen-ui-struts2/README.md diff --git a/pollen-ui-struts2/README.txt b/pollen-ui-struts2/README.txt deleted file mode 100644 index e69de29..0000000 diff --git a/pollen-ui-struts2/changelog.txt b/pollen-ui-struts2/changelog.txt deleted file mode 100644 index e69de29..0000000 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 d6e27f9..6db4eb1 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>chorempom</artifactId> - <version>1.5</version> + <version>9</version> </parent> <groupId>org.chorem</groupId> @@ -148,12 +148,6 @@ </developerConnection> <url>https://gitweb.chorem.org/pollen_1.x.git</url> </scm> - <distributionManagement> - <site> - <id>${site.server}</id> - <url>${site.url}</url> - </site> - </distributionManagement> <properties> @@ -173,7 +167,7 @@ <shiroVersion>1.2.2</shiroVersion> <slf4jVersion>1.7.5</slf4jVersion> <jettyVersion>8.1.11.v20130520</jettyVersion> - <!--jettyVersion>${jettyPluginVersion}</jettyVersion--> + <jettyPluginVersion>${jettyVersion}</jettyPluginVersion> <hibernateVersion>4.2.1.Final</hibernateVersion> <seleniumVersion>2.33.0</seleniumVersion> <mockitoVersion>1.9.5</mockitoVersion> @@ -189,9 +183,10 @@ <scmwebeditorEnabled>true</scmwebeditorEnabled> <!-- java configuration --> - <!--javaVersion>1.7</javaVersion> + <ciViewId>Pollen</ciViewId> + <javaVersion>1.7</javaVersion> <signatureArtifactId>java17</signatureArtifactId> - <signatureVersion>1.0</signatureVersion--> + <signatureVersion>1.0</signatureVersion> </properties> <repositories> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm