Skip to content

Commit

Permalink
Dependency updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@bkimminich
bkimminich committed Oct 4, 2016
1 parent 602f264 commit 906fe22
Show file tree
Hide file tree
Showing 3 changed files with 155 additions and 119 deletions.
12 changes: 6 additions & 6 deletions bower.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
"jquery": "~2.1",
"underscore": "~1.8",
"string": "~3.3",
"moment": "~2.13",
"moment": "~2.15",
"github-fork-ribbon-css": "~0.1",
"fontawesome": "~4.6",
"angular-translate": "^2.12.1",
"angular-translate-loader-static-files": "^2.12.1",
"flag-icon-css": "^2.5.0",
"angular-socket-io": "^0.7.0",
"ngclipboard": "^1.1.1"
"angular-translate": "~2.12",
"angular-translate-loader-static-files": "~2.12",
"flag-icon-css": "~2.5",
"angular-socket-io": "~0.7",
"ngclipboard": "~1.1"
},
"devDependencies": {
"angular-mocks": "~1.5",
Expand Down
238 changes: 137 additions & 101 deletions ftp/package.json.bak
View file
Original file line number Diff line number Diff line change
@@ -1,104 +1,140 @@
{
"name": "juice-shop",
"version": "2.0.3",
"description": "An intentionally insecure Javascript Web Application",
"homepage": "https://www.owasp.org/index.php/OWASP_Juice_Shop_Project",
"author": "Bjoern Kimminich <[email protected]> (https://www.owasp.org/index.php/User:Bjoern_Kimminich)",
"contributors": [
"Bjoern Kimminich"
"name": "juice-shop",
"version": "2.15.0",
"description": "An intentionally insecure Javascript Web Application",
"homepage": "https://www.owasp.org/index.php/OWASP_Juice_Shop_Project",
"author": "Bjoern Kimminich <[email protected]> (https://www.owasp.org/index.php/User:Bjoern_Kimminich)",
"contributors": [
"Bjoern Kimminich"
],
"private": true,
"keywords": [
"web security",
"web application security",
"webappsec",
"owasp",
"pentest",
"pentesting",
"security",
"vulnerable",
"vulnerability",
"broken",
"bodgeit"
],
"dependencies": {
"body-parser": "~1.15",
"colors": "~1.1",
"cookie-parser": "~1.4",
"cors": "~2.8",
"errorhandler": "~1.4",
"express": "~4.14",
"express-jwt": "~5.1",
"glob": "~5.0",
"hashids": "~1.1",
"helmet": "~2.3",
"jsonwebtoken": "~7.1",
"morgan": "~1.7",
"multer": "~1.2",
"pdfkit": "~0.8",
"sanitize-html": "1.4.2",
"saucelabs": "~1.3",
"sequelize": "~1.7",
"sequelize-restful": "~0.4",
"serve-favicon": "~2.3",
"serve-index": "~1.8",
"socket.io": "~1.4",
"sqlite3": "3.1",
"z85": "~0.0"
},
"devDependencies": {
"bower": "~1.7",
"codeclimate-test-reporter": "~0.4",
"cross-spawn": "~4.0",
"form-data": "~1.0",
"frisby": "~0.8",
"grunt": "~1.0",
"grunt-angular-templates": "~1.1",
"grunt-cli": "~1.2",
"grunt-contrib-clean": "~1.0",
"grunt-contrib-compress": "~1.3",
"grunt-contrib-concat": "~1.0",
"grunt-contrib-uglify": "~2.0",
"grunt-exec": "~1.0",
"grunt-retire": "~1.0",
"http-server": "~0.9",
"istanbul": "~0.4",
"jasmine-node": "~1.14",
"jasmine-reporters": "~1.0",
"karma": "~1.1",
"karma-chrome-launcher": "~1.0",
"karma-cli": "~1.0",
"karma-coverage": "~1.1",
"karma-firefox-launcher": "~1.0",
"karma-jasmine": "~0.1",
"karma-junit-reporter": "~1.1",
"karma-phantomjs-launcher": "~1.0",
"karma-safari-launcher": "~1.0",
"karma-sauce-launcher": "~1.0",
"lcov-result-merger": "~1.2",
"phantomjs-prebuilt": "~2.1",
"protractor": "~4.0",
"shelljs": "~0.7",
"standard": "^8.0.0",
"stryker": "~0.4",
"stryker-api": "~0.2",
"stryker-html-reporter": "~0.2",
"stryker-karma-runner": "~0.2"
},
"peerDependencies": {
"phantomjs-prebuilt": "~2.1"
},
"repository": {
"type": "git",
"url": "https://github.com/bkimminich/juice-shop.git"
},
"bugs": {
"url": "https://github.com/bkimminich/juice-shop/issues"
},
"license": "MIT",
"scripts": {
"postinstall": "bower install && grunt minify",
"start": "node app",
"test": "standard && karma start karma.conf.js && istanbul cover ./test/serverTests.js",
"preupdate-webdriver": "npm install",
"update-webdriver": "webdriver-manager update",
"preprotractor": "npm run update-webdriver",
"protractor": "node test/e2eTests.js",
"stryker": "stryker -c stryker.conf.js"
},
"subdomain": "juice-shop",
"engines": {
"node": ">=4 <7"
},
"standard": {
"ignore": [
"/app/private/**"
],
"private": true,
"keywords": [
"web security",
"web application security",
"webappsec",
"owasp",
"pentest",
"pentesting",
"security",
"vulnerable",
"vulnerability",
"broken",
"bodgeit"
"env": [
"jasmine",
"node",
"browser"
],
"dependencies": {
"sequelize": "~1.7",
"sqlite3": "3.1",
"express": "~4.14",
"errorhandler": "~1.4",
"cookie-parser": "~1.4",
"serve-index": "1.6.0",
"serve-favicon": "~2.3",
"body-parser": "~1.15",
"sequelize-restful": "~0.4",
"morgan": "~1.7",
"sanitize-html": "1.4.2",
"express-jwt": "~3.4",
"jsonwebtoken": "~7.1",
"helmet": "~2.1",
"pdfkit": "~0.7",
"z85": "~0.0",
"glob": "~5.0",
"colors": "~1.1",
"grunt": "~0.4",
"grunt-cli": "~0.1",
"grunt-angular-templates": "~1.0",
"grunt-contrib-uglify": "~1.0",
"grunt-contrib-concat": "~1.0",
"grunt-contrib-clean": "~1.0",
"grunt-contrib-compress": "~1.3",
"bower": "~1.7",
"saucelabs": "~1.2"
},
"devDependencies": {
"frisby": "~0.8",
"jasmine-node": "~1.14",
"karma": "~1.1",
"karma-cli": "~1.0",
"karma-junit-reporter": "~1.1",
"karma-coverage": "~1.1",
"karma-chrome-launcher": "~1.0",
"karma-sauce-launcher": "~1.0",
"karma-firefox-launcher": "~1.0",
"karma-safari-launcher": "~1.0",
"karma-phantomjs-launcher": "~1.0",
"karma-jasmine": "~0.1",
"protractor": "~4.0",
"jasmine-reporters": "~1.0",
"http-server": "~0.9",
"shelljs": "~0.7",
"win-spawn": "~2.0",
"codeclimate-test-reporter": "~0.3",
"istanbul": "~0.4",
"lcov-result-merger": "~1.2",
"grunt-retire": "~0.3",
"grunt-zaproxy": "~0.1",
"grunt-exec": "~0.4",
"phantomjs-prebuilt": "~2.1"
},
"peerDependencies": {
"phantomjs-prebuilt": "~2.1"
},
"repository": {
"type": "git",
"url": "https://github.com/bkimminich/juice-shop.git"
},
"bugs": {
"url": "https://github.com/bkimminich/juice-shop/issues"
},
"license": "MIT",
"scripts": {
"postinstall": "node bower_install.js && node grunt_minify.js",
"start": "node app",
"test": "karma start karma.conf.js && istanbul cover ./test/serverTests.js",

"preupdate-webdriver": "npm install",
"update-webdriver": "webdriver-manager update",
"preprotractor": "npm run update-webdriver",
"protractor": "node test/e2eTests.js"
},
"subdomain": "juice-shop",
"engines": {
"node": ">=4 <7"
}
}
"globals": [
"angular",
"$",
"browser",
"protractor",
"it",
"xit",
"element",
"by",
"expect",
"describe",
"jasmine",
"inject",
"spyOn",
"beforeEach",
"afterEach"
]
}
}
24 changes: 12 additions & 12 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,29 +28,29 @@
"cors": "~2.8",
"errorhandler": "~1.4",
"express": "~4.14",
"express-jwt": "~5.0",
"express-jwt": "~5.1",
"glob": "~5.0",
"hashids": "^1.1.1",
"helmet": "~2.2",
"hashids": "~1.1",
"helmet": "~2.3",
"jsonwebtoken": "~7.1",
"morgan": "~1.7",
"multer": "^1.2.0",
"multer": "~1.2",
"pdfkit": "~0.8",
"sanitize-html": "1.4.2",
"saucelabs": "~1.3",
"sequelize": "~1.7",
"sequelize-restful": "~0.4",
"serve-favicon": "~2.3",
"serve-index": "~1.8",
"socket.io": "^1.4.8",
"socket.io": "~1.4",
"sqlite3": "3.1",
"z85": "~0.0"
},
"devDependencies": {
"bower": "~1.7",
"codeclimate-test-reporter": "~0.3",
"cross-spawn": "^4.0.0",
"form-data": "^1.0.1",
"codeclimate-test-reporter": "~0.4",
"cross-spawn": "~4.0",
"form-data": "~1.0",
"frisby": "~0.8",
"grunt": "~1.0",
"grunt-angular-templates": "~1.1",
Expand Down Expand Up @@ -80,10 +80,10 @@
"protractor": "~4.0",
"shelljs": "~0.7",
"standard": "^8.0.0",
"stryker": "^0.4.4",
"stryker-api": "^0.2.0",
"stryker-html-reporter": "^0.2.0",
"stryker-karma-runner": "^0.2.1"
"stryker": "~0.4",
"stryker-api": "~0.2",
"stryker-html-reporter": "~0.2",
"stryker-karma-runner": "~0.2"
},
"peerDependencies": {
"phantomjs-prebuilt": "~2.1"
Expand Down

0 comments on commit 906fe22

Please sign in to comment.