April 2020 - Pollen-commits - mailman.cloud.codelutin.com

branch release/3.3.3 updated (d2d49e98 -> 066a32f4)
by chorem.org scm 23 Apr '20

23 Apr '20

This is an automated email from the git hooks/post-receive script. New change to branch release/3.3.3 in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from d2d49e98 Do not use default tomcat conf (ajp unactivated by default starting with 8.5.54) adds 066a32f4 release 3.3.3 success [skip ci] No new revisions were added by this update. Summary of changes: CHANGELOG | 5 +++++ pollen-persistence/pom.xml | 2 +- pollen-rest-api/pom.xml | 2 +- pollen-services/pom.xml | 2 +- pollen-ui-riot-js/package-lock.json | 2 +- pollen-ui-riot-js/package.json | 2 +- pollen-ui-riot-js/pom.xml | 2 +- pollen-votecounting-aggregator/pom.xml | 2 +- pollen-votecounting-api/pom.xml | 2 +- pollen-votecounting-borda/pom.xml | 2 +- pollen-votecounting-condorcet/pom.xml | 2 +- pollen-votecounting-coombs/pom.xml | 2 +- pollen-votecounting-cumulative/pom.xml | 2 +- pollen-votecounting-instant-runoff/pom.xml | 2 +- pollen-votecounting-majority-judgment/pom.xml | 2 +- pollen-votecounting-normal/pom.xml | 2 +- pollen-votecounting-number/pom.xml | 2 +- pom.xml | 2 +- 18 files changed, 22 insertions(+), 17 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch release/3.3.3 created (now d2d49e98)
by chorem.org scm 23 Apr '20

23 Apr '20

This is an automated email from the git hooks/post-receive script. New change to branch release/3.3.3 in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git at d2d49e98 Do not use default tomcat conf (ajp unactivated by default starting with 8.5.54) No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

03/03: Do not use default tomcat conf (ajp unactivated by default starting with 8.5.54)
by chorem.org scm 23 Apr '20

23 Apr '20

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit d2d49e984c82e83edeb0b63f7bb4a5e59431507e Author: jcouteau <couteau(a)codelutin.com> Date: Thu Apr 23 09:42:51 2020 +0200 Do not use default tomcat conf (ajp unactivated by default starting with 8.5.54) --- Dockerfile | 2 + docker/server.xml | 167 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 169 insertions(+) diff --git a/Dockerfile b/Dockerfile index 5fcab353..e9b67c24 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,6 +4,8 @@ # docker run -p 80:80 FROM tomcat:8.5 +COPY ./docker/server.xml /usr/local/tomcat/conf/server.xml + RUN apt-get update && apt-get -y install apache2 && apt-get clean\ && a2enmod proxy_ajp && a2enmod rewrite diff --git a/docker/server.xml b/docker/server.xml new file mode 100644 index 00000000..58a9da9d --- /dev/null +++ b/docker/server.xml @@ -0,0 +1,167 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<Server port="8005" shutdown="SHUTDOWN"> + <Listener className="org.apache.catalina.startup.VersionLoggerListener" /> +  +  + <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" /> +  + <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" /> + <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" /> + <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" /> + +  + <GlobalNamingResources> +  + <Resource name="UserDatabase" auth="Container" + type="org.apache.catalina.UserDatabase" + description="User database that can be updated and saved" + factory="org.apache.catalina.users.MemoryUserDatabaseFactory" + pathname="conf/tomcat-users.xml" /> + </GlobalNamingResources> + +  + <Service name="Catalina"> + +  +  + + +  + <Connector port="8080" protocol="HTTP/1.1" + connectionTimeout="20000" + redirectPort="8443" /> +  +  +  +  +  +  + +  + <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" secretRequired="false"/> + + +  + +  + <Engine name="Catalina" defaultHost="localhost"> + +  +  + +  + <Realm className="org.apache.catalina.realm.LockOutRealm"> +  + <Realm className="org.apache.catalina.realm.UserDatabaseRealm" + resourceName="UserDatabase"/> + </Realm> + + <Host name="localhost" appBase="webapps" + unpackWARs="true" autoDeploy="true"> + +  +  + +  + <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs" + prefix="localhost_access_log" suffix=".txt" + pattern="%h %l %u %t "%r" %s %b" /> + + </Host> + </Engine> + </Service> +</Server> \ No newline at end of file -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

