Commit a66db3e4 authored by Jeroen Hoffman's avatar Jeroen Hoffman

HIPPLUG-1481 Merge branch 'master' into feature/HIPPLUG-1481

parents 223557d0 36c09b23
......@@ -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>
......
......@@ -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>
......
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
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
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment