Skip to content

Commit fd4fee1

Browse files
authored
Merge pull request #172 from SAP/prepare-patch-v6.14.1
Prepare patch update v6.14.1
2 parents 3d1fbec + c001fd5 commit fd4fee1

File tree

9 files changed

+1022
-1911
lines changed

9 files changed

+1022
-1911
lines changed

package-lock.json

Lines changed: 984 additions & 1876 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cf-nodejs-logging-support",
3-
"version": "6.14.0",
3+
"version": "6.14.1",
44
"description": "Logging tool for Cloud Foundry",
55
"keywords": [
66
"logging",
@@ -18,7 +18,7 @@
1818
"homepage": "https://sap.github.io/cf-nodejs-logging-support/",
1919
"main": "./index.js",
2020
"engines": {
21-
"node": ">=8.0.0"
21+
"node": ">=12.0.0"
2222
},
2323
"dependencies": {
2424
"json-stringify-safe": "^5.0.1",
@@ -32,7 +32,7 @@
3232
"mock-require": "^3.0.3",
3333
"node-mocks-http": "^1.8.1",
3434
"nyc": "^15.0.1",
35-
"rewire": "^4.0.1",
35+
"rewire": "^6.0.0",
3636
"sinon": "^9.0.1",
3737
"winston": "^3.2.1",
3838
"winston-transport": "^4.3.0"

sample/cf-nodejs-logging-support-sample/package-lock.json

Lines changed: 17 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sample/cf-nodejs-logging-support-sample/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cf-nodejs-logging-support-sample-app",
3-
"version": "1.0.0",
3+
"version": "1.0.1",
44
"description": "Sample app to learn and test features from the cf-nodejs-logging-support library",
55
"main": "app.js",
66
"scripts": {
@@ -18,6 +18,6 @@
1818
"nodemon": "^2.0.20"
1919
},
2020
"engines": {
21-
"node": ">=8.0.0"
21+
"node": ">=12.0.0"
2222
}
2323
}

sample/cf-nodejs-shoutboard/package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sample/cf-nodejs-shoutboard/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cf-nodejs-shoutboard",
3-
"version": "2.0.0",
3+
"version": "2.0.1",
44
"description": "Sample Node.js app",
55
"main": "web-express.js",
66
"license": "Apache-2.0",
@@ -20,6 +20,6 @@
2020
"restify": "^8.5.1"
2121
},
2222
"engines": {
23-
"node": ">=8.0.0"
23+
"node": ">=12.0.0"
2424
}
2525
}

sample/winston-sample/package-lock.json

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sample/winston-sample/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "winston-sample",
3-
"version": "1.0.1",
3+
"version": "1.0.2",
44
"description": "Sample Node.js app",
55
"main": "web.js",
66
"license": "Apache-2.0",
@@ -22,6 +22,6 @@
2222
},
2323
"repository": "https://github.com/SAP/cf-nodejs-logging-support/tree/master/sample/winston",
2424
"engines": {
25-
"node": ">=8.0.0"
25+
"node": ">=12.0.0"
2626
}
2727
}

test/test-core.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1896,11 +1896,14 @@ describe('Test log-core', function () {
18961896
});
18971897

18981898
describe('Test initLog', function () {
1899-
var core = rewire("../core/log-core.js");
1899+
var core;
19001900
var logObject;
19011901
var clock;
19021902

19031903
before(function () {
1904+
// using require instead of rewire here, otherwise sinon fake clock does not work.
1905+
core = require("../core/log-core.js");
1906+
19041907
// set clock to 2017-01-01T00:00:00.000Z
19051908
clock = sinon.useFakeTimers({ now: 1483228800000 });
19061909
});

0 commit comments

Comments
 (0)