diff options
| author | Andreas Fankhauser hiddenalpha.ch | 2024-04-16 15:25:43 +0200 |
|---|---|---|
| committer | Andreas Fankhauser hiddenalpha.ch | 2024-04-16 15:25:43 +0200 |
| commit | f072b8030e09cc87719207d6fbbd678708ea646a (patch) | |
| tree | ed5a42243f78b6c5a310da6514d32705ab5b5fc3 | |
| parent | ea915518ebcf4c0150aa25fab203515855bf1350 (diff) | |
| download | UnspecifiedGarbage-f072b8030e09cc87719207d6fbbd678708ea646a.zip UnspecifiedGarbage-f072b8030e09cc87719207d6fbbd678708ea646a.tar.gz | |
Fix preflux patch
| -rw-r--r-- | src/main/patch/preflux/default.patch | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/src/main/patch/preflux/default.patch b/src/main/patch/preflux/default.patch index 5b5f3f3..897d731 100644 --- a/src/main/patch/preflux/default.patch +++ b/src/main/patch/preflux/default.patch @@ -2,7 +2,6 @@ TODO describe (like in houston) -diff --git a/pom.xml b/pom.xml --- a/pom.xml +++ b/pom.xml @@ -57,6 +57,24 @@ @@ -30,8 +29,8 @@ diff --git a/pom.xml b/pom.xml </properties> <modules> -diff --git a/preflux-web/pom.xml b/preflux-web/pom.xml -index 752be702..8f91c053 100644 + + --- a/preflux-web/pom.xml +++ b/preflux-web/pom.xml @@ -14,6 +14,26 @@ @@ -61,8 +60,8 @@ index 752be702..8f91c053 100644 <!-- PA-ISA Platform --> <dependency> <groupId>ch.post.it.paisa.alice</groupId> -diff --git a/preflux-test/pom.xml b/preflux-test/pom.xml -index c50afbe5..115556c4 100644 + + --- a/preflux-test/pom.xml +++ b/preflux-test/pom.xml @@ -16,6 +16,26 @@ @@ -92,14 +91,14 @@ index c50afbe5..115556c4 100644 <!--Alice Test Framework--> <dependency> <groupId>ch.post.it.paisa.alice</groupId> -diff --git a/preflux-web/package.json b/preflux-web/package.json -index eda8e051..5353e179 100644 + + --- a/preflux-web/package.json +++ b/preflux-web/package.json @@ -10,10 +10,10 @@ - "check": "npm run format:check && npm run lint && npm run test:no-watch", + "check": "npm run format:check && npm run lint && npm run test", "check:ci": "npm run format:check && npm run lint", - "check:fix": "npm run format:fix && npm run lint:fix && npm run test:no-watch", + "check:fix": "npm run format:fix && npm run lint:fix && npm run test", - "format:check": "prettier --check \"src/main/angular/**/*.{ts,html,css,json}\"", - "format:fix": "prettier --write \"src/main/angular/**/*.{ts,html,css,json}\"", - "lint": "ng lint", @@ -108,12 +107,11 @@ index eda8e051..5353e179 100644 + "format:fix": "true", + "lint": "true", + "lint:fix": "true", - "test": "ng test --watch --browsers=ChromeHeadlessNoSandbox", - "test:ci": "npm run test:no-watch", - "test:no-watch": "ng test --no-watch --browsers=ChromeHeadlessNoSandbox" -diff --git a/preflux-web/src/main/java/org/apache/logging/slf4j/Log4jLogger.java b/preflux-web/src/main/java/org/apache/logging/slf4j/Log4jLogger.java -new file mode 100644 -index 00000000..e437dc34 + "test": "ng test --no-watch --browsers=ChromeHeadlessNoSandbox", + "test:ci": "npm run test", + "test:watch": "ng test --watch --browsers=ChromeHeadlessNoSandbox" + + --- /dev/null +++ b/preflux-web/src/main/java/org/apache/logging/slf4j/Log4jLogger.java @@ -0,0 +1,115 @@ @@ -232,3 +230,7 @@ index 00000000..e437dc34 + @Override public void error(Marker marker, String s, Throwable throwable) { log.error(marker, s, throwable); } + +} + + + + |