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/19 01:36:59 UTC
[airavata-data-lake] branch master updated: Upgrading to log4j 2.16.0
This is an automated email from the ASF dual-hosted git repository.
dimuthuupe pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-data-lake.git
The following commit(s) were added to refs/heads/master by this push:
new 9310dac Upgrading to log4j 2.16.0
9310dac is described below
commit 9310daccab50b187cf29e7ec8d8088ce2e227476
Author: Dimuthu Wannipurage <di...@gmail.com>
AuthorDate: Sat Dec 18 20:36:50 2021 -0500
Upgrading to log4j 2.16.0
---
.../prod-deployment/group_vars/all/vars.yml | 2 +
ansible/inventories/test/group_vars/all/vars.yml | 3 ++
.../secret-service/application.properties.j2 | 4 +-
.../data-orchestrator-clients-core/pom.xml | 4 --
.../directory-monitor/pom.xml | 20 ++++----
.../src/main/dist/bin/dir-monitor-daemon.sh | 2 +-
.../src/main/dist/bin/dir-monitor.sh | 2 +-
.../src/main/dist/conf/log4j2.xml | 52 ++++++++++++++++++++
.../src/main/dist/conf/logback.xml | 50 -------------------
.../src/main/dist/dir-monitor-bin-assembly.xml | 2 +-
.../src/main/resources/log4j2.xml | 52 ++++++++++++++++++++
.../src/main/resources/logback.xml | 50 -------------------
.../data-orchestrator-clients/pom.xml | 6 ---
.../data-orchestrator-messaging/pom.xml | 4 --
.../data-orchestrator-registry/pom.xml | 15 ++++--
.../data-orchestrator-api-server/pom.xml | 16 +++---
.../src/main/dist/bin/orch-api-server-daemon.sh | 2 +-
.../src/main/dist/bin/orch-api-server.sh | 2 +-
.../src/main/dist/conf/log4j2.xml | 52 ++++++++++++++++++++
.../src/main/dist/conf/logback.xml | 50 -------------------
.../main/dist/data-orch-api-service-assembly.xml | 2 +-
.../data-orchestrator-api-stub/pom.xml | 5 --
.../data-orchestrator-service/pom.xml | 4 --
.../datasync-workflow-manager/pom.xml | 5 --
.../src/main/dist/bin/wf-manager-daemon.sh | 2 +-
.../src/main/dist/bin/wf-manager.sh | 2 +-
.../src/main/dist/conf/log4j2.xml | 52 ++++++++++++++++++++
.../src/main/dist/conf/logback.xml | 50 -------------------
.../src/main/dist/wf-manager-assembly.xml | 2 +-
.../src/main/resources/log4j2.xml | 52 ++++++++++++++++++++
.../src/main/resources/logback.xml | 50 -------------------
.../workflow-engine/mft-callback-listener/pom.xml | 15 ++++--
data-orchestrator/workflow-engine/pom.xml | 57 ----------------------
.../workflow-engine/workflow-engine-client/pom.xml | 5 --
.../workflow-engine-controller/pom.xml | 15 ++++--
.../src/main/dist/bin/wf-controller-daemon.sh | 2 +-
.../src/main/dist/bin/wf-controller.sh | 2 +-
.../src/main/dist/conf/log4j2.xml | 52 ++++++++++++++++++++
.../src/main/dist/conf/logback.xml | 50 -------------------
.../src/main/dist/wf-controller-assembly.xml | 2 +-
.../src/main/resources/log4j2.xml | 52 ++++++++++++++++++++
.../src/main/resources/logback.xml | 50 -------------------
.../workflow-engine/workflow-engine-core/pom.xml | 4 --
.../workflow-engine/workflow-engine-stubs/pom.xml | 5 --
.../workflow-engine/workflow-engine-worker/pom.xml | 5 --
.../src/main/dist/bin/wf-worker-daemon.sh | 2 +-
.../src/main/dist/bin/wf-worker.sh | 2 +-
.../src/main/dist/conf/log4j2.xml | 52 ++++++++++++++++++++
.../src/main/dist/conf/logback.xml | 50 -------------------
.../src/main/dist/wf-worker-assembly.xml | 2 +-
.../src/main/resources/log4j2.xml | 52 ++++++++++++++++++++
.../src/main/resources/logback.xml | 50 -------------------
data-resource-management-service/drms-api/pom.xml | 6 ++-
.../drms-api/src/main/dist/bin/drms-daemon.sh | 2 +-
.../drms-api/src/main/dist/bin/drms.sh | 2 +-
.../drms-api/src/main/dist/conf/log4j2.xml | 52 ++++++++++++++++++++
.../drms-api/src/main/dist/conf/logback.xml | 45 -----------------
.../drms-api/src/main/dist/drms-assembly.xml | 2 +-
.../drms-api/src/main/resources/log4j2.xml | 52 ++++++++++++++++++++
.../drms-api/src/main/resources/logback.xml | 45 -----------------
data-resource-management-service/drms-core/pom.xml | 10 ++++
.../drms-custos-synchronizer/pom.xml | 25 ++++------
.../dist/bin/drms-custos-synchronizer-daemon.sh | 2 +-
.../src/main/dist/bin/drms-custos-synchronizer.sh | 2 +-
.../src/main/dist/conf/log4j2.xml | 52 ++++++++++++++++++++
.../src/main/dist/conf/logback.xml | 45 -----------------
.../dist/drms-custos-synchronizer-assembly.xml | 2 +-
.../src/main/resources/log4j2.xml | 52 ++++++++++++++++++++
.../src/main/resources/logback.xml | 45 -----------------
data-resource-management-service/pom.xml | 10 ----
datalake-rest-proxy/pom.xml | 5 --
pom.xml | 35 +++++++++++--
72 files changed, 809 insertions(+), 824 deletions(-)
diff --git a/ansible/inventories/prod-deployment/group_vars/all/vars.yml b/ansible/inventories/prod-deployment/group_vars/all/vars.yml
index 51c140f..c472734 100644
--- a/ansible/inventories/prod-deployment/group_vars/all/vars.yml
+++ b/ansible/inventories/prod-deployment/group_vars/all/vars.yml
@@ -35,6 +35,8 @@ kafka_url: "{{ groups['data-lake'][0] }}:9092"
custos_kafka_url: custos07.sciencegateways.iu.edu:9092
zookeeper_client_port: 2181
zookeeper_connection_url: localhost:2181
+custos_host: services.usecustos.org
+custos_port: 31161
mft_deployment_dir: "{{ user_home }}/mft-deployment"
mft_source_dir: "{{ user_home }}/mft-source"
diff --git a/ansible/inventories/test/group_vars/all/vars.yml b/ansible/inventories/test/group_vars/all/vars.yml
index 22f075a..16aa861 100644
--- a/ansible/inventories/test/group_vars/all/vars.yml
+++ b/ansible/inventories/test/group_vars/all/vars.yml
@@ -36,6 +36,9 @@ custos_kafka_url: 149.165.156.200:9092
zookeeper_client_port: 2181
zookeeper_connection_url: localhost:2181
+custos_host: custos.scigap.org
+custos_port: 31499
+
mft_deployment_dir: "{{ user_home }}/mft-deployment"
mft_source_dir: "{{ user_home }}/mft-source"
mft_repo: "https://github.com/apache/airavata-mft.git"
diff --git a/ansible/roles/mft/templates/secret-service/application.properties.j2 b/ansible/roles/mft/templates/secret-service/application.properties.j2
index 0f3a14a..5ff8516 100644
--- a/ansible/roles/mft/templates/secret-service/application.properties.j2
+++ b/ansible/roles/mft/templates/secret-service/application.properties.j2
@@ -26,8 +26,8 @@ airavata.backend.credential.server.port=8960
file.backend.secret.file=secrets.json
# Configurations for Custos Backend
-custos.host=custos.scigap.org
-custos.port=31499
+custos.host={{ custos_host }}
+custos.port={{ custos_port }}
custos.id={{ mft_secret_service_custos_client_id }}
custos.secret={{ mft_secret_service_custos_client_secret }}
custos.backend.drms.host={{ datalake_drms_host }}
diff --git a/data-orchestrator/data-orchestrator-clients/data-orchestrator-clients-core/pom.xml b/data-orchestrator/data-orchestrator-clients/data-orchestrator-clients-core/pom.xml
index 53b11ed..8df13d1 100644
--- a/data-orchestrator/data-orchestrator-clients/data-orchestrator-clients-core/pom.xml
+++ b/data-orchestrator/data-orchestrator-clients/data-orchestrator-clients-core/pom.xml
@@ -11,10 +11,6 @@
<artifactId>data-orchestrator-clients-core</artifactId>
- <properties>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
- </properties>
<dependencies>
<dependency>
diff --git a/data-orchestrator/data-orchestrator-clients/directory-monitor/pom.xml b/data-orchestrator/data-orchestrator-clients/directory-monitor/pom.xml
index 265072d..76626e9 100644
--- a/data-orchestrator/data-orchestrator-clients/directory-monitor/pom.xml
+++ b/data-orchestrator/data-orchestrator-clients/directory-monitor/pom.xml
@@ -32,21 +32,21 @@
<artifactId>directory-monitor</artifactId>
- <properties>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
<version>${spring.boot.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>${log4j.over.slf4j}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-to-slf4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.airavata.data.lake</groupId>
diff --git a/data-orchestrator/data-orchestrator-clients/directory-monitor/src/main/dist/bin/dir-monitor-daemon.sh b/data-orchestrator/data-orchestrator-clients/directory-monitor/src/main/dist/bin/dir-monitor-daemon.sh
index 2a549f6..8156787 100644
--- a/data-orchestrator/data-orchestrator-clients/directory-monitor/src/main/dist/bin/dir-monitor-daemon.sh
+++ b/data-orchestrator/data-orchestrator-clients/directory-monitor/src/main/dist/bin/dir-monitor-daemon.sh
@@ -23,7 +23,7 @@ CWD="$PWD"
cd ${AIRAVATA_HOME}/bin
LOGO_FILE="logo.txt"
-JAVA_OPTS="-Dspring.config.location=${AIRAVATA_HOME}/conf/ -Dairavata.home=${AIRAVATA_HOME} -Dlogback.configurationFile=file:${AIRAVATA_HOME}/conf/logback.xml"
+JAVA_OPTS="-Dspring.config.location=${AIRAVATA_HOME}/conf/ -Dairavata.home=${AIRAVATA_HOME} -Dlog4j.configurationFile=file:${AIRAVATA_HOME}/conf/log4j2.xml"
AIRAVATA_COMMAND=""
EXTRA_ARGS=""
SERVERS=""
diff --git a/data-orchestrator/data-orchestrator-clients/directory-monitor/src/main/dist/bin/dir-monitor.sh b/data-orchestrator/data-orchestrator-clients/directory-monitor/src/main/dist/bin/dir-monitor.sh
index 902d6ea..77891cf 100644
--- a/data-orchestrator/data-orchestrator-clients/directory-monitor/src/main/dist/bin/dir-monitor.sh
+++ b/data-orchestrator/data-orchestrator-clients/directory-monitor/src/main/dist/bin/dir-monitor.sh
@@ -23,7 +23,7 @@ CWD="$PWD"
cd ${AIRAVATA_HOME}/bin
LOGO_FILE="logo.txt"
-JAVA_OPTS="-Dspring.config.location=${AIRAVATA_HOME}/conf/ -Dairavata.home=${AIRAVATA_HOME} -Dlogback.configurationFile=file:${AIRAVATA_HOME}/conf/logback.xml"
+JAVA_OPTS="-Dspring.config.location=${AIRAVATA_HOME}/conf/ -Dairavata.home=${AIRAVATA_HOME} -Dlog4j.configurationFile=file:${AIRAVATA_HOME}/conf/log4j2.xml"
AIRAVATA_COMMAND=""
EXTRA_ARGS=""
SERVERS=""
diff --git a/data-orchestrator/data-orchestrator-clients/directory-monitor/src/main/dist/conf/log4j2.xml b/data-orchestrator/data-orchestrator-clients/directory-monitor/src/main/dist/conf/log4j2.xml
new file mode 100644
index 0000000..066c238
--- /dev/null
+++ b/data-orchestrator/data-orchestrator-clients/directory-monitor/src/main/dist/conf/log4j2.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<Configuration status="WARN">
+
+ <Appenders>
+ <Console name="Console" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d [%t] %-5p %c{30} %X - %m%n"/>
+ </Console>
+ <RollingFile name="RollingFileAppender" fileName="../logs/airavata.log"
+ filePattern="logs/${date:yyyy-MM}/airavata-log-%d{MM-dd-yyyy}-%i.log.gz">
+ <PatternLayout>
+ <Pattern>%d [%t] %-5p %c{30} %X - %m%n</Pattern>
+ </PatternLayout>
+ <Policies>
+ <OnStartupTriggeringPolicy />
+ <TimeBasedTriggeringPolicy />
+ <SizeBasedTriggeringPolicy size="50 MB" />
+ </Policies>
+ <DefaultRolloverStrategy max="20" />
+ </RollingFile>
+ </Appenders>
+ <Loggers>
+ <logger name="org.apache.helix" level="WARN"/>
+ <logger name="org.apache.zookeeper" level="ERROR"/>
+ <logger name="org.apache.airavata" level="INFO"/>
+ <logger name="org.hibernate" level="ERROR"/>
+ <Root level="INFO">
+ <AppenderRef ref="Console"/>
+ <AppenderRef ref="RollingFileAppender"/>
+ </Root>
+ </Loggers>
+</Configuration>
\ No newline at end of file
diff --git a/data-orchestrator/data-orchestrator-clients/directory-monitor/src/main/dist/conf/logback.xml b/data-orchestrator/data-orchestrator-clients/directory-monitor/src/main/dist/conf/logback.xml
deleted file mode 100644
index 3afe661..0000000
--- a/data-orchestrator/data-orchestrator-clients/directory-monitor/src/main/dist/conf/logback.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<configuration>
-
- <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>%d [%t] %-5p %c{30} %m [%X]%n</pattern>
- </encoder>
- </appender>
-
- <appender name="LOGFILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <File>../logs/airavata.log</File>
- <Append>true</Append>
- <encoder>
- <pattern>%d [%t] %-5p %c{30} %m [%X]%n</pattern>
- </encoder>
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <fileNamePattern>../logs/airavata.log.%d{yyyy-MM-dd}</fileNamePattern>
- <maxHistory>30</maxHistory>
- <totalSizeCap>1GB</totalSizeCap>
- </rollingPolicy>
- </appender>
-
- <logger name="ch.qos.logback" level="WARN"/>
- <logger name="org.apache.helix" level="WARN"/>
- <logger name="org.apache.zookeeper" level="ERROR"/>
- <logger name="org.apache.helix" level="ERROR"/>
- <logger name="org.apache.airavata" level="INFO"/>
- <logger name="org.hibernate" level="ERROR"/>
- <logger name="net.schmizz.sshj" level="WARN"/>
- <root level="INFO">
- <appender-ref ref="CONSOLE"/>
- <appender-ref ref="LOGFILE"/>
- </root>
-</configuration>
\ No newline at end of file
diff --git a/data-orchestrator/data-orchestrator-clients/directory-monitor/src/main/dist/dir-monitor-bin-assembly.xml b/data-orchestrator/data-orchestrator-clients/directory-monitor/src/main/dist/dir-monitor-bin-assembly.xml
index 743414b..e71c9d0 100644
--- a/data-orchestrator/data-orchestrator-clients/directory-monitor/src/main/dist/dir-monitor-bin-assembly.xml
+++ b/data-orchestrator/data-orchestrator-clients/directory-monitor/src/main/dist/dir-monitor-bin-assembly.xml
@@ -54,7 +54,7 @@
<outputDirectory>conf</outputDirectory>
<includes>
<include>application.properties</include>
- <include>logback.xml</include>
+ <include>log4j2.xml</include>
</includes>
</fileSet>
<fileSet>
diff --git a/data-orchestrator/data-orchestrator-clients/directory-monitor/src/main/resources/log4j2.xml b/data-orchestrator/data-orchestrator-clients/directory-monitor/src/main/resources/log4j2.xml
new file mode 100644
index 0000000..066c238
--- /dev/null
+++ b/data-orchestrator/data-orchestrator-clients/directory-monitor/src/main/resources/log4j2.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<Configuration status="WARN">
+
+ <Appenders>
+ <Console name="Console" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d [%t] %-5p %c{30} %X - %m%n"/>
+ </Console>
+ <RollingFile name="RollingFileAppender" fileName="../logs/airavata.log"
+ filePattern="logs/${date:yyyy-MM}/airavata-log-%d{MM-dd-yyyy}-%i.log.gz">
+ <PatternLayout>
+ <Pattern>%d [%t] %-5p %c{30} %X - %m%n</Pattern>
+ </PatternLayout>
+ <Policies>
+ <OnStartupTriggeringPolicy />
+ <TimeBasedTriggeringPolicy />
+ <SizeBasedTriggeringPolicy size="50 MB" />
+ </Policies>
+ <DefaultRolloverStrategy max="20" />
+ </RollingFile>
+ </Appenders>
+ <Loggers>
+ <logger name="org.apache.helix" level="WARN"/>
+ <logger name="org.apache.zookeeper" level="ERROR"/>
+ <logger name="org.apache.airavata" level="INFO"/>
+ <logger name="org.hibernate" level="ERROR"/>
+ <Root level="INFO">
+ <AppenderRef ref="Console"/>
+ <AppenderRef ref="RollingFileAppender"/>
+ </Root>
+ </Loggers>
+</Configuration>
\ No newline at end of file
diff --git a/data-orchestrator/data-orchestrator-clients/directory-monitor/src/main/resources/logback.xml b/data-orchestrator/data-orchestrator-clients/directory-monitor/src/main/resources/logback.xml
deleted file mode 100644
index 3afe661..0000000
--- a/data-orchestrator/data-orchestrator-clients/directory-monitor/src/main/resources/logback.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<configuration>
-
- <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>%d [%t] %-5p %c{30} %m [%X]%n</pattern>
- </encoder>
- </appender>
-
- <appender name="LOGFILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <File>../logs/airavata.log</File>
- <Append>true</Append>
- <encoder>
- <pattern>%d [%t] %-5p %c{30} %m [%X]%n</pattern>
- </encoder>
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <fileNamePattern>../logs/airavata.log.%d{yyyy-MM-dd}</fileNamePattern>
- <maxHistory>30</maxHistory>
- <totalSizeCap>1GB</totalSizeCap>
- </rollingPolicy>
- </appender>
-
- <logger name="ch.qos.logback" level="WARN"/>
- <logger name="org.apache.helix" level="WARN"/>
- <logger name="org.apache.zookeeper" level="ERROR"/>
- <logger name="org.apache.helix" level="ERROR"/>
- <logger name="org.apache.airavata" level="INFO"/>
- <logger name="org.hibernate" level="ERROR"/>
- <logger name="net.schmizz.sshj" level="WARN"/>
- <root level="INFO">
- <appender-ref ref="CONSOLE"/>
- <appender-ref ref="LOGFILE"/>
- </root>
-</configuration>
\ No newline at end of file
diff --git a/data-orchestrator/data-orchestrator-clients/pom.xml b/data-orchestrator/data-orchestrator-clients/pom.xml
index 6f0ee3f..7aa34e9 100644
--- a/data-orchestrator/data-orchestrator-clients/pom.xml
+++ b/data-orchestrator/data-orchestrator-clients/pom.xml
@@ -36,10 +36,4 @@
</modules>
<modelVersion>4.0.0</modelVersion>
-
- <properties>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
- </properties>
-
</project>
\ No newline at end of file
diff --git a/data-orchestrator/data-orchestrator-messaging/pom.xml b/data-orchestrator/data-orchestrator-messaging/pom.xml
index f73276a..37abe10 100644
--- a/data-orchestrator/data-orchestrator-messaging/pom.xml
+++ b/data-orchestrator/data-orchestrator-messaging/pom.xml
@@ -10,10 +10,6 @@
<artifactId>data-orchestrator-messaging</artifactId>
<modelVersion>4.0.0</modelVersion>
- <properties>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
- </properties>
<dependencies>
<dependency>
<groupId>org.apache.kafka</groupId>
diff --git a/data-orchestrator/data-orchestrator-registry/pom.xml b/data-orchestrator/data-orchestrator-registry/pom.xml
index e2000d8..62ae461 100644
--- a/data-orchestrator/data-orchestrator-registry/pom.xml
+++ b/data-orchestrator/data-orchestrator-registry/pom.xml
@@ -12,16 +12,21 @@
<artifactId>data-orchestrator-registry</artifactId>
- <properties>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
<version>2.4.5</version>
+ <exclusions>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-to-slf4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
diff --git a/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/pom.xml b/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/pom.xml
index 9b7d5be..dc68b66 100644
--- a/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/pom.xml
+++ b/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/pom.xml
@@ -37,6 +37,16 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>${spring.boot.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-to-slf4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -129,12 +139,6 @@
</dependency>
<dependency>
<groupId>org.apache.airavata.data.lake</groupId>
- <artifactId>drms-stubs</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata.data.lake</groupId>
<artifactId>data-orchestrator-api-stub</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/dist/bin/orch-api-server-daemon.sh b/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/dist/bin/orch-api-server-daemon.sh
index 70a4333..f3237da 100644
--- a/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/dist/bin/orch-api-server-daemon.sh
+++ b/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/dist/bin/orch-api-server-daemon.sh
@@ -23,7 +23,7 @@ CWD="$PWD"
cd ${AIRAVATA_HOME}/bin
LOGO_FILE="logo.txt"
-JAVA_OPTS="-Dspring.config.location=${AIRAVATA_HOME}/conf/ -Dairavata.home=${AIRAVATA_HOME} -Dlogback.configurationFile=file:${AIRAVATA_HOME}/conf/logback.xml"
+JAVA_OPTS="-Dspring.config.location=${AIRAVATA_HOME}/conf/ -Dairavata.home=${AIRAVATA_HOME} -Dlog4j.configurationFile=file:${AIRAVATA_HOME}/conf/log4j2.xml"
AIRAVATA_COMMAND=""
EXTRA_ARGS=""
SERVERS=""
diff --git a/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/dist/bin/orch-api-server.sh b/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/dist/bin/orch-api-server.sh
index b6a146d..7a20396 100644
--- a/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/dist/bin/orch-api-server.sh
+++ b/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/dist/bin/orch-api-server.sh
@@ -23,7 +23,7 @@ CWD="$PWD"
cd ${AIRAVATA_HOME}/bin
LOGO_FILE="logo.txt"
-JAVA_OPTS="-Dspring.config.location=${AIRAVATA_HOME}/conf/ -Dairavata.home=${AIRAVATA_HOME} -Dlogback.configurationFile=file:${AIRAVATA_HOME}/conf/logback.xml"
+JAVA_OPTS="-Dspring.config.location=${AIRAVATA_HOME}/conf/ -Dairavata.home=${AIRAVATA_HOME} -Dlog4j.configurationFile=file:${AIRAVATA_HOME}/conf/log4j2.xml"
AIRAVATA_COMMAND=""
EXTRA_ARGS=""
SERVERS=""
diff --git a/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/dist/conf/log4j2.xml b/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/dist/conf/log4j2.xml
new file mode 100644
index 0000000..066c238
--- /dev/null
+++ b/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/dist/conf/log4j2.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<Configuration status="WARN">
+
+ <Appenders>
+ <Console name="Console" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d [%t] %-5p %c{30} %X - %m%n"/>
+ </Console>
+ <RollingFile name="RollingFileAppender" fileName="../logs/airavata.log"
+ filePattern="logs/${date:yyyy-MM}/airavata-log-%d{MM-dd-yyyy}-%i.log.gz">
+ <PatternLayout>
+ <Pattern>%d [%t] %-5p %c{30} %X - %m%n</Pattern>
+ </PatternLayout>
+ <Policies>
+ <OnStartupTriggeringPolicy />
+ <TimeBasedTriggeringPolicy />
+ <SizeBasedTriggeringPolicy size="50 MB" />
+ </Policies>
+ <DefaultRolloverStrategy max="20" />
+ </RollingFile>
+ </Appenders>
+ <Loggers>
+ <logger name="org.apache.helix" level="WARN"/>
+ <logger name="org.apache.zookeeper" level="ERROR"/>
+ <logger name="org.apache.airavata" level="INFO"/>
+ <logger name="org.hibernate" level="ERROR"/>
+ <Root level="INFO">
+ <AppenderRef ref="Console"/>
+ <AppenderRef ref="RollingFileAppender"/>
+ </Root>
+ </Loggers>
+</Configuration>
\ No newline at end of file
diff --git a/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/dist/conf/logback.xml b/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/dist/conf/logback.xml
deleted file mode 100644
index 3afe661..0000000
--- a/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/dist/conf/logback.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<configuration>
-
- <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>%d [%t] %-5p %c{30} %m [%X]%n</pattern>
- </encoder>
- </appender>
-
- <appender name="LOGFILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <File>../logs/airavata.log</File>
- <Append>true</Append>
- <encoder>
- <pattern>%d [%t] %-5p %c{30} %m [%X]%n</pattern>
- </encoder>
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <fileNamePattern>../logs/airavata.log.%d{yyyy-MM-dd}</fileNamePattern>
- <maxHistory>30</maxHistory>
- <totalSizeCap>1GB</totalSizeCap>
- </rollingPolicy>
- </appender>
-
- <logger name="ch.qos.logback" level="WARN"/>
- <logger name="org.apache.helix" level="WARN"/>
- <logger name="org.apache.zookeeper" level="ERROR"/>
- <logger name="org.apache.helix" level="ERROR"/>
- <logger name="org.apache.airavata" level="INFO"/>
- <logger name="org.hibernate" level="ERROR"/>
- <logger name="net.schmizz.sshj" level="WARN"/>
- <root level="INFO">
- <appender-ref ref="CONSOLE"/>
- <appender-ref ref="LOGFILE"/>
- </root>
-</configuration>
\ No newline at end of file
diff --git a/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/dist/data-orch-api-service-assembly.xml b/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/dist/data-orch-api-service-assembly.xml
index 175578c..0f92105 100644
--- a/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/dist/data-orch-api-service-assembly.xml
+++ b/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/dist/data-orch-api-service-assembly.xml
@@ -55,7 +55,7 @@
<includes>
<include>application.properties</include>
<include>config.yml</include>
- <include>logback.xml</include>
+ <include>log4j2.xml</include>
</includes>
</fileSet>
<fileSet>
diff --git a/data-orchestrator/data-orchestrator-service/data-orchestrator-api-stub/pom.xml b/data-orchestrator/data-orchestrator-service/data-orchestrator-api-stub/pom.xml
index bc1a597..6edb738 100644
--- a/data-orchestrator/data-orchestrator-service/data-orchestrator-api-stub/pom.xml
+++ b/data-orchestrator/data-orchestrator-service/data-orchestrator-api-stub/pom.xml
@@ -11,11 +11,6 @@
<artifactId>data-orchestrator-api-stub</artifactId>
- <properties>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
- </properties>
-
<dependencies>
<dependency>
<groupId>com.google.protobuf</groupId>
diff --git a/data-orchestrator/data-orchestrator-service/pom.xml b/data-orchestrator/data-orchestrator-service/pom.xml
index 10050e8..e613c3c 100644
--- a/data-orchestrator/data-orchestrator-service/pom.xml
+++ b/data-orchestrator/data-orchestrator-service/pom.xml
@@ -12,10 +12,6 @@
<artifactId>data-orchestrator-service</artifactId>
<packaging>pom</packaging>
- <properties>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
- </properties>
<modules>
<module>data-orchestrator-api-server</module>
<module>data-orchestrator-service-core</module>
diff --git a/data-orchestrator/workflow-engine/datasync-workflow-manager/pom.xml b/data-orchestrator/workflow-engine/datasync-workflow-manager/pom.xml
index 2b1486b..a5677d7 100644
--- a/data-orchestrator/workflow-engine/datasync-workflow-manager/pom.xml
+++ b/data-orchestrator/workflow-engine/datasync-workflow-manager/pom.xml
@@ -11,11 +11,6 @@
<artifactId>datasync-workflow-manager</artifactId>
- <properties>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.airavata.data.lake</groupId>
diff --git a/data-orchestrator/workflow-engine/datasync-workflow-manager/src/main/dist/bin/wf-manager-daemon.sh b/data-orchestrator/workflow-engine/datasync-workflow-manager/src/main/dist/bin/wf-manager-daemon.sh
index 36a60f9..5e0d1c0 100644
--- a/data-orchestrator/workflow-engine/datasync-workflow-manager/src/main/dist/bin/wf-manager-daemon.sh
+++ b/data-orchestrator/workflow-engine/datasync-workflow-manager/src/main/dist/bin/wf-manager-daemon.sh
@@ -23,7 +23,7 @@ CWD="$PWD"
cd ${AIRAVATA_HOME}/bin
LOGO_FILE="logo.txt"
-JAVA_OPTS="-Dspring.config.location=${AIRAVATA_HOME}/conf/ -Dairavata.home=${AIRAVATA_HOME} -Dlogback.configurationFile=file:${AIRAVATA_HOME}/conf/logback.xml"
+JAVA_OPTS="-Dspring.config.location=${AIRAVATA_HOME}/conf/ -Dairavata.home=${AIRAVATA_HOME} -Dlog4j.configurationFile=file:${AIRAVATA_HOME}/conf/log4j2.xml"
AIRAVATA_COMMAND=""
EXTRA_ARGS=""
SERVERS=""
diff --git a/data-orchestrator/workflow-engine/datasync-workflow-manager/src/main/dist/bin/wf-manager.sh b/data-orchestrator/workflow-engine/datasync-workflow-manager/src/main/dist/bin/wf-manager.sh
index cab2d37..88b368c 100644
--- a/data-orchestrator/workflow-engine/datasync-workflow-manager/src/main/dist/bin/wf-manager.sh
+++ b/data-orchestrator/workflow-engine/datasync-workflow-manager/src/main/dist/bin/wf-manager.sh
@@ -23,7 +23,7 @@ CWD="$PWD"
cd ${AIRAVATA_HOME}/bin
LOGO_FILE="logo.txt"
-JAVA_OPTS="-Dspring.config.location=${AIRAVATA_HOME}/conf/ -Dairavata.home=${AIRAVATA_HOME} -Dlogback.configurationFile=file:${AIRAVATA_HOME}/conf/logback.xml"
+JAVA_OPTS="-Dspring.config.location=${AIRAVATA_HOME}/conf/ -Dairavata.home=${AIRAVATA_HOME} -Dlog4j.configurationFile=file:${AIRAVATA_HOME}/conf/log4j2.xml"
AIRAVATA_COMMAND=""
EXTRA_ARGS=""
SERVERS=""
diff --git a/data-orchestrator/workflow-engine/datasync-workflow-manager/src/main/dist/conf/log4j2.xml b/data-orchestrator/workflow-engine/datasync-workflow-manager/src/main/dist/conf/log4j2.xml
new file mode 100644
index 0000000..066c238
--- /dev/null
+++ b/data-orchestrator/workflow-engine/datasync-workflow-manager/src/main/dist/conf/log4j2.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<Configuration status="WARN">
+
+ <Appenders>
+ <Console name="Console" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d [%t] %-5p %c{30} %X - %m%n"/>
+ </Console>
+ <RollingFile name="RollingFileAppender" fileName="../logs/airavata.log"
+ filePattern="logs/${date:yyyy-MM}/airavata-log-%d{MM-dd-yyyy}-%i.log.gz">
+ <PatternLayout>
+ <Pattern>%d [%t] %-5p %c{30} %X - %m%n</Pattern>
+ </PatternLayout>
+ <Policies>
+ <OnStartupTriggeringPolicy />
+ <TimeBasedTriggeringPolicy />
+ <SizeBasedTriggeringPolicy size="50 MB" />
+ </Policies>
+ <DefaultRolloverStrategy max="20" />
+ </RollingFile>
+ </Appenders>
+ <Loggers>
+ <logger name="org.apache.helix" level="WARN"/>
+ <logger name="org.apache.zookeeper" level="ERROR"/>
+ <logger name="org.apache.airavata" level="INFO"/>
+ <logger name="org.hibernate" level="ERROR"/>
+ <Root level="INFO">
+ <AppenderRef ref="Console"/>
+ <AppenderRef ref="RollingFileAppender"/>
+ </Root>
+ </Loggers>
+</Configuration>
\ No newline at end of file
diff --git a/data-orchestrator/workflow-engine/datasync-workflow-manager/src/main/dist/conf/logback.xml b/data-orchestrator/workflow-engine/datasync-workflow-manager/src/main/dist/conf/logback.xml
deleted file mode 100644
index 3afe661..0000000
--- a/data-orchestrator/workflow-engine/datasync-workflow-manager/src/main/dist/conf/logback.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<configuration>
-
- <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>%d [%t] %-5p %c{30} %m [%X]%n</pattern>
- </encoder>
- </appender>
-
- <appender name="LOGFILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <File>../logs/airavata.log</File>
- <Append>true</Append>
- <encoder>
- <pattern>%d [%t] %-5p %c{30} %m [%X]%n</pattern>
- </encoder>
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <fileNamePattern>../logs/airavata.log.%d{yyyy-MM-dd}</fileNamePattern>
- <maxHistory>30</maxHistory>
- <totalSizeCap>1GB</totalSizeCap>
- </rollingPolicy>
- </appender>
-
- <logger name="ch.qos.logback" level="WARN"/>
- <logger name="org.apache.helix" level="WARN"/>
- <logger name="org.apache.zookeeper" level="ERROR"/>
- <logger name="org.apache.helix" level="ERROR"/>
- <logger name="org.apache.airavata" level="INFO"/>
- <logger name="org.hibernate" level="ERROR"/>
- <logger name="net.schmizz.sshj" level="WARN"/>
- <root level="INFO">
- <appender-ref ref="CONSOLE"/>
- <appender-ref ref="LOGFILE"/>
- </root>
-</configuration>
\ No newline at end of file
diff --git a/data-orchestrator/workflow-engine/datasync-workflow-manager/src/main/dist/wf-manager-assembly.xml b/data-orchestrator/workflow-engine/datasync-workflow-manager/src/main/dist/wf-manager-assembly.xml
index 551916c..55d428b 100644
--- a/data-orchestrator/workflow-engine/datasync-workflow-manager/src/main/dist/wf-manager-assembly.xml
+++ b/data-orchestrator/workflow-engine/datasync-workflow-manager/src/main/dist/wf-manager-assembly.xml
@@ -54,7 +54,7 @@
<outputDirectory>conf</outputDirectory>
<includes>
<include>application.properties</include>
- <include>logback.xml</include>
+ <include>log4j2.xml</include>
</includes>
</fileSet>
<fileSet>
diff --git a/data-orchestrator/workflow-engine/datasync-workflow-manager/src/main/resources/log4j2.xml b/data-orchestrator/workflow-engine/datasync-workflow-manager/src/main/resources/log4j2.xml
new file mode 100644
index 0000000..066c238
--- /dev/null
+++ b/data-orchestrator/workflow-engine/datasync-workflow-manager/src/main/resources/log4j2.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<Configuration status="WARN">
+
+ <Appenders>
+ <Console name="Console" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d [%t] %-5p %c{30} %X - %m%n"/>
+ </Console>
+ <RollingFile name="RollingFileAppender" fileName="../logs/airavata.log"
+ filePattern="logs/${date:yyyy-MM}/airavata-log-%d{MM-dd-yyyy}-%i.log.gz">
+ <PatternLayout>
+ <Pattern>%d [%t] %-5p %c{30} %X - %m%n</Pattern>
+ </PatternLayout>
+ <Policies>
+ <OnStartupTriggeringPolicy />
+ <TimeBasedTriggeringPolicy />
+ <SizeBasedTriggeringPolicy size="50 MB" />
+ </Policies>
+ <DefaultRolloverStrategy max="20" />
+ </RollingFile>
+ </Appenders>
+ <Loggers>
+ <logger name="org.apache.helix" level="WARN"/>
+ <logger name="org.apache.zookeeper" level="ERROR"/>
+ <logger name="org.apache.airavata" level="INFO"/>
+ <logger name="org.hibernate" level="ERROR"/>
+ <Root level="INFO">
+ <AppenderRef ref="Console"/>
+ <AppenderRef ref="RollingFileAppender"/>
+ </Root>
+ </Loggers>
+</Configuration>
\ No newline at end of file
diff --git a/data-orchestrator/workflow-engine/datasync-workflow-manager/src/main/resources/logback.xml b/data-orchestrator/workflow-engine/datasync-workflow-manager/src/main/resources/logback.xml
deleted file mode 100644
index 3afe661..0000000
--- a/data-orchestrator/workflow-engine/datasync-workflow-manager/src/main/resources/logback.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<configuration>
-
- <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>%d [%t] %-5p %c{30} %m [%X]%n</pattern>
- </encoder>
- </appender>
-
- <appender name="LOGFILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <File>../logs/airavata.log</File>
- <Append>true</Append>
- <encoder>
- <pattern>%d [%t] %-5p %c{30} %m [%X]%n</pattern>
- </encoder>
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <fileNamePattern>../logs/airavata.log.%d{yyyy-MM-dd}</fileNamePattern>
- <maxHistory>30</maxHistory>
- <totalSizeCap>1GB</totalSizeCap>
- </rollingPolicy>
- </appender>
-
- <logger name="ch.qos.logback" level="WARN"/>
- <logger name="org.apache.helix" level="WARN"/>
- <logger name="org.apache.zookeeper" level="ERROR"/>
- <logger name="org.apache.helix" level="ERROR"/>
- <logger name="org.apache.airavata" level="INFO"/>
- <logger name="org.hibernate" level="ERROR"/>
- <logger name="net.schmizz.sshj" level="WARN"/>
- <root level="INFO">
- <appender-ref ref="CONSOLE"/>
- <appender-ref ref="LOGFILE"/>
- </root>
-</configuration>
\ No newline at end of file
diff --git a/data-orchestrator/workflow-engine/mft-callback-listener/pom.xml b/data-orchestrator/workflow-engine/mft-callback-listener/pom.xml
index 647dc1b..58d63b5 100644
--- a/data-orchestrator/workflow-engine/mft-callback-listener/pom.xml
+++ b/data-orchestrator/workflow-engine/mft-callback-listener/pom.xml
@@ -11,11 +11,6 @@
<artifactId>mft-callback-listener</artifactId>
- <properties>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.airavata.data.lake</groupId>
@@ -26,6 +21,16 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>${spring.boot.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-to-slf4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
diff --git a/data-orchestrator/workflow-engine/pom.xml b/data-orchestrator/workflow-engine/pom.xml
index 0d31898..a65d365 100644
--- a/data-orchestrator/workflow-engine/pom.xml
+++ b/data-orchestrator/workflow-engine/pom.xml
@@ -41,61 +41,4 @@
</modules>
<artifactId>workflow-engine</artifactId>
- <properties>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
- </properties>
-
- <dependencies>
-<!-- <dependency>-->
-<!-- <groupId>org.apache.helix</groupId>-->
-<!-- <artifactId>helix-core</artifactId>-->
-<!-- <version>0.9.7</version>-->
-<!-- <exclusions>-->
-<!-- <exclusion>-->
-<!-- <groupId>org.slf4j</groupId>-->
-<!-- <artifactId>slf4j-log4j12</artifactId>-->
-<!-- </exclusion>-->
-<!-- <exclusion>-->
-<!-- <groupId>log4j</groupId>-->
-<!-- <artifactId>log4j</artifactId>-->
-<!-- </exclusion>-->
-<!-- <exclusion>-->
-<!-- <groupId>com.google.guava</groupId>-->
-<!-- <artifactId>guava</artifactId>-->
-<!-- </exclusion>-->
-<!-- </exclusions>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>org.springframework.boot</groupId>-->
-<!-- <artifactId>spring-boot-starter</artifactId>-->
-<!-- <version>${spring.boot.version}</version>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>org.springframework.boot</groupId>-->
-<!-- <artifactId>spring-boot-starter-web</artifactId>-->
-<!-- <version>${spring.boot.version}</version>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>org.slf4j</groupId>-->
-<!-- <artifactId>log4j-over-slf4j</artifactId>-->
-<!-- <version>${log4j.over.slf4j}</version>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>org.yaml</groupId>-->
-<!-- <artifactId>snakeyaml</artifactId>-->
-<!-- <version>${yaml.version}</version>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>commons-beanutils</groupId>-->
-<!-- <artifactId>commons-beanutils</artifactId>-->
-<!-- <version>${commons.beanutils.version}</version>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>org.apache.kafka</groupId>-->
-<!-- <artifactId>kafka-clients</artifactId>-->
-<!-- <version>2.3.0</version>-->
-<!-- </dependency>-->
-
- </dependencies>
</project>
\ No newline at end of file
diff --git a/data-orchestrator/workflow-engine/workflow-engine-client/pom.xml b/data-orchestrator/workflow-engine/workflow-engine-client/pom.xml
index 76296e9..a11170e 100644
--- a/data-orchestrator/workflow-engine/workflow-engine-client/pom.xml
+++ b/data-orchestrator/workflow-engine/workflow-engine-client/pom.xml
@@ -12,11 +12,6 @@
<artifactId>workflow-engine-client</artifactId>
- <properties>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.airavata.data.lake</groupId>
diff --git a/data-orchestrator/workflow-engine/workflow-engine-controller/pom.xml b/data-orchestrator/workflow-engine/workflow-engine-controller/pom.xml
index eed6f5e..672a9a2 100644
--- a/data-orchestrator/workflow-engine/workflow-engine-controller/pom.xml
+++ b/data-orchestrator/workflow-engine/workflow-engine-controller/pom.xml
@@ -11,11 +11,6 @@
<artifactId>workflow-engine-controller</artifactId>
- <properties>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.airavata.data.lake</groupId>
@@ -26,6 +21,16 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
<version>${spring.boot.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-to-slf4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
diff --git a/data-orchestrator/workflow-engine/workflow-engine-controller/src/main/dist/bin/wf-controller-daemon.sh b/data-orchestrator/workflow-engine/workflow-engine-controller/src/main/dist/bin/wf-controller-daemon.sh
index 0ad0e3a..b73ecdb 100644
--- a/data-orchestrator/workflow-engine/workflow-engine-controller/src/main/dist/bin/wf-controller-daemon.sh
+++ b/data-orchestrator/workflow-engine/workflow-engine-controller/src/main/dist/bin/wf-controller-daemon.sh
@@ -23,7 +23,7 @@ CWD="$PWD"
cd ${AIRAVATA_HOME}/bin
LOGO_FILE="logo.txt"
-JAVA_OPTS="-Dspring.config.location=${AIRAVATA_HOME}/conf/ -Dairavata.home=${AIRAVATA_HOME} -Dlogback.configurationFile=file:${AIRAVATA_HOME}/conf/logback.xml"
+JAVA_OPTS="-Dspring.config.location=${AIRAVATA_HOME}/conf/ -Dairavata.home=${AIRAVATA_HOME} -Dlog4j.configurationFile=file:${AIRAVATA_HOME}/conf/log4j2.xml"
AIRAVATA_COMMAND=""
EXTRA_ARGS=""
SERVERS=""
diff --git a/data-orchestrator/workflow-engine/workflow-engine-controller/src/main/dist/bin/wf-controller.sh b/data-orchestrator/workflow-engine/workflow-engine-controller/src/main/dist/bin/wf-controller.sh
index eb9d8ed..c8b54a9 100644
--- a/data-orchestrator/workflow-engine/workflow-engine-controller/src/main/dist/bin/wf-controller.sh
+++ b/data-orchestrator/workflow-engine/workflow-engine-controller/src/main/dist/bin/wf-controller.sh
@@ -23,7 +23,7 @@ CWD="$PWD"
cd ${AIRAVATA_HOME}/bin
LOGO_FILE="logo.txt"
-JAVA_OPTS="-Dspring.config.location=${AIRAVATA_HOME}/conf/ -Dairavata.home=${AIRAVATA_HOME} -Dlogback.configurationFile=file:${AIRAVATA_HOME}/conf/logback.xml"
+JAVA_OPTS="-Dspring.config.location=${AIRAVATA_HOME}/conf/ -Dairavata.home=${AIRAVATA_HOME} -Dlog4j.configurationFile=file:${AIRAVATA_HOME}/conf/log4j2.xml"
AIRAVATA_COMMAND=""
EXTRA_ARGS=""
SERVERS=""
diff --git a/data-orchestrator/workflow-engine/workflow-engine-controller/src/main/dist/conf/log4j2.xml b/data-orchestrator/workflow-engine/workflow-engine-controller/src/main/dist/conf/log4j2.xml
new file mode 100644
index 0000000..066c238
--- /dev/null
+++ b/data-orchestrator/workflow-engine/workflow-engine-controller/src/main/dist/conf/log4j2.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<Configuration status="WARN">
+
+ <Appenders>
+ <Console name="Console" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d [%t] %-5p %c{30} %X - %m%n"/>
+ </Console>
+ <RollingFile name="RollingFileAppender" fileName="../logs/airavata.log"
+ filePattern="logs/${date:yyyy-MM}/airavata-log-%d{MM-dd-yyyy}-%i.log.gz">
+ <PatternLayout>
+ <Pattern>%d [%t] %-5p %c{30} %X - %m%n</Pattern>
+ </PatternLayout>
+ <Policies>
+ <OnStartupTriggeringPolicy />
+ <TimeBasedTriggeringPolicy />
+ <SizeBasedTriggeringPolicy size="50 MB" />
+ </Policies>
+ <DefaultRolloverStrategy max="20" />
+ </RollingFile>
+ </Appenders>
+ <Loggers>
+ <logger name="org.apache.helix" level="WARN"/>
+ <logger name="org.apache.zookeeper" level="ERROR"/>
+ <logger name="org.apache.airavata" level="INFO"/>
+ <logger name="org.hibernate" level="ERROR"/>
+ <Root level="INFO">
+ <AppenderRef ref="Console"/>
+ <AppenderRef ref="RollingFileAppender"/>
+ </Root>
+ </Loggers>
+</Configuration>
\ No newline at end of file
diff --git a/data-orchestrator/workflow-engine/workflow-engine-controller/src/main/dist/conf/logback.xml b/data-orchestrator/workflow-engine/workflow-engine-controller/src/main/dist/conf/logback.xml
deleted file mode 100644
index 3afe661..0000000
--- a/data-orchestrator/workflow-engine/workflow-engine-controller/src/main/dist/conf/logback.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<configuration>
-
- <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>%d [%t] %-5p %c{30} %m [%X]%n</pattern>
- </encoder>
- </appender>
-
- <appender name="LOGFILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <File>../logs/airavata.log</File>
- <Append>true</Append>
- <encoder>
- <pattern>%d [%t] %-5p %c{30} %m [%X]%n</pattern>
- </encoder>
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <fileNamePattern>../logs/airavata.log.%d{yyyy-MM-dd}</fileNamePattern>
- <maxHistory>30</maxHistory>
- <totalSizeCap>1GB</totalSizeCap>
- </rollingPolicy>
- </appender>
-
- <logger name="ch.qos.logback" level="WARN"/>
- <logger name="org.apache.helix" level="WARN"/>
- <logger name="org.apache.zookeeper" level="ERROR"/>
- <logger name="org.apache.helix" level="ERROR"/>
- <logger name="org.apache.airavata" level="INFO"/>
- <logger name="org.hibernate" level="ERROR"/>
- <logger name="net.schmizz.sshj" level="WARN"/>
- <root level="INFO">
- <appender-ref ref="CONSOLE"/>
- <appender-ref ref="LOGFILE"/>
- </root>
-</configuration>
\ No newline at end of file
diff --git a/data-orchestrator/workflow-engine/workflow-engine-controller/src/main/dist/wf-controller-assembly.xml b/data-orchestrator/workflow-engine/workflow-engine-controller/src/main/dist/wf-controller-assembly.xml
index 800ea0a..f54eb57 100644
--- a/data-orchestrator/workflow-engine/workflow-engine-controller/src/main/dist/wf-controller-assembly.xml
+++ b/data-orchestrator/workflow-engine/workflow-engine-controller/src/main/dist/wf-controller-assembly.xml
@@ -54,7 +54,7 @@
<outputDirectory>conf</outputDirectory>
<includes>
<include>application.properties</include>
- <include>logback.xml</include>
+ <include>log4j2.xml</include>
</includes>
</fileSet>
<fileSet>
diff --git a/data-orchestrator/workflow-engine/workflow-engine-controller/src/main/resources/log4j2.xml b/data-orchestrator/workflow-engine/workflow-engine-controller/src/main/resources/log4j2.xml
new file mode 100644
index 0000000..066c238
--- /dev/null
+++ b/data-orchestrator/workflow-engine/workflow-engine-controller/src/main/resources/log4j2.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<Configuration status="WARN">
+
+ <Appenders>
+ <Console name="Console" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d [%t] %-5p %c{30} %X - %m%n"/>
+ </Console>
+ <RollingFile name="RollingFileAppender" fileName="../logs/airavata.log"
+ filePattern="logs/${date:yyyy-MM}/airavata-log-%d{MM-dd-yyyy}-%i.log.gz">
+ <PatternLayout>
+ <Pattern>%d [%t] %-5p %c{30} %X - %m%n</Pattern>
+ </PatternLayout>
+ <Policies>
+ <OnStartupTriggeringPolicy />
+ <TimeBasedTriggeringPolicy />
+ <SizeBasedTriggeringPolicy size="50 MB" />
+ </Policies>
+ <DefaultRolloverStrategy max="20" />
+ </RollingFile>
+ </Appenders>
+ <Loggers>
+ <logger name="org.apache.helix" level="WARN"/>
+ <logger name="org.apache.zookeeper" level="ERROR"/>
+ <logger name="org.apache.airavata" level="INFO"/>
+ <logger name="org.hibernate" level="ERROR"/>
+ <Root level="INFO">
+ <AppenderRef ref="Console"/>
+ <AppenderRef ref="RollingFileAppender"/>
+ </Root>
+ </Loggers>
+</Configuration>
\ No newline at end of file
diff --git a/data-orchestrator/workflow-engine/workflow-engine-controller/src/main/resources/logback.xml b/data-orchestrator/workflow-engine/workflow-engine-controller/src/main/resources/logback.xml
deleted file mode 100644
index 3afe661..0000000
--- a/data-orchestrator/workflow-engine/workflow-engine-controller/src/main/resources/logback.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<configuration>
-
- <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>%d [%t] %-5p %c{30} %m [%X]%n</pattern>
- </encoder>
- </appender>
-
- <appender name="LOGFILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <File>../logs/airavata.log</File>
- <Append>true</Append>
- <encoder>
- <pattern>%d [%t] %-5p %c{30} %m [%X]%n</pattern>
- </encoder>
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <fileNamePattern>../logs/airavata.log.%d{yyyy-MM-dd}</fileNamePattern>
- <maxHistory>30</maxHistory>
- <totalSizeCap>1GB</totalSizeCap>
- </rollingPolicy>
- </appender>
-
- <logger name="ch.qos.logback" level="WARN"/>
- <logger name="org.apache.helix" level="WARN"/>
- <logger name="org.apache.zookeeper" level="ERROR"/>
- <logger name="org.apache.helix" level="ERROR"/>
- <logger name="org.apache.airavata" level="INFO"/>
- <logger name="org.hibernate" level="ERROR"/>
- <logger name="net.schmizz.sshj" level="WARN"/>
- <root level="INFO">
- <appender-ref ref="CONSOLE"/>
- <appender-ref ref="LOGFILE"/>
- </root>
-</configuration>
\ No newline at end of file
diff --git a/data-orchestrator/workflow-engine/workflow-engine-core/pom.xml b/data-orchestrator/workflow-engine/workflow-engine-core/pom.xml
index a88e162..f99f161 100644
--- a/data-orchestrator/workflow-engine/workflow-engine-core/pom.xml
+++ b/data-orchestrator/workflow-engine/workflow-engine-core/pom.xml
@@ -135,8 +135,4 @@
</dependency>
</dependencies>
- <properties>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
- </properties>
</project>
\ No newline at end of file
diff --git a/data-orchestrator/workflow-engine/workflow-engine-stubs/pom.xml b/data-orchestrator/workflow-engine/workflow-engine-stubs/pom.xml
index 134944a..01afa75 100644
--- a/data-orchestrator/workflow-engine/workflow-engine-stubs/pom.xml
+++ b/data-orchestrator/workflow-engine/workflow-engine-stubs/pom.xml
@@ -12,11 +12,6 @@
<artifactId>workflow-engine-stubs</artifactId>
- <properties>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
- </properties>
-
<dependencies>
<dependency>
diff --git a/data-orchestrator/workflow-engine/workflow-engine-worker/pom.xml b/data-orchestrator/workflow-engine/workflow-engine-worker/pom.xml
index c3420e3..44054b5 100644
--- a/data-orchestrator/workflow-engine/workflow-engine-worker/pom.xml
+++ b/data-orchestrator/workflow-engine/workflow-engine-worker/pom.xml
@@ -11,11 +11,6 @@
<artifactId>workflow-engine-worker</artifactId>
- <properties>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.airavata.data.lake</groupId>
diff --git a/data-orchestrator/workflow-engine/workflow-engine-worker/src/main/dist/bin/wf-worker-daemon.sh b/data-orchestrator/workflow-engine/workflow-engine-worker/src/main/dist/bin/wf-worker-daemon.sh
index 2340ef6..aa1db2a 100644
--- a/data-orchestrator/workflow-engine/workflow-engine-worker/src/main/dist/bin/wf-worker-daemon.sh
+++ b/data-orchestrator/workflow-engine/workflow-engine-worker/src/main/dist/bin/wf-worker-daemon.sh
@@ -23,7 +23,7 @@ CWD="$PWD"
cd ${AIRAVATA_HOME}/bin
LOGO_FILE="logo.txt"
-JAVA_OPTS="-Dspring.config.location=${AIRAVATA_HOME}/conf/ -Dairavata.home=${AIRAVATA_HOME} -Dlogback.configurationFile=file:${AIRAVATA_HOME}/conf/logback.xml"
+JAVA_OPTS="-Dspring.config.location=${AIRAVATA_HOME}/conf/ -Dairavata.home=${AIRAVATA_HOME} -Dlog4j.configurationFile=file:${AIRAVATA_HOME}/conf/log4j2.xml"
AIRAVATA_COMMAND=""
EXTRA_ARGS=""
SERVERS=""
diff --git a/data-orchestrator/workflow-engine/workflow-engine-worker/src/main/dist/bin/wf-worker.sh b/data-orchestrator/workflow-engine/workflow-engine-worker/src/main/dist/bin/wf-worker.sh
index b957b10..d0c56ef 100644
--- a/data-orchestrator/workflow-engine/workflow-engine-worker/src/main/dist/bin/wf-worker.sh
+++ b/data-orchestrator/workflow-engine/workflow-engine-worker/src/main/dist/bin/wf-worker.sh
@@ -23,7 +23,7 @@ CWD="$PWD"
cd ${AIRAVATA_HOME}/bin
LOGO_FILE="logo.txt"
-JAVA_OPTS="-Dspring.config.location=${AIRAVATA_HOME}/conf/ -Dairavata.home=${AIRAVATA_HOME} -Dlogback.configurationFile=file:${AIRAVATA_HOME}/conf/logback.xml"
+JAVA_OPTS="-Dspring.config.location=${AIRAVATA_HOME}/conf/ -Dairavata.home=${AIRAVATA_HOME} -Dlog4j.configurationFile=file:${AIRAVATA_HOME}/conf/log4j2.xml"
AIRAVATA_COMMAND=""
EXTRA_ARGS=""
SERVERS=""
diff --git a/data-orchestrator/workflow-engine/workflow-engine-worker/src/main/dist/conf/log4j2.xml b/data-orchestrator/workflow-engine/workflow-engine-worker/src/main/dist/conf/log4j2.xml
new file mode 100644
index 0000000..066c238
--- /dev/null
+++ b/data-orchestrator/workflow-engine/workflow-engine-worker/src/main/dist/conf/log4j2.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<Configuration status="WARN">
+
+ <Appenders>
+ <Console name="Console" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d [%t] %-5p %c{30} %X - %m%n"/>
+ </Console>
+ <RollingFile name="RollingFileAppender" fileName="../logs/airavata.log"
+ filePattern="logs/${date:yyyy-MM}/airavata-log-%d{MM-dd-yyyy}-%i.log.gz">
+ <PatternLayout>
+ <Pattern>%d [%t] %-5p %c{30} %X - %m%n</Pattern>
+ </PatternLayout>
+ <Policies>
+ <OnStartupTriggeringPolicy />
+ <TimeBasedTriggeringPolicy />
+ <SizeBasedTriggeringPolicy size="50 MB" />
+ </Policies>
+ <DefaultRolloverStrategy max="20" />
+ </RollingFile>
+ </Appenders>
+ <Loggers>
+ <logger name="org.apache.helix" level="WARN"/>
+ <logger name="org.apache.zookeeper" level="ERROR"/>
+ <logger name="org.apache.airavata" level="INFO"/>
+ <logger name="org.hibernate" level="ERROR"/>
+ <Root level="INFO">
+ <AppenderRef ref="Console"/>
+ <AppenderRef ref="RollingFileAppender"/>
+ </Root>
+ </Loggers>
+</Configuration>
\ No newline at end of file
diff --git a/data-orchestrator/workflow-engine/workflow-engine-worker/src/main/dist/conf/logback.xml b/data-orchestrator/workflow-engine/workflow-engine-worker/src/main/dist/conf/logback.xml
deleted file mode 100644
index 3afe661..0000000
--- a/data-orchestrator/workflow-engine/workflow-engine-worker/src/main/dist/conf/logback.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<configuration>
-
- <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>%d [%t] %-5p %c{30} %m [%X]%n</pattern>
- </encoder>
- </appender>
-
- <appender name="LOGFILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <File>../logs/airavata.log</File>
- <Append>true</Append>
- <encoder>
- <pattern>%d [%t] %-5p %c{30} %m [%X]%n</pattern>
- </encoder>
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <fileNamePattern>../logs/airavata.log.%d{yyyy-MM-dd}</fileNamePattern>
- <maxHistory>30</maxHistory>
- <totalSizeCap>1GB</totalSizeCap>
- </rollingPolicy>
- </appender>
-
- <logger name="ch.qos.logback" level="WARN"/>
- <logger name="org.apache.helix" level="WARN"/>
- <logger name="org.apache.zookeeper" level="ERROR"/>
- <logger name="org.apache.helix" level="ERROR"/>
- <logger name="org.apache.airavata" level="INFO"/>
- <logger name="org.hibernate" level="ERROR"/>
- <logger name="net.schmizz.sshj" level="WARN"/>
- <root level="INFO">
- <appender-ref ref="CONSOLE"/>
- <appender-ref ref="LOGFILE"/>
- </root>
-</configuration>
\ No newline at end of file
diff --git a/data-orchestrator/workflow-engine/workflow-engine-worker/src/main/dist/wf-worker-assembly.xml b/data-orchestrator/workflow-engine/workflow-engine-worker/src/main/dist/wf-worker-assembly.xml
index 77164c3..5b48202 100644
--- a/data-orchestrator/workflow-engine/workflow-engine-worker/src/main/dist/wf-worker-assembly.xml
+++ b/data-orchestrator/workflow-engine/workflow-engine-worker/src/main/dist/wf-worker-assembly.xml
@@ -54,7 +54,7 @@
<outputDirectory>conf</outputDirectory>
<includes>
<include>application.properties</include>
- <include>logback.xml</include>
+ <include>log4j2.xml</include>
</includes>
</fileSet>
<fileSet>
diff --git a/data-orchestrator/workflow-engine/workflow-engine-worker/src/main/resources/log4j2.xml b/data-orchestrator/workflow-engine/workflow-engine-worker/src/main/resources/log4j2.xml
new file mode 100644
index 0000000..066c238
--- /dev/null
+++ b/data-orchestrator/workflow-engine/workflow-engine-worker/src/main/resources/log4j2.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<Configuration status="WARN">
+
+ <Appenders>
+ <Console name="Console" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d [%t] %-5p %c{30} %X - %m%n"/>
+ </Console>
+ <RollingFile name="RollingFileAppender" fileName="../logs/airavata.log"
+ filePattern="logs/${date:yyyy-MM}/airavata-log-%d{MM-dd-yyyy}-%i.log.gz">
+ <PatternLayout>
+ <Pattern>%d [%t] %-5p %c{30} %X - %m%n</Pattern>
+ </PatternLayout>
+ <Policies>
+ <OnStartupTriggeringPolicy />
+ <TimeBasedTriggeringPolicy />
+ <SizeBasedTriggeringPolicy size="50 MB" />
+ </Policies>
+ <DefaultRolloverStrategy max="20" />
+ </RollingFile>
+ </Appenders>
+ <Loggers>
+ <logger name="org.apache.helix" level="WARN"/>
+ <logger name="org.apache.zookeeper" level="ERROR"/>
+ <logger name="org.apache.airavata" level="INFO"/>
+ <logger name="org.hibernate" level="ERROR"/>
+ <Root level="INFO">
+ <AppenderRef ref="Console"/>
+ <AppenderRef ref="RollingFileAppender"/>
+ </Root>
+ </Loggers>
+</Configuration>
\ No newline at end of file
diff --git a/data-orchestrator/workflow-engine/workflow-engine-worker/src/main/resources/logback.xml b/data-orchestrator/workflow-engine/workflow-engine-worker/src/main/resources/logback.xml
deleted file mode 100644
index 3afe661..0000000
--- a/data-orchestrator/workflow-engine/workflow-engine-worker/src/main/resources/logback.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<configuration>
-
- <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>%d [%t] %-5p %c{30} %m [%X]%n</pattern>
- </encoder>
- </appender>
-
- <appender name="LOGFILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <File>../logs/airavata.log</File>
- <Append>true</Append>
- <encoder>
- <pattern>%d [%t] %-5p %c{30} %m [%X]%n</pattern>
- </encoder>
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <fileNamePattern>../logs/airavata.log.%d{yyyy-MM-dd}</fileNamePattern>
- <maxHistory>30</maxHistory>
- <totalSizeCap>1GB</totalSizeCap>
- </rollingPolicy>
- </appender>
-
- <logger name="ch.qos.logback" level="WARN"/>
- <logger name="org.apache.helix" level="WARN"/>
- <logger name="org.apache.zookeeper" level="ERROR"/>
- <logger name="org.apache.helix" level="ERROR"/>
- <logger name="org.apache.airavata" level="INFO"/>
- <logger name="org.hibernate" level="ERROR"/>
- <logger name="net.schmizz.sshj" level="WARN"/>
- <root level="INFO">
- <appender-ref ref="CONSOLE"/>
- <appender-ref ref="LOGFILE"/>
- </root>
-</configuration>
\ No newline at end of file
diff --git a/data-resource-management-service/drms-api/pom.xml b/data-resource-management-service/drms-api/pom.xml
index 832de3e..fc5dbea 100644
--- a/data-resource-management-service/drms-api/pom.xml
+++ b/data-resource-management-service/drms-api/pom.xml
@@ -59,7 +59,11 @@
<version>${spring.boot.data.jpa}</version>
<exclusions>
<exclusion>
- <groupId>org.apache.logging.log4j</groupId>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
</exclusion>
</exclusions>
diff --git a/data-resource-management-service/drms-api/src/main/dist/bin/drms-daemon.sh b/data-resource-management-service/drms-api/src/main/dist/bin/drms-daemon.sh
index 408787e..dfe8eac 100644
--- a/data-resource-management-service/drms-api/src/main/dist/bin/drms-daemon.sh
+++ b/data-resource-management-service/drms-api/src/main/dist/bin/drms-daemon.sh
@@ -23,7 +23,7 @@ CWD="$PWD"
cd ${AIRAVATA_HOME}/bin
LOGO_FILE="logo.txt"
-JAVA_OPTS="-Dspring.config.location=${AIRAVATA_HOME}/conf/ -Dairavata.home=${AIRAVATA_HOME} -Dlogback.configurationFile=file:${AIRAVATA_HOME}/conf/logback.xml"
+JAVA_OPTS="-Dspring.config.location=${AIRAVATA_HOME}/conf/ -Dairavata.home=${AIRAVATA_HOME} -Dlog4j.configurationFile=file:${AIRAVATA_HOME}/conf/log4j2.xml"
AIRAVATA_COMMAND=""
EXTRA_ARGS=""
SERVERS=""
diff --git a/data-resource-management-service/drms-api/src/main/dist/bin/drms.sh b/data-resource-management-service/drms-api/src/main/dist/bin/drms.sh
index 9033efb..4557340 100644
--- a/data-resource-management-service/drms-api/src/main/dist/bin/drms.sh
+++ b/data-resource-management-service/drms-api/src/main/dist/bin/drms.sh
@@ -23,7 +23,7 @@ CWD="$PWD"
cd ${AIRAVATA_HOME}/bin
LOGO_FILE="logo.txt"
-JAVA_OPTS="-Dspring.config.location=${AIRAVATA_HOME}/conf/ -Dairavata.home=${AIRAVATA_HOME} -Dlogback.configurationFile=file:${AIRAVATA_HOME}/conf/logback.xml"
+JAVA_OPTS="-Dspring.config.location=${AIRAVATA_HOME}/conf/ -Dairavata.home=${AIRAVATA_HOME} -Dlog4j.configurationFile=file:${AIRAVATA_HOME}/conf/log4j2.xml"
AIRAVATA_COMMAND=""
EXTRA_ARGS=""
SERVERS=""
diff --git a/data-resource-management-service/drms-api/src/main/dist/conf/log4j2.xml b/data-resource-management-service/drms-api/src/main/dist/conf/log4j2.xml
new file mode 100644
index 0000000..066c238
--- /dev/null
+++ b/data-resource-management-service/drms-api/src/main/dist/conf/log4j2.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<Configuration status="WARN">
+
+ <Appenders>
+ <Console name="Console" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d [%t] %-5p %c{30} %X - %m%n"/>
+ </Console>
+ <RollingFile name="RollingFileAppender" fileName="../logs/airavata.log"
+ filePattern="logs/${date:yyyy-MM}/airavata-log-%d{MM-dd-yyyy}-%i.log.gz">
+ <PatternLayout>
+ <Pattern>%d [%t] %-5p %c{30} %X - %m%n</Pattern>
+ </PatternLayout>
+ <Policies>
+ <OnStartupTriggeringPolicy />
+ <TimeBasedTriggeringPolicy />
+ <SizeBasedTriggeringPolicy size="50 MB" />
+ </Policies>
+ <DefaultRolloverStrategy max="20" />
+ </RollingFile>
+ </Appenders>
+ <Loggers>
+ <logger name="org.apache.helix" level="WARN"/>
+ <logger name="org.apache.zookeeper" level="ERROR"/>
+ <logger name="org.apache.airavata" level="INFO"/>
+ <logger name="org.hibernate" level="ERROR"/>
+ <Root level="INFO">
+ <AppenderRef ref="Console"/>
+ <AppenderRef ref="RollingFileAppender"/>
+ </Root>
+ </Loggers>
+</Configuration>
\ No newline at end of file
diff --git a/data-resource-management-service/drms-api/src/main/dist/conf/logback.xml b/data-resource-management-service/drms-api/src/main/dist/conf/logback.xml
deleted file mode 100644
index dcf6d23..0000000
--- a/data-resource-management-service/drms-api/src/main/dist/conf/logback.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<configuration>
-
- <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>%d [%t] %-5p %c{30} %m [%X]%n</pattern>
- </encoder>
- </appender>
-
- <appender name="LOGFILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <File>../logs/airavata.log</File>
- <Append>true</Append>
- <encoder>
- <pattern>%d [%t] %-5p %c{30} %m [%X]%n</pattern>
- </encoder>
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <fileNamePattern>../logs/airavata.log.%d{yyyy-MM-dd}</fileNamePattern>
- <maxHistory>30</maxHistory>
- <totalSizeCap>1GB</totalSizeCap>
- </rollingPolicy>
- </appender>
-
- <logger name="ch.qos.logback" level="WARN"/>
- <logger name="org.apache.airavata" level="INFO"/>
- <root level="INFO">
- <appender-ref ref="CONSOLE"/>
- <appender-ref ref="LOGFILE"/>
- </root>
-</configuration>
\ No newline at end of file
diff --git a/data-resource-management-service/drms-api/src/main/dist/drms-assembly.xml b/data-resource-management-service/drms-api/src/main/dist/drms-assembly.xml
index 643e574..b5e350f 100644
--- a/data-resource-management-service/drms-api/src/main/dist/drms-assembly.xml
+++ b/data-resource-management-service/drms-api/src/main/dist/drms-assembly.xml
@@ -54,7 +54,7 @@
<outputDirectory>conf</outputDirectory>
<includes>
<include>application.properties</include>
- <include>logback.xml</include>
+ <include>log4j2.xml</include>
</includes>
</fileSet>
<fileSet>
diff --git a/data-resource-management-service/drms-api/src/main/resources/log4j2.xml b/data-resource-management-service/drms-api/src/main/resources/log4j2.xml
new file mode 100644
index 0000000..066c238
--- /dev/null
+++ b/data-resource-management-service/drms-api/src/main/resources/log4j2.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<Configuration status="WARN">
+
+ <Appenders>
+ <Console name="Console" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d [%t] %-5p %c{30} %X - %m%n"/>
+ </Console>
+ <RollingFile name="RollingFileAppender" fileName="../logs/airavata.log"
+ filePattern="logs/${date:yyyy-MM}/airavata-log-%d{MM-dd-yyyy}-%i.log.gz">
+ <PatternLayout>
+ <Pattern>%d [%t] %-5p %c{30} %X - %m%n</Pattern>
+ </PatternLayout>
+ <Policies>
+ <OnStartupTriggeringPolicy />
+ <TimeBasedTriggeringPolicy />
+ <SizeBasedTriggeringPolicy size="50 MB" />
+ </Policies>
+ <DefaultRolloverStrategy max="20" />
+ </RollingFile>
+ </Appenders>
+ <Loggers>
+ <logger name="org.apache.helix" level="WARN"/>
+ <logger name="org.apache.zookeeper" level="ERROR"/>
+ <logger name="org.apache.airavata" level="INFO"/>
+ <logger name="org.hibernate" level="ERROR"/>
+ <Root level="INFO">
+ <AppenderRef ref="Console"/>
+ <AppenderRef ref="RollingFileAppender"/>
+ </Root>
+ </Loggers>
+</Configuration>
\ No newline at end of file
diff --git a/data-resource-management-service/drms-api/src/main/resources/logback.xml b/data-resource-management-service/drms-api/src/main/resources/logback.xml
deleted file mode 100644
index dcf6d23..0000000
--- a/data-resource-management-service/drms-api/src/main/resources/logback.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<configuration>
-
- <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>%d [%t] %-5p %c{30} %m [%X]%n</pattern>
- </encoder>
- </appender>
-
- <appender name="LOGFILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <File>../logs/airavata.log</File>
- <Append>true</Append>
- <encoder>
- <pattern>%d [%t] %-5p %c{30} %m [%X]%n</pattern>
- </encoder>
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <fileNamePattern>../logs/airavata.log.%d{yyyy-MM-dd}</fileNamePattern>
- <maxHistory>30</maxHistory>
- <totalSizeCap>1GB</totalSizeCap>
- </rollingPolicy>
- </appender>
-
- <logger name="ch.qos.logback" level="WARN"/>
- <logger name="org.apache.airavata" level="INFO"/>
- <root level="INFO">
- <appender-ref ref="CONSOLE"/>
- <appender-ref ref="LOGFILE"/>
- </root>
-</configuration>
\ No newline at end of file
diff --git a/data-resource-management-service/drms-core/pom.xml b/data-resource-management-service/drms-core/pom.xml
index 152bdf8..dfa25dc 100644
--- a/data-resource-management-service/drms-core/pom.xml
+++ b/data-resource-management-service/drms-core/pom.xml
@@ -57,6 +57,16 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
<version>${spring.boot.data.jpa}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-to-slf4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
diff --git a/data-resource-management-service/drms-custos-synchronizer/pom.xml b/data-resource-management-service/drms-custos-synchronizer/pom.xml
index 2fafaf6..d501f20 100644
--- a/data-resource-management-service/drms-custos-synchronizer/pom.xml
+++ b/data-resource-management-service/drms-custos-synchronizer/pom.xml
@@ -10,10 +10,6 @@
</parent>
<artifactId>drms-custos-synchronizer</artifactId>
- <properties>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
- </properties>
<dependencies>
<dependency>
@@ -35,6 +31,16 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
<version>${spring.boot.data.jpa}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-to-slf4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -92,17 +98,6 @@
<artifactId>kafka-clients</artifactId>
<version>${kafka-clients.version}</version>
</dependency>
-<!-- <dependency>-->
-<!-- <groupId>org.slf4j</groupId>-->
-<!-- <artifactId>slf4j-api</artifactId>-->
-<!-- <version>1.7.26</version>-->
-<!-- </dependency>-->
-
-<!-- <dependency>-->
-<!-- <groupId>ch.qos.logback</groupId>-->
-<!-- <artifactId>logback-classic</artifactId>-->
-<!-- <version>1.3.0-alpha5</version>-->
-<!-- </dependency>-->
</dependencies>
<build>
diff --git a/data-resource-management-service/drms-custos-synchronizer/src/main/dist/bin/drms-custos-synchronizer-daemon.sh b/data-resource-management-service/drms-custos-synchronizer/src/main/dist/bin/drms-custos-synchronizer-daemon.sh
index ec5c564..6f87717 100644
--- a/data-resource-management-service/drms-custos-synchronizer/src/main/dist/bin/drms-custos-synchronizer-daemon.sh
+++ b/data-resource-management-service/drms-custos-synchronizer/src/main/dist/bin/drms-custos-synchronizer-daemon.sh
@@ -23,7 +23,7 @@ CWD="$PWD"
cd ${AIRAVATA_HOME}/bin
LOGO_FILE="logo.txt"
-JAVA_OPTS="-Dspring.config.location=${AIRAVATA_HOME}/conf/ -Dairavata.home=${AIRAVATA_HOME} -Dlogback.configurationFile=file:${AIRAVATA_HOME}/conf/logback.xml"
+JAVA_OPTS="-Dspring.config.location=${AIRAVATA_HOME}/conf/ -Dairavata.home=${AIRAVATA_HOME} -Dlog4j.configurationFile=file:${AIRAVATA_HOME}/conf/log4j2.xml"
AIRAVATA_COMMAND=""
EXTRA_ARGS=""
SERVERS=""
diff --git a/data-resource-management-service/drms-custos-synchronizer/src/main/dist/bin/drms-custos-synchronizer.sh b/data-resource-management-service/drms-custos-synchronizer/src/main/dist/bin/drms-custos-synchronizer.sh
index c7d827e..ae4ca67 100644
--- a/data-resource-management-service/drms-custos-synchronizer/src/main/dist/bin/drms-custos-synchronizer.sh
+++ b/data-resource-management-service/drms-custos-synchronizer/src/main/dist/bin/drms-custos-synchronizer.sh
@@ -23,7 +23,7 @@ CWD="$PWD"
cd ${AIRAVATA_HOME}/bin
LOGO_FILE="logo.txt"
-JAVA_OPTS="-Dspring.config.location=${AIRAVATA_HOME}/conf/ -Dairavata.home=${AIRAVATA_HOME} -Dlogback.configurationFile=file:${AIRAVATA_HOME}/conf/logback.xml"
+JAVA_OPTS="-Dspring.config.location=${AIRAVATA_HOME}/conf/ -Dairavata.home=${AIRAVATA_HOME} -Dlog4j.configurationFile=file:${AIRAVATA_HOME}/conf/log4j2.xml"
AIRAVATA_COMMAND=""
EXTRA_ARGS=""
SERVERS=""
diff --git a/data-resource-management-service/drms-custos-synchronizer/src/main/dist/conf/log4j2.xml b/data-resource-management-service/drms-custos-synchronizer/src/main/dist/conf/log4j2.xml
new file mode 100644
index 0000000..066c238
--- /dev/null
+++ b/data-resource-management-service/drms-custos-synchronizer/src/main/dist/conf/log4j2.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<Configuration status="WARN">
+
+ <Appenders>
+ <Console name="Console" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d [%t] %-5p %c{30} %X - %m%n"/>
+ </Console>
+ <RollingFile name="RollingFileAppender" fileName="../logs/airavata.log"
+ filePattern="logs/${date:yyyy-MM}/airavata-log-%d{MM-dd-yyyy}-%i.log.gz">
+ <PatternLayout>
+ <Pattern>%d [%t] %-5p %c{30} %X - %m%n</Pattern>
+ </PatternLayout>
+ <Policies>
+ <OnStartupTriggeringPolicy />
+ <TimeBasedTriggeringPolicy />
+ <SizeBasedTriggeringPolicy size="50 MB" />
+ </Policies>
+ <DefaultRolloverStrategy max="20" />
+ </RollingFile>
+ </Appenders>
+ <Loggers>
+ <logger name="org.apache.helix" level="WARN"/>
+ <logger name="org.apache.zookeeper" level="ERROR"/>
+ <logger name="org.apache.airavata" level="INFO"/>
+ <logger name="org.hibernate" level="ERROR"/>
+ <Root level="INFO">
+ <AppenderRef ref="Console"/>
+ <AppenderRef ref="RollingFileAppender"/>
+ </Root>
+ </Loggers>
+</Configuration>
\ No newline at end of file
diff --git a/data-resource-management-service/drms-custos-synchronizer/src/main/dist/conf/logback.xml b/data-resource-management-service/drms-custos-synchronizer/src/main/dist/conf/logback.xml
deleted file mode 100644
index f4ac5de..0000000
--- a/data-resource-management-service/drms-custos-synchronizer/src/main/dist/conf/logback.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<configuration debug="true">
-
- <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>%d [%t] %-5p %c{30} %m [%X]%n</pattern>
- </encoder>
- </appender>
-
- <appender name="LOGFILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <File>../logs/custos_synchronizer.log</File>
- <Append>true</Append>
- <encoder>
- <pattern>%d [%t] %-5p %c{30} %m [%X]%n</pattern>
- </encoder>
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <fileNamePattern>../logs/custos_synchronizer.log.%d{yyyy-MM-dd}</fileNamePattern>
- <maxHistory>30</maxHistory>
- <totalSizeCap>1GB</totalSizeCap>
- </rollingPolicy>
- </appender>
-
- <logger name="ch.qos.logback" level="WARN"/>
- <logger name="org.apache.airavata" level="INFO"/>
- <root level="INFO">
- <appender-ref ref="CONSOLE"/>
- <appender-ref ref="LOGFILE"/>
- </root>
-</configuration>
\ No newline at end of file
diff --git a/data-resource-management-service/drms-custos-synchronizer/src/main/dist/drms-custos-synchronizer-assembly.xml b/data-resource-management-service/drms-custos-synchronizer/src/main/dist/drms-custos-synchronizer-assembly.xml
index 8dba6bc..4195fd6 100644
--- a/data-resource-management-service/drms-custos-synchronizer/src/main/dist/drms-custos-synchronizer-assembly.xml
+++ b/data-resource-management-service/drms-custos-synchronizer/src/main/dist/drms-custos-synchronizer-assembly.xml
@@ -54,7 +54,7 @@
<outputDirectory>conf</outputDirectory>
<includes>
<include>application.properties</include>
- <include>logback.xml</include>
+ <include>log4j2.xml</include>
<include>config.yml</include>
</includes>
</fileSet>
diff --git a/data-resource-management-service/drms-custos-synchronizer/src/main/resources/log4j2.xml b/data-resource-management-service/drms-custos-synchronizer/src/main/resources/log4j2.xml
new file mode 100644
index 0000000..066c238
--- /dev/null
+++ b/data-resource-management-service/drms-custos-synchronizer/src/main/resources/log4j2.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<Configuration status="WARN">
+
+ <Appenders>
+ <Console name="Console" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d [%t] %-5p %c{30} %X - %m%n"/>
+ </Console>
+ <RollingFile name="RollingFileAppender" fileName="../logs/airavata.log"
+ filePattern="logs/${date:yyyy-MM}/airavata-log-%d{MM-dd-yyyy}-%i.log.gz">
+ <PatternLayout>
+ <Pattern>%d [%t] %-5p %c{30} %X - %m%n</Pattern>
+ </PatternLayout>
+ <Policies>
+ <OnStartupTriggeringPolicy />
+ <TimeBasedTriggeringPolicy />
+ <SizeBasedTriggeringPolicy size="50 MB" />
+ </Policies>
+ <DefaultRolloverStrategy max="20" />
+ </RollingFile>
+ </Appenders>
+ <Loggers>
+ <logger name="org.apache.helix" level="WARN"/>
+ <logger name="org.apache.zookeeper" level="ERROR"/>
+ <logger name="org.apache.airavata" level="INFO"/>
+ <logger name="org.hibernate" level="ERROR"/>
+ <Root level="INFO">
+ <AppenderRef ref="Console"/>
+ <AppenderRef ref="RollingFileAppender"/>
+ </Root>
+ </Loggers>
+</Configuration>
\ No newline at end of file
diff --git a/data-resource-management-service/drms-custos-synchronizer/src/main/resources/logback.xml b/data-resource-management-service/drms-custos-synchronizer/src/main/resources/logback.xml
deleted file mode 100644
index f4ac5de..0000000
--- a/data-resource-management-service/drms-custos-synchronizer/src/main/resources/logback.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<configuration debug="true">
-
- <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>%d [%t] %-5p %c{30} %m [%X]%n</pattern>
- </encoder>
- </appender>
-
- <appender name="LOGFILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <File>../logs/custos_synchronizer.log</File>
- <Append>true</Append>
- <encoder>
- <pattern>%d [%t] %-5p %c{30} %m [%X]%n</pattern>
- </encoder>
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <fileNamePattern>../logs/custos_synchronizer.log.%d{yyyy-MM-dd}</fileNamePattern>
- <maxHistory>30</maxHistory>
- <totalSizeCap>1GB</totalSizeCap>
- </rollingPolicy>
- </appender>
-
- <logger name="ch.qos.logback" level="WARN"/>
- <logger name="org.apache.airavata" level="INFO"/>
- <root level="INFO">
- <appender-ref ref="CONSOLE"/>
- <appender-ref ref="LOGFILE"/>
- </root>
-</configuration>
\ No newline at end of file
diff --git a/data-resource-management-service/pom.xml b/data-resource-management-service/pom.xml
index f8eb041..757bdd8 100644
--- a/data-resource-management-service/pom.xml
+++ b/data-resource-management-service/pom.xml
@@ -33,14 +33,4 @@
<module>drms-api</module>
<module>drms-custos-synchronizer</module>
</modules>
-
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>${log4j.over.slf4j}</version>
- </dependency>
- </dependencies>
-
-
</project>
\ No newline at end of file
diff --git a/datalake-rest-proxy/pom.xml b/datalake-rest-proxy/pom.xml
index cd2339f..d5e72fc 100644
--- a/datalake-rest-proxy/pom.xml
+++ b/datalake-rest-proxy/pom.xml
@@ -8,9 +8,4 @@
<artifactId>drms-rest-proxy</artifactId>
<version>1.0-SNAPSHOT</version>
- <properties>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
- </properties>
-
</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 24676ba..f45dfea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,10 +57,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.6.1</version>
+ <version>${maven.compiler.plugin}</version>
<configuration>
<source>11</source>
<target>11</target>
+ <compilerVersion>11</compilerVersion>
<fork>true</fork>
</configuration>
</plugin>
@@ -68,24 +69,48 @@
</build>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${org.slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>${log4j2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <version>${log4j2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-1.2-api</artifactId>
+ <version>${log4j2.version}</version>
+ </dependency>
+ </dependencies>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<org.slf4j.version>1.7.25</org.slf4j.version>
- <log4j.version>1.2.17</log4j.version>
+ <log4j2.version>2.16.0</log4j2.version>
<thrift.version>0.12.0</thrift.version>
<openjpa.version>2.4.3</openjpa.version>
<mysql.connector.version>5.1.34</mysql.connector.version>
<maven.assembly.plugin>3.3.0</maven.assembly.plugin>
<junit.version>4.8.1</junit.version>
<jmockit.version>1.8</jmockit.version>
- <java.version>11</java.version>
<javax.annotation.version>1.3.2</javax.annotation.version>
<maven.compiler.plugin>3.8.1</maven.compiler.plugin>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
<protobuf.maven.plugin>0.5.1</protobuf.maven.plugin>
<os.maven.plugin>1.5.0.Final</os.maven.plugin>