Ate Douma pushed to branch feature/translations-psp1 at cms / hippo-plugin-poll
Commits: 1321241d by Arent-Jan Banck at 2016-01-08T14:30:27+00:00 CMS-9856: Update copyright year to 2016 - - - - - 7242b027 by Tobias Jeger at 2016-01-20T10:05:18+00:00 HIPPLUG-1083: restore accidentally removed (valid!) reload-on-startup flag to avoid upgrading inconsistencies. - - - - - 4232f200 by Arthur Bogaart at 2016-01-26T09:48:49+00:00 HIPPLUG-1256: Bump version of parent POM to 27.4 and remove duplicate <groupId/> element - - - - - 91221ebf by Arent-Jan Banck at 2016-01-26T13:05:38+00:00 CMS-9899: prepare branch hippo-plugin-poll-2.2.x - - - - - 66ab310e by Arent-Jan Banck at 2016-01-26T13:05:43+00:00 CMS-9899: prepare for next development iteration - - - - - 38e581ce by Arent-Jan Banck at 2016-01-26T13:40:39+00:00 CMS-9899: prepare branch poll-demo-2.2.x - - - - - 329dda3e by Arent-Jan Banck at 2016-01-26T13:40:44+00:00 CMS-9899: prepare for next development iteration - - - - - 05dff5dd by Ate Douma at 2016-01-27T13:36:01+00:00 CMS-9905: Update and align project pom parent and other dependency version references across all product projects - - - - - 82faacac by Ate Douma at 2016-02-09T01:12:59+01:00 HIPPLUG-1261: Consolidate poll plugin bootstrap configuration for next major release - - - - - 757e1762 by Ate Douma at 2016-02-16T01:47:34+01:00 HIPPLUG-1200 merge changes from master - - - - - 8 changed files: - − .gitattributes - + .gitignore - NOTICE - addon-cms/pom.xml - addon-repository/pom.xml - addon-repository/src/main/resources/hippoecm-extension.xml - hst-client/pom.xml - pom.xml Changes: ===================================== .gitattributes deleted ===================================== --- a/.gitattributes +++ /dev/null @@ -1,21 +0,0 @@ -* text=auto !eol -/LICENSE -text -/NOTICE -text -addon-repository/pom.xml svneol=native#text/plain -addon-repository/src/main/resources/domains/polldata-domain.xml svneol=native#text/plain -addon-repository/src/main/resources/hide-poll-namespace.xml svneol=native#text/plain -addon-repository/src/main/resources/hippoecm-extension.xml svneol=native#text/plain -addon-repository/src/main/resources/poll-catalog.xml svneol=native#text/plain -addon-repository/src/main/resources/poll-namespace.xml svneol=native#text/plain -addon-repository/src/main/resources/poll-root-node.xml svneol=native#text/plain -addon-repository/src/main/resources/poll-templates.xml svneol=native#text/plain -addon-repository/src/main/resources/poll.cnd -text -addon-repository/src/main/resources/type-translations.json -text -addon-repository/src/main/resources/types/compound/option.xml svneol=native#text/plain -addon-repository/src/main/resources/types/compound/poll.xml svneol=native#text/plain -addon-repository/src/main/resources/types/polldocument.xml svneol=native#text/plain -hst-client/pom.xml svneol=native#text/plain -hst-client/src/main/java/org/onehippo/forge/poll/component/PollDocumentComponent.java -text -hst-client/src/main/java/org/onehippo/forge/poll/component/PollDocumentComponentInfo.java -text -hst-client/src/main/resources/META-INF/web-resources/poll/catalog-poll.png -text svneol=unset#image/png -/pom.xml svneol=native#text/plain ===================================== .gitignore ===================================== --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +/.idea/ +*.iml +target/ \ No newline at end of file ===================================== NOTICE ===================================== --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ Hippo Plugin Poll -Copyright 2009-2015 Hippo B.V. (http://www.onehippo.com) +Copyright 2009-2016 Hippo B.V. (http://www.onehippo.com) This product includes software developed by: Hippo B.V., Amsterdam, The Netherlands (http://www.onehippo.com/); ===================================== addon-cms/pom.xml ===================================== --- a/addon-cms/pom.xml +++ b/addon-cms/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>org.onehippo.cms7</groupId> <artifactId>hippo-plugin-poll</artifactId> - <version>2.x-translations-1.0-SNAPSHOT</version> + <version>3.0.0-translations-psp1-SNAPSHOT</version> </parent> <artifactId>hippo-plugin-poll-addon-cms</artifactId> ===================================== addon-repository/pom.xml ===================================== --- a/addon-repository/pom.xml +++ b/addon-repository/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>org.onehippo.cms7</groupId> <artifactId>hippo-plugin-poll</artifactId> - <version>2.x-translations-1.0-SNAPSHOT</version> + <version>3.0.0-translations-psp1-SNAPSHOT</version> </parent> <artifactId>hippo-plugin-poll-addon-repository</artifactId> ===================================== addon-repository/src/main/resources/hippoecm-extension.xml ===================================== --- a/addon-repository/src/main/resources/hippoecm-extension.xml +++ b/addon-repository/src/main/resources/hippoecm-extension.xml @@ -172,6 +172,12 @@ <sv:property sv:name="hippo:sequence" sv:type="Double"> <sv:value>20434</sv:value> </sv:property> + <sv:property sv:name="hippo:reloadonstartup" sv:type="Boolean"> + <sv:value>true</sv:value> + </sv:property> + <sv:property sv:name="hippo:version" sv:type="String"> + <sv:value>3.0.0</sv:value> + </sv:property> </sv:node> <sv:node sv:name="hippopoll-catalog"> @@ -187,6 +193,12 @@ <sv:property sv:name="hippo:sequence" sv:type="Double"> <sv:value>20435</sv:value> </sv:property> + <sv:property sv:name="hippo:reloadonstartup" sv:type="Boolean"> + <sv:value>true</sv:value> + </sv:property> + <sv:property sv:name="hippo:version" sv:type="String"> + <sv:value>1.09.00</sv:value> + </sv:property> </sv:node> <sv:node sv:name="hippopoll-type-translations"> ===================================== hst-client/pom.xml ===================================== --- a/hst-client/pom.xml +++ b/hst-client/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>org.onehippo.cms7</groupId> <artifactId>hippo-plugin-poll</artifactId> - <version>2.x-translations-1.0-SNAPSHOT</version> + <version>3.0.0-translations-psp1-SNAPSHOT</version> </parent> <artifactId>hippo-plugin-poll-hst-client</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2009-2015 Hippo B.V. (http://www.onehippo.com) + Copyright 2009-2016 Hippo B.V. (http://www.onehippo.com) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -21,13 +21,13 @@ <parent> <groupId>org.onehippo.cms7</groupId> <artifactId>hippo-cms7-project</artifactId> - <version>27.2</version> + <version>28-SNAPSHOT</version> </parent> <name>Hippo Plugin Poll</name> <description>Hippo Plugin Poll</description> <artifactId>hippo-plugin-poll</artifactId> - <version>2.x-translations-1.0-SNAPSHOT</version> + <version>3.0.0-translations-psp1-SNAPSHOT</version> <packaging>pom</packaging> <inceptionYear>2009</inceptionYear> @@ -42,10 +42,10 @@ <!-- use root project name for all project modules NOTICE files, should be the same as in the root NOTICE file --> <notice.project.name>Hippo Plugin Poll</notice.project.name> - <hippo.cms.version>3.2.0-SNAPSHOT</hippo.cms.version> - <hippo.repository.version>3.2.0-SNAPSHOT</hippo.repository.version> - <hippo.hst.version>3.2.0-SNAPSHOT</hippo.hst.version> - <hippo.commons.version>2.2.0-SNAPSHOT</hippo.commons.version> + <hippo.cms.version>4.0.0-translations-psp1-SNAPSHOT</hippo.cms.version> + <hippo.repository.version>4.0.0-translations-psp1-SNAPSHOT</hippo.repository.version> + <hippo.hst.version>4.0.0-translations-psp1-SNAPSHOT</hippo.hst.version> + <hippo.commons.version>3.0.0-SNAPSHOT</hippo.commons.version> </properties> <repositories> @@ -61,7 +61,7 @@ </releases> </repository> </repositories> - + <issueManagement> <system>Hippo Forge</system> <url>https://issues.onehippo.com/browse/HIPPLUG/component/10874</url> View it on GitLab: https://code.onehippo.org/cms/hippo-plugin-poll/compare/43a947f47a12c739506522f9680ab84ba757c882...757e1762d454801a5effa564aa3f3adcb83a06ee
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
