Commit 24fa4cc1 authored by Bert Leunis's avatar Bert Leunis

ESSENTIALS-1171 Reintegrate feature/ESSENTIALS-1171

parents d3f802f2 ceacdf32
engine-strict=true
registry=https://maven.onehippo.com/npm-all/
registry=https://registry.npmjs.org
/*
* Copyright 2015-2016 Hippo B.V. (http://www.onehippo.com)
* Copyright 2015-2018 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.
......@@ -38,7 +38,7 @@ module.exports = function gruntFunctions(grunt) {
files: 'src/main/webapp/js/*.js',
},
// copy files to target folder
// copy files to target folder
copy: {
components: {
files: [
......@@ -58,9 +58,16 @@ module.exports = function gruntFunctions(grunt) {
'angular-aria/angular-aria.js',
'angular-animate/angular-animate.js',
'google-code-prettify/src/prettify.js',
'hippo-theme/dist/**',
],
},
{
expand: true,
cwd: '<%= build.npmDir %>/@bloomreach',
dest: '<%= build.dashboardtarget %>',
src: [
'hippo-theme/dist/**',
],
}
],
},
},
......
This diff is collapsed.
This diff is collapsed.
......@@ -6,6 +6,10 @@
"grunt": "grunt",
"build": "grunt build"
},
"engines": {
"node": ">=8",
"npm": ">=5"
},
"dependencies": {
"angular": "1.4.8",
"angular-animate": "1.4.8",
......@@ -17,7 +21,7 @@
"angular-ui-router": "0.2.15",
"angular-ui-tree": "2.11.0",
"google-code-prettify": "1.0.1",
"hippo-theme": "./target/dependency/hippo-theme.tar.gz",
"@bloomreach/hippo-theme": "3.2.2",
"jquery": "2.1.4"
},
"devDependencies": {
......
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2014-2016 Hippo B.V. (http://www.onehippo.com)
Copyright 2014-2018 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.
......@@ -40,15 +40,6 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.onehippo.cms7.frontend</groupId>
<artifactId>hippo-theme</artifactId>
<version>${hippo.frontend.theme.version}</version>
<classifier>distribution</classifier>
<type>tar.gz</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
......@@ -58,24 +49,6 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>copy-hippo-theme-dependencies</id>
<phase>initialize</phase>
<goals><goal>copy-dependencies</goal></goals>
<configuration>
<includeGroupIds>org.onehippo.cms7</includeGroupIds>
<includeArtifactIds>hippo-theme</includeArtifactIds>
<stripClassifier>true</stripClassifier>
<stripVersion>true</stripVersion>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
......
......@@ -21,7 +21,7 @@
<parent>
<groupId>org.onehippo.cms7</groupId>
<artifactId>hippo-cms7-release</artifactId>
<version>11.2.6-SNAPSHOT</version>
<version>11.2.7-SNAPSHOT</version>
</parent>
<name>Hippo Essentials</name>
......
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