Merge branch 'master' of https://bitbucket.org/andreashuber/performance
# Conflicts: # build.gradle # gradle/wrapper/gradle-wrapper.properties
This commit is contained in:
@@ -22,8 +22,8 @@ ext {
|
||||
|
||||
javaVersion=12
|
||||
|
||||
version_log4j2= '2.12.1' // keep in sync with spring-boot-starter-log4j2
|
||||
version_spring = '2.2.7.RELEASE'
|
||||
version_log4j2= '2.13.3' // keep in sync with spring-boot-starter-log4j2
|
||||
version_spring = '2.3.1.RELEASE'
|
||||
version_junit = '5.6.1'
|
||||
version_junit_platform = '1.6.1'
|
||||
|
||||
|
||||
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,5 +1,5 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
||||
@@ -67,7 +67,8 @@
|
||||
"serve": {
|
||||
"builder": "@angular-devkit/build-angular:dev-server",
|
||||
"options": {
|
||||
"browserTarget": "pdb:build"
|
||||
"browserTarget": "pdb:build",
|
||||
"proxyConfig": "proxy.conf.json"
|
||||
},
|
||||
"configurations": {
|
||||
"production": {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
plugins {
|
||||
id("com.github.node-gradle.node") version "2.2.3"
|
||||
id("com.github.node-gradle.node") version "2.2.4"
|
||||
}
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ node {
|
||||
version = '13.10.1'
|
||||
|
||||
// Version of npm to use.
|
||||
npmVersion = '6.14.2'
|
||||
npmVersion = '6.14.5'
|
||||
|
||||
// Version of Yarn to use.
|
||||
//yarnVersion = '0.16.1'
|
||||
|
||||
5780
pdb-js/package-lock.json
generated
5780
pdb-js/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -12,39 +12,39 @@
|
||||
},
|
||||
"private": true,
|
||||
"dependencies": {
|
||||
"@angular/animations": "^9.1.0",
|
||||
"@angular/cdk": "^9.2.0",
|
||||
"@angular/common": "^9.1.0",
|
||||
"@angular/compiler": "^9.1.0",
|
||||
"@angular/core": "^9.1.0",
|
||||
"@angular/forms": "^9.1.0",
|
||||
"@angular/material": "^9.2.0",
|
||||
"@angular/platform-browser": "^9.1.0",
|
||||
"@angular/platform-browser-dynamic": "^9.1.0",
|
||||
"@angular/router": "^9.1.0",
|
||||
"moment": "^2.24.0",
|
||||
"rxjs": "^6.5.4",
|
||||
"rxjs-compat": "^6.5.4",
|
||||
"tslib": "^1.10.0",
|
||||
"@angular/animations": "^9.1.11",
|
||||
"@angular/cdk": "^9.2.4",
|
||||
"@angular/common": "^9.1.11",
|
||||
"@angular/compiler": "^9.1.11",
|
||||
"@angular/core": "^9.1.11",
|
||||
"@angular/forms": "^9.1.11",
|
||||
"@angular/material": "^9.2.4",
|
||||
"@angular/platform-browser": "^9.1.11",
|
||||
"@angular/platform-browser-dynamic": "^9.1.11",
|
||||
"@angular/router": "^9.1.11",
|
||||
"moment": "^2.27.0",
|
||||
"rxjs": "^6.5.5",
|
||||
"rxjs-compat": "^6.5.5",
|
||||
"tslib": "^1.13.0",
|
||||
"zone.js": "~0.10.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@angular-devkit/build-angular": "~0.901.0",
|
||||
"@angular/cli": "^9.1.0",
|
||||
"@angular/compiler-cli": "^9.1.0",
|
||||
"@angular/language-service": "^9.1.0",
|
||||
"@types/jasmine": "^3.5.3",
|
||||
"@angular-devkit/build-angular": "^0.901.9",
|
||||
"@angular/cli": "^9.1.9",
|
||||
"@angular/compiler-cli": "^9.1.11",
|
||||
"@angular/language-service": "^9.1.11",
|
||||
"@types/jasmine": "^3.5.10",
|
||||
"@types/jasminewd2": "~2.0.8",
|
||||
"@types/node": "^12.11.1",
|
||||
"codelyzer": "^5.1.2",
|
||||
"@types/node": "^12.12.47",
|
||||
"codelyzer": "^5.2.2",
|
||||
"jasmine-core": "~3.4.0",
|
||||
"jasmine-spec-reporter": "~4.2.1",
|
||||
"karma": "~4.1.0",
|
||||
"karma-chrome-launcher": "~2.2.0",
|
||||
"karma-coverage-istanbul-reporter": "~2.1.1",
|
||||
"karma-jasmine": "~2.0.1",
|
||||
"karma-jasmine-html-reporter": "^1.5.2",
|
||||
"protractor": "^5.4.3",
|
||||
"karma-jasmine-html-reporter": "^1.5.4",
|
||||
"protractor": "^5.4.4",
|
||||
"ts-node": "~8.5.4",
|
||||
"tslint": "~5.20.1",
|
||||
"typescript": "~3.8.3"
|
||||
|
||||
9
pdb-js/proxy.conf.json
Normal file
9
pdb-js/proxy.conf.json
Normal file
@@ -0,0 +1,9 @@
|
||||
{
|
||||
"/": {
|
||||
"target": "http://localhost:17333",
|
||||
"secure": false,
|
||||
"pathRewrite": {"^/foobar" : ""},
|
||||
"changeOrigin": true,
|
||||
"logLevel": "debug"
|
||||
}
|
||||
}
|
||||
@@ -8,11 +8,28 @@ logging.config=classpath:log4j2.xml
|
||||
|
||||
server.port=17333
|
||||
|
||||
spring.servlet.multipart.enabled=true
|
||||
spring.servlet.multipart.max-file-size=3000MB
|
||||
spring.servlet.multipart.max-request-size=3000MB
|
||||
spring.servlet.multipart.file-size-threshold=2MB
|
||||
#spring.servlet.multipart.location=/tmp
|
||||
|
||||
|
||||
|
||||
#spring.resources.cache.cachecontrol.cache-private=true
|
||||
#spring.resources.cache.cachecontrol.must-revalidate=true
|
||||
#spring.resources.cache.cachecontrol.max-age=31536000
|
||||
#spring.resources.static-locations=classpath:/static/
|
||||
|
||||
|
||||
# Enable response compression
|
||||
server.compression.enabled=true
|
||||
|
||||
# The comma-separated list of mime types that should be compressed
|
||||
server.compression.mime-types=text/html,text/xml,text/plain,text/css,text/javascript,application/javascript,application/json
|
||||
|
||||
# Compress the response only if the response size is at least 1KB
|
||||
server.compression.min-response-size=1024
|
||||
|
||||
# Enable HTTP/2 support, if the current environment supports it
|
||||
#server.http2.enabled=true
|
||||
|
||||
Reference in New Issue
Block a user