You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2015/06/28 20:40:56 UTC
wicket git commit: Update Node.js, NPM and some plugins
Repository: wicket
Updated Branches:
refs/heads/master e81fd82ba -> 0c71fa430
Update Node.js, NPM and some plugins
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/0c71fa43
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/0c71fa43
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/0c71fa43
Branch: refs/heads/master
Commit: 0c71fa430b5f96f2962ac72621822fc08122f59b
Parents: e81fd82
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sun Jun 28 21:40:22 2015 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sun Jun 28 21:40:22 2015 +0300
----------------------------------------------------------------------
testing/wicket-js-tests/package.json | 12 +++++++++---
testing/wicket-js-tests/pom.xml | 9 ++++++---
wicket-core/src/test/js/amd.js | 2 +-
3 files changed, 16 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/0c71fa43/testing/wicket-js-tests/package.json
----------------------------------------------------------------------
diff --git a/testing/wicket-js-tests/package.json b/testing/wicket-js-tests/package.json
index cb5ed76..2dbce01 100644
--- a/testing/wicket-js-tests/package.json
+++ b/testing/wicket-js-tests/package.json
@@ -1,12 +1,18 @@
{
"name": "wicket-js-unit-tests",
- "version": "0.1.0",
+ "description": "Apache Wicket JavaScript unit tests",
+ "version": "0.2.0",
+ "license": "Apache-2.0",
+ "repository" : {
+ "type" : "git",
+ "url" : "http://git-wip-us.apache.org/repos/asf/wicket.git"
+ },
"devDependencies": {
"grunt": "~0.4.5",
"grunt-cli": "~0.1.13",
- "grunt-contrib-jshint": "~0.11.1",
+ "grunt-contrib-jshint": "~0.11.2",
"grunt-contrib-qunit": "~0.5.2",
- "grunt-contrib-connect": "~0.8.0",
+ "grunt-contrib-connect": "~0.10.1",
"grunt-contrib-nodeunit": "~0.4.1"
},
"scripts": {
http://git-wip-us.apache.org/repos/asf/wicket/blob/0c71fa43/testing/wicket-js-tests/pom.xml
----------------------------------------------------------------------
diff --git a/testing/wicket-js-tests/pom.xml b/testing/wicket-js-tests/pom.xml
index 326795e..160db19 100644
--- a/testing/wicket-js-tests/pom.xml
+++ b/testing/wicket-js-tests/pom.xml
@@ -58,7 +58,7 @@
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
- <version>0.0.23</version>
+ <version>0.0.24</version>
<executions>
<execution>
<id>install node and npm</id>
@@ -67,8 +67,8 @@
</goals>
<phase>generate-resources</phase>
<configuration>
- <npmVersion>1.4.12</npmVersion>
- <nodeVersion>v0.10.29</nodeVersion>
+ <npmVersion>2.6.0</npmVersion>
+ <nodeVersion>v0.12.5</nodeVersion>
</configuration>
</execution>
<execution>
@@ -85,6 +85,9 @@
<goals>
<goal>grunt</goal>
</goals>
+ <configuration>
+ <!-- <arguments>- -verbose</arguments> -->
+ </configuration>
</execution>
</executions>
</plugin>
http://git-wip-us.apache.org/repos/asf/wicket/blob/0c71fa43/wicket-core/src/test/js/amd.js
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/js/amd.js b/wicket-core/src/test/js/amd.js
index 7535d48..4941b5f 100644
--- a/wicket-core/src/test/js/amd.js
+++ b/wicket-core/src/test/js/amd.js
@@ -16,7 +16,7 @@
*/
/*global ok: true, start: true, test: true, equal: true, deepEqual: true,
- QUnit: true, module: true, expect: true, define: true */
+ QUnit: true, module: true, expect: true, define: true, console: true */
define(
[