You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by di...@apache.org on 2021/12/17 03:38:26 UTC
[airavata] 01/01: Merge branch 'log4j-upgrade' into develop
This is an automated email from the ASF dual-hosted git repository.
dimuthuupe pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 8ec6073c27c721beb0d253e77ea74397f728ff12
Merge: 252f47f 299d663
Author: Dimuthu Wannipurage <di...@gmail.com>
AuthorDate: Thu Dec 16 20:57:43 2021 -0500
Merge branch 'log4j-upgrade' into develop
.../java-client-samples/pom.xml | 5 -
airavata-services/pom.xml | 5 -
dev-tools/ansible/roles/api-orch/defaults/main.yml | 2 +-
dev-tools/ansible/roles/api-orch/tasks/main.yml | 4 +-
.../ansible/roles/api-orch/templates/log4j2.xml.j2 | 57 ++++++
.../roles/api-orch/templates/logback.xml.j2 | 58 ------
dev-tools/ansible/roles/helix_setup/tasks/main.yml | 6 +-
.../helix_setup/templates/controller/log4j2.xml.j2 | 54 ++++++
.../templates/controller/logback.xml.j2 | 54 ------
.../helix_setup/templates/parser-wm/log4j2.xml.j2 | 54 ++++++
.../helix_setup/templates/parser-wm/logback.xml.j2 | 53 ------
.../templates/participant/log4j2.xml.j2 | 54 ++++++
.../templates/participant/logback.xml.j2 | 53 ------
.../helix_setup/templates/post-wm/log4j2.xml.j2 | 54 ++++++
.../helix_setup/templates/post-wm/logback.xml.j2 | 53 ------
.../helix_setup/templates/pre-wm/log4j2.xml.j2 | 54 ++++++
.../helix_setup/templates/pre-wm/logback.xml.j2 | 53 ------
.../ansible/roles/job_monitor/defaults/main.yml | 2 +-
dev-tools/ansible/roles/job_monitor/tasks/main.yml | 6 +-
.../templates/email-monitor/log4j2.xml.j2 | 54 ++++++
.../templates/email-monitor/logback.xml.j2 | 53 ------
.../templates/realtime-monitor/log4j2.xml.j2 | 54 ++++++
.../templates/realtime-monitor/logback.xml.j2 | 53 ------
.../roles/platform_monitor/defaults/main.yml | 28 ---
.../ansible/roles/platform_monitor/tasks/main.yml | 60 -------
.../templates/airavata-server.properties.j2 | 13 --
.../platform_monitor/templates/logback.xml.j2 | 53 ------
modules/airavata-helix/helix-spectator/pom.xml | 21 +--
.../helix-spectator/src/main/resources/log4j2.xml | 53 ++++++
.../helix-spectator/src/main/resources/logback.xml | 96 ----------
modules/cluster-monitoring/pom.xml | 4 -
modules/commons/pom.xml | 12 --
.../apache/airavata/common/logging/LogEntry.java | 131 --------------
.../apache/airavata/common/logging/ServerId.java | 67 -------
.../common/logging/kafka/KafkaAppender.java | 114 ------------
.../airavata/common/utils/AiravataZKUtils.java | 197 ---------------------
.../apache/airavata/common/utils/AwsMetadata.java | 136 --------------
.../airavata/common/utils/BrowserLauncher.java | 96 ----------
.../airavata/common/utils/ClientSettings.java | 25 ---
.../airavata/common/utils/ServerSettings.java | 15 --
.../utils/listener/AbstractActivityListener.java | 25 ---
.../utils/listener/AbstractStateChangeRequest.java | 25 ---
.../common/utils/listener/PublisherMessage.java | 24 ---
modules/compute-account-provisioning/pom.xml | 4 -
.../server/src/main/resources/airavata.jks | Bin 1410 -> 0 bytes
.../server/src/main/resources/airavata.pem | Bin 634 -> 0 bytes
.../src/main/resources/client_truststore.jks | Bin 5312 -> 0 bytes
.../server/src/main/resources/log4j2.xml | 53 ++++++
.../server/src/main/resources/logback.xml | 58 ------
.../credential-store-service/pom.xml | 15 +-
modules/distribution/pom.xml | 10 --
.../src/main/assembly/api-server-bin-assembly.xml | 2 +-
.../src/main/assembly/controller-bin-assembly.xml | 9 +-
.../main/assembly/email-monitor-bin-assembly.xml | 8 +-
.../src/main/assembly/parser-wm-bin-assembly.xml | 9 +-
.../src/main/assembly/participant-bin-assembly.xml | 9 +-
.../src/main/assembly/post-wm-bin-assembly.xml | 11 +-
.../src/main/assembly/pre-wm-bin-assembly.xml | 11 +-
.../assembly/realtime-monitor-bin-assembly.xml | 10 +-
.../resources/controller/bin/controller-daemon.sh | 2 +-
.../main/resources/controller/bin/controller.sh | 2 +-
.../src/main/resources/controller/conf/log4j2.xml | 53 ++++++
.../src/main/resources/controller/conf/logback.xml | 53 ------
.../email-monitor/bin/email-monitor-daemon.sh | 2 +-
.../resources/email-monitor/bin/email-monitor.sh | 2 +-
.../main/resources/email-monitor/conf/log4j2.xml | 53 ++++++
.../main/resources/email-monitor/conf/logback.xml | 53 ------
.../resources/parser-wm/bin/parser-wm-daemon.sh | 2 +-
.../src/main/resources/parser-wm/bin/parser-wm.sh | 2 +-
.../src/main/resources/parser-wm/conf/log4j2.xml | 53 ++++++
.../src/main/resources/parser-wm/conf/logback.xml | 53 ------
.../participant/bin/participant-daemon.sh | 2 +-
.../main/resources/participant/bin/participant.sh | 2 +-
.../src/main/resources/participant/conf/log4j2.xml | 53 ++++++
.../main/resources/participant/conf/logback.xml | 53 ------
.../main/resources/post-wm/bin/post-wm-daemon.sh | 2 +-
.../src/main/resources/post-wm/bin/post-wm.sh | 2 +-
.../src/main/resources/post-wm/conf/log4j2.xml | 53 ++++++
.../src/main/resources/post-wm/conf/logback.xml | 53 ------
.../src/main/resources/pre-wm/bin/pre-wm-daemon.sh | 2 +-
.../src/main/resources/pre-wm/bin/pre-wm.sh | 2 +-
.../src/main/resources/pre-wm/conf/log4j2.xml | 53 ++++++
.../src/main/resources/pre-wm/conf/logback.xml | 53 ------
.../bin/realtime-monitor-daemon.sh | 2 +-
.../realtime-monitor/bin/realtime-monitor.sh | 2 +-
.../resources/realtime-monitor/conf/log4j2.xml | 53 ++++++
.../resources/realtime-monitor/conf/logback.xml | 53 ------
.../ide-integration/src/main/resources/log4j2.xml | 53 ++++++
.../ide-integration/src/main/resources/logback.xml | 54 ------
modules/job-monitor/email-monitor/pom.xml | 12 --
.../email-monitor/src/main/resources/log4j2.xml | 53 ++++++
.../email-monitor/src/main/resources/logback.xml | 53 ------
modules/job-monitor/pom.xml | 15 --
modules/job-monitor/real-time-monitor/pom.xml | 12 --
.../src/main/resources/log4j2.xml | 53 ++++++
.../src/main/resources/logback.xml | 53 ------
modules/messaging/client/pom.xml | 9 -
modules/messaging/core/pom.xml | 9 -
modules/platform-monitoring/pom.xml | 5 -
modules/registry/registry-core/pom.xml | 6 -
.../registry-core/src/test/resources/log4j2.xml | 53 ++++++
.../registry-core/src/test/resources/logback.xml | 31 ----
modules/registry/registry-cpi/pom.xml | 9 -
modules/registry/registry-tools/jpa-gen/pom.xml | 9 -
modules/security/pom.xml | 4 -
modules/server/pom.xml | 9 -
.../org/apache/airavata/server/ServerMain.java | 34 +---
.../sharing-registry/sharing-data-migrator/pom.xml | 10 --
.../sharing-registry-distribution/pom.xml | 5 -
.../sharing-registry-server/pom.xml | 5 -
.../src/test/resources/log4j2.xml | 53 ++++++
.../src/test/resources/logback.xml | 31 ----
pom.xml | 63 ++++---
113 files changed, 1296 insertions(+), 2476 deletions(-)
diff --cc pom.xml
index e543b3f,aa99188..ffe1ae8
--- a/pom.xml
+++ b/pom.xml
@@@ -106,9 -106,8 +106,8 @@@
<snakeyaml.version>1.15</snakeyaml.version>
<maven.javadoc.failOnError>false</maven.javadoc.failOnError>
<maven.replacer.plugin.version>1.5.3</maven.replacer.plugin.version>
- <maven.assembly.plugin>3.1.1</maven.assembly.plugin>
+ <maven.assembly.plugin>3.3.0</maven.assembly.plugin>
<kafka-clients.version>1.0.0</kafka-clients.version>
- <logback.version>1.2.3</logback.version>
<json.version>20160212</json.version>
<commons.io.version>2.4</commons.io.version>
<google.guava.version>20.0</google.guava.version>