Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
H
hippo-cms
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
JIRA
JIRA
Merge Requests
0
Merge Requests
0
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
cms-community
hippo-cms
Commits
333016b2
Commit
333016b2
authored
Dec 24, 2018
by
Bert Leunis
Browse files
Options
Browse Files
Download
Plain Diff
CMS-11604
Reintegrate feature/
CMS-11604
in release/4.2
parents
c710a53f
47b1a192
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
77 additions
and
39 deletions
+77
-39
.gitignore
.gitignore
+6
-1
pom.xml
api/pom.xml
+25
-14
pom.xml
console/frontend/pom.xml
+25
-14
pom.xml
engine/pom.xml
+20
-9
pom.xml
pom.xml
+1
-1
No files found.
.gitignore
View file @
333016b2
...
...
@@ -6,15 +6,20 @@
.project
.settings
.DS_Store
node_modules/
target/
/api/node/
/api/node_modules/
/api/repository/
/api/version/
/api/workspaces/
/automatic-export/repository/repository/
/automatic-export/repository/version/
/automatic-export/repository/workspaces/
/console/frontend/node/
/console/frontend/node_modules/
/editor/repository/workspaces/
/engine/node/
/engine/node_modules/
/richtext/frontend/repository/
/richtext/frontend/version/
/richtext/frontend/workspaces/
...
...
api/pom.xml
View file @
333016b2
...
...
@@ -297,26 +297,35 @@
<!-- Use NPM to install/build Hippo theme -->
<plugin>
<groupId>
org.codehaus.mojo
</groupId>
<artifactId>
exec-maven-plugin
</artifactId>
<version>
${maven.plugin.exec.version}
</version>
<groupId>
com.github.eirslett
</groupId>
<artifactId>
frontend-maven-plugin
</artifactId>
<executions>
<execution>
<id>
npm-install
</id>
<phase>
generate-sources
</phase>
<goals><goal>
exec
</goal></goals>
<id>
install node and npm
</id>
<goals>
<goal>
install-node-and-npm
</goal>
</goals>
<configuration>
<
executable>
npm
</executable
>
<
commandlineArgs>
ci
</commandlineArgs
>
<
nodeVersion>
${nodejs.version}
</nodeVersion
>
<
npmVersion>
${npm.version}
</npmVersion
>
</configuration>
</execution>
<execution>
<id>
npm-build
</id>
<phase>
process-resources
</phase>
<goals><goal>
exec
</goal></goals>
<id>
npm ci
</id>
<goals>
<goal>
npm
</goal>
</goals>
<configuration>
<executable>
npm
</executable>
<commandlineArgs>
run build
</commandlineArgs>
<arguments>
ci
</arguments>
</configuration>
</execution>
<execution>
<id>
npm run build
</id>
<goals>
<goal>
npm
</goal>
</goals>
<configuration>
<arguments>
run build
</arguments>
</configuration>
</execution>
</executions>
...
...
@@ -338,9 +347,11 @@
<artifactId>
maven-clean-plugin
</artifactId>
<configuration>
<filesets>
<fileset>
<directory>
node
</directory>
</fileset>
<fileset>
<directory>
node_modules
</directory>
<followSymlinks>
false
</followSymlinks>
</fileset>
</filesets>
</configuration>
...
...
console/frontend/pom.xml
View file @
333016b2
...
...
@@ -213,26 +213,35 @@
<!-- Use NPM to install/build Hippo Console theme -->
<plugin>
<groupId>
org.codehaus.mojo
</groupId>
<artifactId>
exec-maven-plugin
</artifactId>
<version>
${maven.plugin.exec.version}
</version>
<groupId>
com.github.eirslett
</groupId>
<artifactId>
frontend-maven-plugin
</artifactId>
<executions>
<execution>
<id>
npm-install
</id>
<phase>
generate-sources
</phase>
<goals><goal>
exec
</goal></goals>
<id>
install node and npm
</id>
<goals>
<goal>
install-node-and-npm
</goal>
</goals>
<configuration>
<
executable>
npm
</executable
>
<
commandlineArgs>
ci
</commandlineArgs
>
<
nodeVersion>
${nodejs.version}
</nodeVersion
>
<
npmVersion>
${npm.version}
</npmVersion
>
</configuration>
</execution>
<execution>
<id>
npm-build
</id>
<phase>
process-resources
</phase>
<goals><goal>
exec
</goal></goals>
<id>
npm ci
</id>
<goals>
<goal>
npm
</goal>
</goals>
<configuration>
<executable>
npm
</executable>
<commandlineArgs>
run build
</commandlineArgs>
<arguments>
ci
</arguments>
</configuration>
</execution>
<execution>
<id>
npm run build
</id>
<goals>
<goal>
npm
</goal>
</goals>
<configuration>
<arguments>
run build
</arguments>
</configuration>
</execution>
</executions>
...
...
@@ -241,9 +250,11 @@
<artifactId>
maven-clean-plugin
</artifactId>
<configuration>
<filesets>
<fileset>
<directory>
node
</directory>
</fileset>
<fileset>
<directory>
node_modules
</directory>
<followSymlinks>
false
</followSymlinks>
</fileset>
</filesets>
</configuration>
...
...
engine/pom.xml
View file @
333016b2
...
...
@@ -172,17 +172,26 @@
<plugins>
<!-- Use NPM to fetch external JavaScript dependencies -->
<plugin>
<groupId>
org.codehaus.mojo
</groupId>
<artifactId>
exec-maven-plugin
</artifactId>
<version>
${maven.plugin.exec.version}
</version>
<groupId>
com.github.eirslett
</groupId>
<artifactId>
frontend-maven-plugin
</artifactId>
<executions>
<execution>
<id>
npm-install
</id>
<phase>
generate-sources
</phase>
<goals><goal>
exec
</goal></goals>
<id>
install node and npm
</id>
<goals>
<goal>
install-node-and-npm
</goal>
</goals>
<configuration>
<executable>
npm
</executable>
<commandlineArgs>
ci
</commandlineArgs>
<nodeVersion>
${nodejs.version}
</nodeVersion>
<npmVersion>
${npm.version}
</npmVersion>
</configuration>
</execution>
<execution>
<id>
npm ci
</id>
<goals>
<goal>
npm
</goal>
</goals>
<configuration>
<arguments>
ci
</arguments>
</configuration>
</execution>
</executions>
...
...
@@ -191,9 +200,11 @@
<artifactId>
maven-clean-plugin
</artifactId>
<configuration>
<filesets>
<fileset>
<directory>
node
</directory>
</fileset>
<fileset>
<directory>
node_modules
</directory>
<followSymlinks>
false
</followSymlinks>
</fileset>
</filesets>
</configuration>
...
...
pom.xml
View file @
333016b2
...
...
@@ -20,7 +20,7 @@
<parent>
<groupId>
org.onehippo.cms7
</groupId>
<artifactId>
hippo-cms7-project
</artifactId>
<version>
28.1
2
</version>
<version>
28.1
3-SNAPSHOT
</version>
</parent>
<artifactId>
hippo-cms
</artifactId>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment