Commit f7fb495d authored by Ate Douma's avatar Ate Douma

HSTCONFIGEDIT-193: Merge master into feature/translations-psp1

parents d7806320 aa4eec5a
Hippo Addon HST Configuration Editor
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/);
......
......@@ -20,7 +20,7 @@
<parent>
<artifactId>hippo-addon-hst-configuration-editor</artifactId>
<groupId>org.onehippo.cms7</groupId>
<version>2.x-translations-1.0-SNAPSHOT</version>
<version>3.0.0-translations-psp1-SNAPSHOT</version>
</parent>
<artifactId>hippo-addon-hst-configuration-editor-frontend</artifactId>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>org.onehippo.cms7</groupId>
<artifactId>hippo-cms7-project</artifactId>
<version>27.2</version>
<version>28-SNAPSHOT</version>
</parent>
<name>Hippo Addon HST Configuration Editor</name>
......@@ -29,7 +29,7 @@
-->
<artifactId>hippo-addon-hst-configuration-editor</artifactId>
<version>2.x-translations-1.0-SNAPSHOT</version>
<version>3.0.0-translations-psp1-SNAPSHOT</version>
<packaging>pom</packaging>
<inceptionYear>2009</inceptionYear>
<issueManagement>
......@@ -44,10 +44,10 @@
<product_name>Hippo Addon HST Configuration Editor</product_name>
<product_abr>HSTCONFIGEDIT</product_abr>
<hippo.cms.version>3.1.0-SNAPSHOT</hippo.cms.version>
<hippo.repository.version>3.1.0-SNAPSHOT</hippo.repository.version>
<hippo.hst.version>3.1.0-SNAPSHOT</hippo.hst.version>
<hippo.services.version>2.1.0-SNAPSHOT</hippo.services.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.services.version>3.0.0-SNAPSHOT</hippo.services.version>
<commons-lang.version>2.1</commons-lang.version>
</properties>
......@@ -71,9 +71,9 @@
This is used by normal plugins, but also to autogenerate documentation in .../target/site/source-repository.html
-->
<scm>
<connection>scm:svn:http://svn.onehippo.org/repos/hippo/hippo-cms7/addons/addon-hst-configuration-editor/branches/hst-configuration-editor-translations-1</connection>
<developerConnection>scm:svn:https://svn.onehippo.org/repos/hippo/hippo-cms7/addons/addon-hst-configuration-editor/branches/hst-configuration-editor-translations-1</developerConnection>
<url>http://svn.onehippo.org/repos/hippo/hippo-cms7/addons/addon-hst-configuration-editor/branches/hst-configuration-editor-translations-1</url>
<connection>scm:svn:http://svn.onehippo.org/repos/hippo/hippo-cms7/addons/addon-hst-configuration-editor/trunk</connection>
<developerConnection>scm:svn:https://svn.onehippo.org/repos/hippo/hippo-cms7/addons/addon-hst-configuration-editor/trunk</developerConnection>
<url>http://svn.onehippo.org/repos/hippo/hippo-cms7/addons/addon-hst-configuration-editor/trunk</url>
</scm>
<mailingLists>
......
......@@ -19,7 +19,7 @@
<parent>
<artifactId>hippo-addon-hst-configuration-editor</artifactId>
<groupId>org.onehippo.cms7</groupId>
<version>2.x-translations-1.0-SNAPSHOT</version>
<version>3.0.0-translations-psp1-SNAPSHOT</version>
</parent>
<artifactId>hippo-addon-hst-configuration-editor-repository</artifactId>
......
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