You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by ko...@apache.org on 2016/06/27 13:08:29 UTC
olingo-odata4-js git commit: Update dependencies,
remove output in wrapper-tpl.js
Repository: olingo-odata4-js
Updated Branches:
refs/heads/master a4cbb2360 -> 0bfa07482
Update dependencies, remove output in wrapper-tpl.js
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/commit/0bfa0748
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/tree/0bfa0748
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/diff/0bfa0748
Branch: refs/heads/master
Commit: 0bfa074828fc056369e308cdb2481dfd65e1eee0
Parents: a4cbb23
Author: Sven Kobler <sv...@sap.com>
Authored: Mon Jun 27 10:52:22 2016 +0200
Committer: Sven Kobler <sv...@sap.com>
Committed: Mon Jun 27 11:09:19 2016 +0200
----------------------------------------------------------------------
.gitignore | 1 +
grunt-config/custom-tasks/rat/package.json | 9 +++----
.../custom-tasks/toBrowser/wrapper-tpl.js | 4 ---
grunt-config/rat-config.js | 4 +--
package.json | 26 ++++++++++----------
5 files changed, 19 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/0bfa0748/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 02c5d17..1d1f219 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ _*
# ignore IDE settings
.idea
+olingo-odata4-js.iml
# ignore local config
localgrunt.config
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/0bfa0748/grunt-config/custom-tasks/rat/package.json
----------------------------------------------------------------------
diff --git a/grunt-config/custom-tasks/rat/package.json b/grunt-config/custom-tasks/rat/package.json
index 0c374c7..e9dba2a 100644
--- a/grunt-config/custom-tasks/rat/package.json
+++ b/grunt-config/custom-tasks/rat/package.json
@@ -14,12 +14,9 @@
"chalk": "~0.4.0"
},
"devDependencies": {
- "async": "^0.9.0",
- "grunt": "~0.4.0",
- "xml2js": "^0.4.4"
- },
- "peerDependencies": {
- "grunt": "~0.4.0"
+ "async": "0.9.0",
+ "grunt": "0.4.0",
+ "xml2js": "0.4.4"
},
"engines": {
"node": ">=0.8.0"
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/0bfa0748/grunt-config/custom-tasks/toBrowser/wrapper-tpl.js
----------------------------------------------------------------------
diff --git a/grunt-config/custom-tasks/toBrowser/wrapper-tpl.js b/grunt-config/custom-tasks/toBrowser/wrapper-tpl.js
index 9c335db..47741e2 100644
--- a/grunt-config/custom-tasks/toBrowser/wrapper-tpl.js
+++ b/grunt-config/custom-tasks/toBrowser/wrapper-tpl.js
@@ -29,10 +29,6 @@ var require = function(path) {
if (modules[name]) { return modules[name].exports; }
modules[name] = { exports : {}};
- console.log(name);
- if (name === 'sou') {
- var i = 0;
- }
datas[name].call(this,modules[name].exports,modules[name],require);
return modules[name].exports;
};
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/0bfa0748/grunt-config/rat-config.js
----------------------------------------------------------------------
diff --git a/grunt-config/rat-config.js b/grunt-config/rat-config.js
index 2ee5b77..0c7b0ad 100644
--- a/grunt-config/rat-config.js
+++ b/grunt-config/rat-config.js
@@ -27,7 +27,7 @@ module.exports = function(grunt) {
exclude: [
"node_modules","_extern-tools",".gitignore","package.json","JSLib",
"DEPENDENCIES","LICENSE","NOTICE",
- "JSLib.sln","package.json", "mocha.opts","info.txt"
+ "JSLib.sln","package.json", "mocha.opts","info.txt","olingo-odata4-js.iml"
] },
files: [
/*{ src: ['./../_dist/<%= artifactname %>/doc'], options:{ tag:"dist-doc"}},generated*/
@@ -45,7 +45,7 @@ module.exports = function(grunt) {
exclude: [
"node_modules","_extern-tools",".gitignore","package.json","JSLib",
"DEPENDENCIES","LICENSE","NOTICE",
- "JSLib.sln","package.json", "mocha.opts","info.txt"
+ "JSLib.sln","package.json", "mocha.opts","info.txt","olingo-odata4-js.iml"
] },
files: [
{ src: ['./lib'], options:{ tag:"lib"}},
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/0bfa0748/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 044cb81..5916159 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
"url": "http://git-wip-us.apache.org/repos/asf/olingo-odata4-js.git"
},
"engines": {
- "node": ">= 0.10.0"
+ "node": ">= 0.12.0"
},
"contributors": [
{
@@ -33,17 +33,17 @@
"preinstall": "npm --prefix ./grunt-config/custom-tasks/rat install"
},
"devDependencies": {
- "chai": "^2.0.0",
- "grunt": "^0.4.5",
- "grunt-connect-proxy": "^0.1.10",
- "grunt-contrib-clean": "^0.6.0",
- "grunt-contrib-compress": "^0.10.0",
- "grunt-contrib-copy": "^0.5.0",
- "grunt-contrib-uglify": "^0.4.0",
- "grunt-curl": "^2.0.2",
- "grunt-jsdoc": "^0.5.6",
- "grunt-nuget": "^0.1.3",
- "mocha": "^2.1.0",
- "xmldom": "^0.1.19"
+ "chai": "2.0.0",
+ "grunt": "0.4.5",
+ "grunt-connect-proxy": "0.1.10",
+ "grunt-contrib-clean": "0.6.0",
+ "grunt-contrib-compress": "0.10.0",
+ "grunt-contrib-copy": "0.5.0",
+ "grunt-contrib-uglify": "0.4.0",
+ "grunt-curl": "2.0.2",
+ "grunt-jsdoc": "0.5.6",
+ "grunt-nuget": "0.1.3",
+ "mocha": "2.1.0",
+ "xmldom": "0.1.19"
}
}