Jeroen Hoffman pushed to branch bugfix/HIPPLUG-1401 at cms-community /
hippo-plugin-content-blocks
Commits:
35d943bd by Jeroen Hoffman at 2016-11-15T11:07:41+01:00
HIPPLUG-1145 Content Blocks: set demo to 11.2 versioning; ignore demo/storage
- - - - -
291cd8e8 by Jeroen Hoffman at 2016-11-15T11:09:29+01:00
HIPPLUG-1401 Merge demo 11.2 versioning from 'master' into
bugfix/HIPPLUG-1401
- - - - -
7 changed files:
- .gitignore
- demo/bootstrap/configuration/pom.xml
- demo/bootstrap/content/pom.xml
- demo/bootstrap/pom.xml
- demo/cms/pom.xml
- demo/pom.xml
- demo/site/pom.xml
Changes:
=====================================
.gitignore
=====================================
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
.project/
.settings
target/
+demo/storage
=====================================
demo/bootstrap/configuration/pom.xml
=====================================
--- a/demo/bootstrap/configuration/pom.xml
+++ b/demo/bootstrap/configuration/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.onehippo.cms7.content-blocks-demo</groupId>
<artifactId>hippo-plugin-content-blocks-demo-bootstrap</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
<name>Hippo Plugin Content Blocks Demo Bootstrap Configuration</name>
=====================================
demo/bootstrap/content/pom.xml
=====================================
--- a/demo/bootstrap/content/pom.xml
+++ b/demo/bootstrap/content/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.onehippo.cms7.content-blocks-demo</groupId>
<artifactId>hippo-plugin-content-blocks-demo-bootstrap</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
<name>Hippo Plugin Content Blocks Demo Bootstrap Content</name>
=====================================
demo/bootstrap/pom.xml
=====================================
--- a/demo/bootstrap/pom.xml
+++ b/demo/bootstrap/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.onehippo.cms7.content-blocks-demo</groupId>
<artifactId>hippo-plugin-content-blocks-demo</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
<name>Hippo Plugin Content Blocks Demo Bootstrap</name>
=====================================
demo/cms/pom.xml
=====================================
--- a/demo/cms/pom.xml
+++ b/demo/cms/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.onehippo.cms7.content-blocks-demo</groupId>
<artifactId>hippo-plugin-content-blocks-demo</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
<name>Hippo Plugin Content Blocks Demo CMS</name>
=====================================
demo/pom.xml
=====================================
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -20,14 +20,14 @@
<parent>
<groupId>org.onehippo.cms7</groupId>
<artifactId>hippo-cms7-release</artifactId>
- <version>11.1.0-SNAPSHOT</version>
+ <version>11.2.0-SNAPSHOT</version>
</parent>
<name>Hippo Plugin Content Blocks Demo</name>
<description>Demo for the Hippo Plugin Content Blocks</description>
<groupId>org.onehippo.cms7.content-blocks-demo</groupId>
<artifactId>hippo-plugin-content-blocks-demo</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
=====================================
demo/site/pom.xml
=====================================
--- a/demo/site/pom.xml
+++ b/demo/site/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.onehippo.cms7.content-blocks-demo</groupId>
<artifactId>hippo-plugin-content-blocks-demo</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
<name>Hippo Plugin Content Blocks Demo Site</name>
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-plugin-content-blocks/compare/bfffa29133b69fe0c63c0d511becbaf7da620875...291cd8e87eb41bdd2841fc704003adc5c3157f00
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