02/03: Next dev version
by chorem.org scm 23 Apr '20

23 Apr '20

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 7cc66e3d16ae6bbc31f0381ba039fe42c2591124 Author: jcouteau <couteau(a)codelutin.com> Date: Thu Apr 23 09:41:58 2020 +0200 Next dev version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f2372b58..727f6243 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.3.2</version> + <version>3.3.3-SNAPSHOT</version> <packaging>pom</packaging> <name>Pollen</name> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch develop updated (9cc7d868 -> d2d49e98)
by chorem.org scm 23 Apr '20

23 Apr '20

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 9cc7d868 Merge tag '3.3.2' into develop new a56d4e36 Next dev version new 7cc66e3d Next dev version new d2d49e98 Do not use default tomcat conf (ajp unactivated by default starting with 8.5.54) The 3 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 d2d49e984c82e83edeb0b63f7bb4a5e59431507e Author: jcouteau <couteau(a)codelutin.com> Date: Thu Apr 23 09:42:51 2020 +0200 Do not use default tomcat conf (ajp unactivated by default starting with 8.5.54) commit 7cc66e3d16ae6bbc31f0381ba039fe42c2591124 Author: jcouteau <couteau(a)codelutin.com> Date: Thu Apr 23 09:41:58 2020 +0200 Next dev version commit a56d4e36e87a49c84d8dc9771a85dd9a92bcd022 Author: jcouteau <couteau(a)codelutin.com> Date: Thu Apr 23 09:41:40 2020 +0200 Next dev version Summary of changes: Dockerfile | 2 + docker/server.xml | 167 ++++++++++++++++++++++++++ pollen-persistence/pom.xml | 2 +- pollen-rest-api/pom.xml | 2 +- pollen-services/pom.xml | 2 +- pollen-ui-riot-js/pom.xml | 2 +- pollen-votecounting-aggregator/pom.xml | 2 +- pollen-votecounting-api/pom.xml | 2 +- pollen-votecounting-borda/pom.xml | 2 +- pollen-votecounting-condorcet/pom.xml | 2 +- pollen-votecounting-coombs/pom.xml | 2 +- pollen-votecounting-cumulative/pom.xml | 2 +- pollen-votecounting-instant-runoff/pom.xml | 2 +- pollen-votecounting-majority-judgment/pom.xml | 2 +- pollen-votecounting-normal/pom.xml | 2 +- pollen-votecounting-number/pom.xml | 2 +- pom.xml | 2 +- 17 files changed, 184 insertions(+), 15 deletions(-) create mode 100644 docker/server.xml -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

annotated tag 3.3.2 created (now 4b14b07d)
by chorem.org scm 22 Apr '20

22 Apr '20

This is an automated email from the git hooks/post-receive script. New change to annotated tag 3.3.2 in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git at 4b14b07d (tag) tagging 9d9f220a35b8d35469e12431a854160ffcccc93d (commit) replaces 3.3.1 tagged by Maven Release on Wed Apr 22 15:55:37 2020 +0000 - Log ----------------------------------------------------------------- release 3.3.2 success 3.3.2 ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch master updated (5b9a1f33 -> 9d9f220a)
by chorem.org scm 22 Apr '20

22 Apr '20

This is an automated email from the git hooks/post-receive script. New change to branch master in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 5b9a1f33 Merge branch 'release/3.3.1' adds 1059031a Merge tag '3.3.1' into develop adds b39dfbbf Next development version adds 46ac936b Fix error when voting as an invited user adds 8fbdc0ec release 3.3.2 success [skip ci] adds 9d9f220a Merge branch 'release/3.3.2' No new revisions were added by this update. Summary of changes: CHANGELOG | 5 +++++ pollen-persistence/pom.xml | 2 +- pollen-rest-api/pom.xml | 2 +- pollen-services/pom.xml | 2 +- .../main/java/org/chorem/pollen/services/service/VoteService.java | 5 +++-- pollen-ui-riot-js/package-lock.json | 2 +- pollen-ui-riot-js/package.json | 2 +- pollen-ui-riot-js/pom.xml | 2 +- pollen-votecounting-aggregator/pom.xml | 2 +- pollen-votecounting-api/pom.xml | 2 +- pollen-votecounting-borda/pom.xml | 2 +- pollen-votecounting-condorcet/pom.xml | 2 +- pollen-votecounting-coombs/pom.xml | 2 +- pollen-votecounting-cumulative/pom.xml | 2 +- pollen-votecounting-instant-runoff/pom.xml | 2 +- pollen-votecounting-majority-judgment/pom.xml | 2 +- pollen-votecounting-normal/pom.xml | 2 +- pollen-votecounting-number/pom.xml | 2 +- pom.xml | 2 +- 19 files changed, 25 insertions(+), 19 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch develop updated (46ac936b -> 9cc7d868)
by chorem.org scm 22 Apr '20

