This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch SLING-7858
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
The following commit(s) were added to refs/heads/SLING-7858 by this push:
new e8e4ad4 Skipping the FED build from Eclipse and updating FED versions
new ca65490 merging latest changes
e8e4ad4 is described below
commit e8e4ad4defaca2e710b0d7c094ab86825e0000c9
Author: Dan Klco <[email protected]>
AuthorDate: Tue Aug 28 15:07:57 2018 -0400
Skipping the FED build from Eclipse and updating FED versions
---
ui/pom.xml | 45 ++++++++++++++++++++++++++++++++++-----
ui/src/main/frontend/package.json | 24 ++++++++++-----------
2 files changed, 52 insertions(+), 17 deletions(-)
diff --git a/ui/pom.xml b/ui/pom.xml
index c7b94b6..293e7c2 100644
--- a/ui/pom.xml
+++ b/ui/pom.xml
@@ -9,7 +9,9 @@
License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
CONDITIONS
OF ANY KIND, either express or implied. See the License for the
specific
language governing permissions and limitations under the License. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>org.apache.sling.cms</artifactId>
@@ -50,7 +52,7 @@
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
- <version>1.4</version>
+ <version>1.6</version>
<configuration>
<installDirectory>${frontend.target}</installDirectory>
<workingDirectory>${frontend.target}</workingDirectory>
@@ -62,8 +64,8 @@
<goal>install-node-and-npm</goal>
</goals>
<configuration>
-
<nodeVersion>v6.11.0</nodeVersion>
-
<npmVersion>3.10.10</npmVersion>
+
<nodeVersion>v8.11.4</nodeVersion>
+
<npmVersion>5.6.0</npmVersion>
</configuration>
</execution>
<execution>
@@ -101,12 +103,45 @@
jcr_root/libs/sling-cms;overwrite:=true;uninstall:=true;path:=/libs/sling-cms,
jcr_root/static/clientlibs/sling-cms;overwrite:=true;uninstall:=true;path:=/static/clientlibs/sling-cms
</Sling-Initial-Content>
-
<Include-Resource>{maven-resources},${basedir}/target/frontend/dist</Include-Resource>
+
<Include-Resource>{maven-resources},${basedir}/target/frontend/dist</Include-Resource>
</instructions>
</configuration>
</plugin>
</plugins>
+
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+
<artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+
<pluginExecution>
+
<pluginExecutionFilter>
+
<groupId>com.github.eirslett</groupId>
+
<artifactId>frontend-maven-plugin</artifactId>
+
<versionRange>[1.0.0,)</versionRange>
+
<goals>
+
<goal>install-node-and-npm</goal>
+
<goal>npm</goal>
+
<goal>gulp</goal>
+
</goals>
+
</pluginExecutionFilter>
+ <action>
+
<ignore />
+
</action>
+
</pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
+
+
<profiles>
<profile>
<id>autoInstallBundle</id>
diff --git a/ui/src/main/frontend/package.json
b/ui/src/main/frontend/package.json
index db2f09d..f704eb2 100644
--- a/ui/src/main/frontend/package.json
+++ b/ui/src/main/frontend/package.json
@@ -7,25 +7,25 @@
"url": "https://github.com/npm/npm.git";
},
"dependencies": {
- "jquery": "^3.3.1",
- "handlebars": "^4.0.11",
- "summernote": "^0.8.9",
- "jam-icons": "^2.0.0",
- "js-autocomplete": "^1.0.4"
+ "jquery": "^3.3.1",
+ "handlebars": "^4.0.11",
+ "summernote": "^0.8.9",
+ "jam-icons": "^2.0.0",
+ "js-autocomplete": "^1.0.4"
},
"devDependencies": {
"gulp": "^3.9.1",
"gulp-concat": "^2.6.1",
- "gulp-rename": "^1.2.2",
- "gulp-uglify": "^3.0.0",
- "gulp-header": "^1.8.9",
- "gulp-clean-css": "^3.9.2",
- "gulp-sass": "^3.1.0",
+ "gulp-rename": "^1.4.0",
+ "gulp-uglify": "^3.0.1",
+ "gulp-header": "^2.0.5",
+ "gulp-clean-css": "^3.10.0",
+ "gulp-sass": "^4.0.1",
"gulp-sourcemaps": "^2.6.4",
"streamqueue": "^1.1.2",
"uglify-save-license": "^0.4.1",
- "bulma": "^0.7.1",
- "node-sass": "^4.9.2"
+ "bulma": "^0.7.1",
+ "node-sass": "^4.9.3"
},
"license": "Apache-2.0"
}
\ No newline at end of file
