Mathijs den Burger pushed to branch master at cms-community / hippo-plugin-dashboard-document-wizard
Commits: 641e08e9 by Canh Ngo at 2016-06-15T12:16:30+02:00 HIPPLUG-1313 configure to display project version on the dashboard - - - - - aff2f5ab by Canh Ngo at 2016-06-15T12:53:39+02:00 HIPPLUG-1313 added essentials dependencies These dependencies are required because /site artifact uses Essentials components to render News and Events documents. - - - - - 127d6405 by Canh Ngo at 2016-06-15T12:58:06+02:00 HIPPLUG-1313 bumped demo version to align with plugin version - - - - - bfd79faa by Mathijs den Burger at 2016-06-15T17:18:42+02:00 HIPPLUG-1313 Remove unused Essentials dependencies - - - - - 5158999f by Mathijs den Burger at 2016-06-15T17:19:34+02:00 HIPPLUG-1313 Reintegrate bugfix/HIPPLUG-1313 - - - - - 3 changed files: - demo/cms/pom.xml - demo/pom.xml - demo/site/pom.xml Changes: ===================================== demo/cms/pom.xml ===================================== --- a/demo/cms/pom.xml +++ b/demo/cms/pom.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2010-2015 Hippo B.V. (http://www.onehippo.com) + Copyright 2010-2016 Hippo B.V. (http://www.onehippo.com) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -87,6 +87,18 @@ <finalName>cms</finalName> <plugins> <plugin> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <archive> + <manifestEntries> + <Hippo-Release-Version>${hippo.release.version}</Hippo-Release-Version> + <Project-Version>${project.version}</Project-Version> + <Project-Build>${buildNumber}</Project-Build> + </manifestEntries> + </archive> + </configuration> + </plugin> + <plugin> <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-maven2-plugin</artifactId> <configuration> ===================================== demo/pom.xml ===================================== --- a/demo/pom.xml +++ b/demo/pom.xml @@ -26,10 +26,11 @@ <name>Hippo Plugin Dashboard Document Wizard Demo</name> <description>Hippo Plugin Dashboard Document Wizard Demo</description> <artifactId>hippo-plugin-dashboard-document-wizard-demo</artifactId> - <version>2.2.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <packaging>pom</packaging> <properties> + <essentials.version>3.0.0-SNAPSHOT</essentials.version> <jsp-api.version>2.2</jsp-api.version> <taglibs.version>1.2.1</taglibs.version> <commons.lang.version>2.6</commons.lang.version> @@ -52,6 +53,11 @@ <dependencyManagement> <dependencies> + <dependency> + <groupId>org.onehippo.cms7</groupId> + <artifactId>hippo-essentials-components-hst</artifactId> + <version>${essentials.version}</version> + </dependency> <!-- other predefined runtime scope versioned dependencies --> <dependency> ===================================== demo/site/pom.xml ===================================== --- a/demo/site/pom.xml +++ b/demo/site/pom.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2010-2015 Hippo B.V. (http://www.onehippo.com) + Copyright 2010-2016 Hippo B.V. (http://www.onehippo.com) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -81,6 +81,10 @@ <groupId>org.onehippo.cms7.hst.components</groupId> <artifactId>hst-security</artifactId> </dependency> + <dependency> + <groupId>org.onehippo.cms7</groupId> + <artifactId>hippo-essentials-components-hst</artifactId> + </dependency> </dependencies> <build> <resources> View it on GitLab: https://code.onehippo.org/cms-community/hippo-plugin-dashboard-document-wizard/compare/69eb01aeca1cf47dec25fc41c5295555b3ec8a58...5158999f981ab72cf0e851e369756492da7fb072
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