22 Apr '20

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 46ac936b Fix error when voting as an invited user adds 8fbdc0ec release 3.3.2 success [skip ci] new 9d9f220a Merge branch 'release/3.3.2' new 9cc7d868 Merge tag '3.3.2' into develop 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 9cc7d868078c3f086dfec26e590ca3bbaa2ece59 Merge: 46ac936b 9d9f220a Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Apr 22 15:55:37 2020 +0000 Merge tag '3.3.2' into develop release 3.3.2 success 3.3.2 commit 9d9f220a35b8d35469e12431a854160ffcccc93d Merge: 5b9a1f33 8fbdc0ec Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Apr 22 15:55:37 2020 +0000 Merge branch 'release/3.3.2' Summary of changes: CHANGELOG | 5 +++++ pollen-persistence/pom.xml | 2 +- pollen-rest-api/pom.xml | 2 +- pollen-services/pom.xml | 2 +- pollen-ui-riot-js/package-lock.json | 2 +- pollen-ui-riot-js/package.json | 2 +- pollen-ui-riot-js/pom.xml | 2 +- pollen-votecounting-aggregator/pom.xml | 2 +- pollen-votecounting-api/pom.xml | 2 +- pollen-votecounting-borda/pom.xml | 2 +- pollen-votecounting-condorcet/pom.xml | 2 +- pollen-votecounting-coombs/pom.xml | 2 +- pollen-votecounting-cumulative/pom.xml | 2 +- pollen-votecounting-instant-runoff/pom.xml | 2 +- pollen-votecounting-majority-judgment/pom.xml | 2 +- pollen-votecounting-normal/pom.xml | 2 +- pollen-votecounting-number/pom.xml | 2 +- pom.xml | 2 +- 18 files changed, 22 insertions(+), 17 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 2

branch release/3.3.2 deleted (was 8fbdc0ec)
by chorem.org scm 22 Apr '20

22 Apr '20

This is an automated email from the git hooks/post-receive script. New change to branch release/3.3.2 in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git was 8fbdc0ec release 3.3.2 success [skip ci] The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch release/3.3.2 updated (46ac936b -> 8fbdc0ec)
by chorem.org scm 22 Apr '20

22 Apr '20

This is an automated email from the git hooks/post-receive script. New change to branch release/3.3.2 in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 46ac936b Fix error when voting as an invited user new 8fbdc0ec release 3.3.2 success [skip ci] 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 8fbdc0ec0d6cd3174235f4ad2ba95c1c3661c53f Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Apr 22 15:55:28 2020 +0000 release 3.3.2 success [skip ci] Summary of changes: CHANGELOG | 5 +++++ pollen-persistence/pom.xml | 2 +- pollen-rest-api/pom.xml | 2 +- pollen-services/pom.xml | 2 +- pollen-ui-riot-js/package-lock.json | 2 +- pollen-ui-riot-js/package.json | 2 +- pollen-ui-riot-js/pom.xml | 2 +- pollen-votecounting-aggregator/pom.xml | 2 +- pollen-votecounting-api/pom.xml | 2 +- pollen-votecounting-borda/pom.xml | 2 +- pollen-votecounting-condorcet/pom.xml | 2 +- pollen-votecounting-coombs/pom.xml | 2 +- pollen-votecounting-cumulative/pom.xml | 2 +- pollen-votecounting-instant-runoff/pom.xml | 2 +- pollen-votecounting-majority-judgment/pom.xml | 2 +- pollen-votecounting-normal/pom.xml | 2 +- pollen-votecounting-number/pom.xml | 2 +- pom.xml | 2 +- 18 files changed, 22 insertions(+), 17 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1