Michael Metternich pushed to branch feature/create-content at cms-community / hippo-cms-release
Commits: 0b068514 by Arent-Jan Banck at 2017-11-27T13:56:24+01:00 CMS-10937 Update parent project to version 29.3 - - - - - 2908c79d by Arent-Jan Banck at 2017-11-28T15:18:25+01:00 CMS-11000 Prepare the 12.2 development iteration - - - - - 2f081d6e by Arent-Jan Banck at 2017-11-28T15:42:41+01:00 CMS-11000 Prepare the 12.2 development iteration - Fix CKEditor version - - - - - 793b5133 by Arent-Jan Banck at 2017-11-29T11:36:08+01:00 CMS-11000 Revert crisp to 2.1.0 - - - - - a4d8171e by Arent-Jan Banck at 2017-11-29T12:24:26+01:00 CMS-11005 Use CKEDitor 4.7.1-h12.1.0 - - - - - 0d246078 by Michael Metternich at 2017-11-30T15:20:31+01:00 CMS-10923 Merge master into feature/create-content - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -20,11 +20,11 @@ <parent> <groupId>org.onehippo.cms7</groupId> <artifactId>hippo-cms7-project</artifactId> - <version>29.3-SNAPSHOT</version> + <version>29.3</version> </parent> <artifactId>hippo-cms7-release</artifactId> - <version>12.1.0-create-content-SNAPSHOT</version> + <version>12.2.0-create-content-SNAPSHOT</version> <name>Hippo CMS7 Release POM</name> <description>Hippo CMS7 Release POM</description> @@ -39,44 +39,44 @@ </scm> <properties> - <hippo.release.version>12.1.0-SNAPSHOT</hippo.release.version> + <hippo.release.version>12.2.0-SNAPSHOT</hippo.release.version> <hippo.jackrabbit.version>2.14.0-h2</hippo.jackrabbit.version> - <hippo.configuration-management.version>1.1.0-SNAPSHOT</hippo.configuration-management.version> - <hippo.addon-channel-manager.version>5.1.0-create-content-SNAPSHOT</hippo.addon-channel-manager.version> - <hippo.addon-search-service.version>4.1.0-SNAPSHOT</hippo.addon-search-service.version> - <hippo.ckeditor.version>4.7.1-h12.1.0-SNAPSHOT</hippo.ckeditor.version> - <hippo.commons.version>4.1.0-SNAPSHOT</hippo.commons.version> - <hippo.cms.version>5.1.0-create-content-SNAPSHOT</hippo.cms.version> - <hippo.frontend.plugins.version>4.1.0-SNAPSHOT</hippo.frontend.plugins.version> - <hippo.frontend.theme.version>4.1.0-SNAPSHOT</hippo.frontend.theme.version> - <hippo.hst.version>5.1.0-create-content-SNAPSHOT</hippo.hst.version> - <hippo.packages.version>5.1.0-SNAPSHOT</hippo.packages.version> - <hippo.repository.version>5.1.0-create-content-SNAPSHOT</hippo.repository.version> - <hippo.services.version>4.1.0-SNAPSHOT</hippo.services.version> - <hippo.services.autoreload.version>4.1.0-SNAPSHOT</hippo.services.autoreload.version> - <hippo.services.contenttype.version>4.1.0-SNAPSHOT</hippo.services.contenttype.version> - <hippo.services.eventbus.version>4.1.0-SNAPSHOT</hippo.services.eventbus.version> - <hippo.services.webfiles.version>4.1.0-SNAPSHOT</hippo.services.webfiles.version> - <hippo.services.htmlprocessor.version>1.1.0-SNAPSHOT</hippo.services.htmlprocessor.version> - <hippo.utilities.version>4.1.0-SNAPSHOT</hippo.utilities.version> - <hippo.testutils.version>1.1.0-SNAPSHOT</hippo.testutils.version> + <hippo.configuration-management.version>1.2.0-SNAPSHOT</hippo.configuration-management.version> + <hippo.addon-channel-manager.version>5.2.0-create-content-SNAPSHOT</hippo.addon-channel-manager.version> + <hippo.addon-search-service.version>4.2.0-SNAPSHOT</hippo.addon-search-service.version> + <hippo.ckeditor.version>4.7.1-h12.1.0</hippo.ckeditor.version> + <hippo.commons.version>4.2.0-SNAPSHOT</hippo.commons.version> + <hippo.cms.version>5.2.0-create-content-SNAPSHOT</hippo.cms.version> + <hippo.frontend.plugins.version>4.2.0-SNAPSHOT</hippo.frontend.plugins.version> + <hippo.frontend.theme.version>4.2.0-SNAPSHOT</hippo.frontend.theme.version> + <hippo.hst.version>5.2.0-create-content-SNAPSHOT</hippo.hst.version> + <hippo.packages.version>5.2.0-SNAPSHOT</hippo.packages.version> + <hippo.repository.version>5.2.0-SNAPSHOT</hippo.repository.version> + <hippo.services.version>4.2.0-SNAPSHOT</hippo.services.version> + <hippo.services.autoreload.version>4.2.0-SNAPSHOT</hippo.services.autoreload.version> + <hippo.services.contenttype.version>4.2.0-SNAPSHOT</hippo.services.contenttype.version> + <hippo.services.eventbus.version>4.2.0-SNAPSHOT</hippo.services.eventbus.version> + <hippo.services.webfiles.version>4.2.0-SNAPSHOT</hippo.services.webfiles.version> + <hippo.services.htmlprocessor.version>1.2.0-SNAPSHOT</hippo.services.htmlprocessor.version> + <hippo.utilities.version>4.2.0-SNAPSHOT</hippo.utilities.version> + <hippo.testutils.version>1.2.0-SNAPSHOT</hippo.testutils.version> <!-- Hippo standard plugin versions --> - <hippo.essentials-components.version>4.1.0-SNAPSHOT</hippo.essentials-components.version> - <hippo.plugin.content-blocks.version>4.1.0-SNAPSHOT</hippo.plugin.content-blocks.version> - <hippo.plugin.content-tagging.version>7.1.0-SNAPSHOT</hippo.plugin.content-tagging.version> - <hippo.plugin.dashboard-document-wizard.version>4.1.0-SNAPSHOT</hippo.plugin.dashboard-document-wizard.version> - <hippo.plugin.gallerypicker.version>4.1.0-SNAPSHOT</hippo.plugin.gallerypicker.version> - <hippo.plugin.poll.version>4.1.0-SNAPSHOT</hippo.plugin.poll.version> - <hippo.plugin.relateddocs.version>5.1.0-SNAPSHOT</hippo.plugin.relateddocs.version> - <hippo.plugin.resourcebundle-editor.version>4.1.0-SNAPSHOT</hippo.plugin.resourcebundle-editor.version> - <hippo.plugin.robotstxt.version>4.1.0-SNAPSHOT</hippo.plugin.robotstxt.version> - <hippo.plugin.selections.version>5.1.0-SNAPSHOT</hippo.plugin.selections.version> - <hippo.plugin.seo-support.version>4.1.0-SNAPSHOT</hippo.plugin.seo-support.version> - <hippo.plugin.sitemap.version>4.1.0-SNAPSHOT</hippo.plugin.sitemap.version> - <hippo.plugin.taxonomy.version>4.1.0-SNAPSHOT</hippo.plugin.taxonomy.version> + <hippo.essentials-components.version>4.2.0-SNAPSHOT</hippo.essentials-components.version> + <hippo.plugin.content-blocks.version>4.2.0-SNAPSHOT</hippo.plugin.content-blocks.version> + <hippo.plugin.content-tagging.version>7.2.0-SNAPSHOT</hippo.plugin.content-tagging.version> + <hippo.plugin.dashboard-document-wizard.version>4.2.0-SNAPSHOT</hippo.plugin.dashboard-document-wizard.version> + <hippo.plugin.gallerypicker.version>4.2.0-SNAPSHOT</hippo.plugin.gallerypicker.version> + <hippo.plugin.poll.version>4.2.0-SNAPSHOT</hippo.plugin.poll.version> + <hippo.plugin.relateddocs.version>5.2.0-SNAPSHOT</hippo.plugin.relateddocs.version> + <hippo.plugin.resourcebundle-editor.version>4.2.0-SNAPSHOT</hippo.plugin.resourcebundle-editor.version> + <hippo.plugin.robotstxt.version>4.2.0-SNAPSHOT</hippo.plugin.robotstxt.version> + <hippo.plugin.selections.version>5.2.0-SNAPSHOT</hippo.plugin.selections.version> + <hippo.plugin.seo-support.version>4.2.0-SNAPSHOT</hippo.plugin.seo-support.version> + <hippo.plugin.sitemap.version>4.2.0-SNAPSHOT</hippo.plugin.sitemap.version> + <hippo.plugin.taxonomy.version>4.2.0-SNAPSHOT</hippo.plugin.taxonomy.version> <hippo.addon-crisp.version>2.1.0-SNAPSHOT</hippo.addon-crisp.version> <hippo.maven.plugin.l10n>2.0.0</hippo.maven.plugin.l10n> <!-- included locales placeholder to be overridden by end projects --> View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-release/compare/dc859e8ac499add1c0eafa695214e03868e64579...0d246078e263b901803366d09a2e9ae5cdf6d6b8 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-release/compare/dc859e8ac499add1c0eafa695214e03868e64579...0d246078e263b901803366d09a2e9ae5cdf6d6b8 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