Jeroen Hoffman pushed to branch feature/HIPPLUG-1481 at cms-community /
hippo-plugin-poll
Commits:
6ddded00 by Tobias Jeger at 2017-08-15T16:49:39+02:00
HIPPLUG-1482 Update demo project parent POM version
- - - - -
a5b40409 by Arent-Jan Banck at 2017-08-24T16:12:52+02:00
HIPPLUG-1474 prepare for 12.1 development and set project version to
4.1.0-SNAPSHOT
- - - - -
b97e1d2d by Arent-Jan Banck at 2017-08-30T12:22:45+02:00
HIPPLUG-1485 Bump taglibs version
- - - - -
9e6a2a6b by Arent-Jan Banck at 2017-10-05T16:24:26+02:00
HIPPLUG-1494 Update parent project to version 29.3-SNAPSHOT
- - - - -
36c09b23 by Tobias Jeger at 2017-10-11T15:26:47+02:00
HIPPLUG-1497 Update demo to use latest release, fix bootstrap warnings
(cherry picked from commit b848fd86c55e2ee9ed9966221a665972a2652ce9)
- - - - -
a66db3e4 by Jeroen Hoffman at 2017-10-18T12:02:04+02:00
HIPPLUG-1481 Merge branch 'master' into feature/HIPPLUG-1481
- - - - -
7 changed files:
- addon-cms/pom.xml
- addon-repository/pom.xml
- demo/bootstrap/configuration/src/main/resources/hcm-config/hst/hosts.yaml
- demo/bootstrap/configuration/src/main/resources/hcm-config/hst/sites.yaml
- demo/pom.xml
- hst-client/pom.xml
- pom.xml
Changes:
=====================================
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>4.0.1-SNAPSHOT</version>
+ <version>4.1.0-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>4.0.1-SNAPSHOT</version>
+ <version>4.1.0-SNAPSHOT</version>
</parent>
<artifactId>hippo-plugin-poll-addon-repository</artifactId>
=====================================
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/hosts.yaml
=====================================
--- a/demo/bootstrap/configuration/src/main/resources/hcm-config/hst/hosts.yaml
+++ b/demo/bootstrap/configuration/src/main/resources/hcm-config/hst/hosts.yaml
@@ -1,15 +1,12 @@
definitions:
config:
- /hst:hst/hst:hosts:
- jcr:primaryType: hst:virtualhosts
- hst:defaultcontextpath: /site
- /dev-localhost:
- jcr:primaryType: hst:virtualhostgroup
- hst:cmslocation: http://localhost:8080/cms
- hst:defaultport: 8080
- /localhost:
- jcr:primaryType: hst:virtualhost
- /hst:root:
- jcr:primaryType: hst:mount
- hst:homepage: root
- hst:mountpoint: /hst:hst/hst:sites/polldemo
+ /hst:hst/hst:hosts/dev-localhost:
+ jcr:primaryType: hst:virtualhostgroup
+ hst:cmslocation: http://localhost:8080/cms
+ hst:defaultport: 8080
+ /localhost:
+ jcr:primaryType: hst:virtualhost
+ /hst:root:
+ jcr:primaryType: hst:mount
+ hst:homepage: root
+ hst:mountpoint: /hst:hst/hst:sites/polldemo
=====================================
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/sites.yaml
=====================================
--- a/demo/bootstrap/configuration/src/main/resources/hcm-config/hst/sites.yaml
+++ b/demo/bootstrap/configuration/src/main/resources/hcm-config/hst/sites.yaml
@@ -1,7 +1,5 @@
definitions:
config:
- /hst:hst/hst:sites:
- jcr:primaryType: hst:sites
- /polldemo:
- jcr:primaryType: hst:site
- hst:content: /content/documents/polldemo
+ /hst:hst/hst:sites/polldemo:
+ jcr:primaryType: hst:site
+ hst:content: /content/documents/polldemo
=====================================
demo/pom.xml
=====================================
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onehippo.cms7</groupId>
<artifactId>hippo-cms7-release</artifactId>
- <version>12.0.0-SNAPSHOT</version>
+ <version>12.1.0-SNAPSHOT</version>
</parent>
<name>Hippo Plugin Poll Demo</name>
@@ -65,8 +65,8 @@
<essentials.version>4.0.0-SNAPSHOT</essentials.version>
<jsp-api.version>2.2</jsp-api.version>
- <taglibs.version>1.2.1</taglibs.version>
- <xalan.version>2.7.1</xalan.version>
+ <taglibs.version>1.2.5</taglibs.version>
+ <xalan.version>2.7.2</xalan.version>
<junit.version>4.10</junit.version>
<easymock.version>3.1</easymock.version>
=====================================
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>4.0.1-SNAPSHOT</version>
+ <version>4.1.0-SNAPSHOT</version>
</parent>
<artifactId>hippo-plugin-poll-hst-client</artifactId>
=====================================
pom.xml
=====================================
--- a/pom.xml
+++ b/pom.xml
@@ -21,13 +21,13 @@
<parent>
<groupId>org.onehippo.cms7</groupId>
<artifactId>hippo-cms7-project</artifactId>
- <version>29</version>
+ <version>29.3-SNAPSHOT</version>
</parent>
<name>Hippo Plugin Poll</name>
<description>Hippo Plugin Poll</description>
<artifactId>hippo-plugin-poll</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.1.0-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>5.0.0</hippo.cms.version>
- <hippo.repository.version>5.0.0</hippo.repository.version>
- <hippo.hst.version>5.0.0</hippo.hst.version>
- <hippo.commons.version>4.0.0</hippo.commons.version>
+ <hippo.cms.version>5.1.0-SNAPSHOT</hippo.cms.version>
+ <hippo.repository.version>5.1.0-SNAPSHOT</hippo.repository.version>
+ <hippo.hst.version>5.1.0-SNAPSHOT</hippo.hst.version>
+ <hippo.commons.version>4.1.0-SNAPSHOT</hippo.commons.version>
</properties>
<repositories>
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-plugin-poll/compare/223557d0d4c21825066176f85acafa889584aa79...a66db3e43b3ef08a908fb08b578acc34a6643f32
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-plugin-poll/compare/223557d0d4c21825066176f85acafa889584aa79...a66db3e43b3ef08a908fb08b578acc34a6643f32
You're receiving this email because of your account on code.onehippo.org.
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
