This is an automated email from the ASF dual-hosted git repository.
madhan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/atlas.git
The following commit(s) were added to refs/heads/master by this push:
new 5b3da22 ATLAS-3427: fixed duplicate log4j.version definition in pom -
#2
5b3da22 is described below
commit 5b3da223ffa611a66e6fd3ade2cb2d5a2345c733
Author: Madhan Neethiraj <[email protected]>
AuthorDate: Fri Oct 23 13:46:45 2020 -0700
ATLAS-3427: fixed duplicate log4j.version definition in pom - #2
---
addons/hbase-bridge/pom.xml | 4 ++--
addons/hive-bridge/pom.xml | 4 ++--
addons/impala-bridge/pom.xml | 14 ++++----------
notification/pom.xml | 6 +++---
pom.xml | 4 ++--
5 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/addons/hbase-bridge/pom.xml b/addons/hbase-bridge/pom.xml
index 46d2458..9940813 100644
--- a/addons/hbase-bridge/pom.xml
+++ b/addons/hbase-bridge/pom.xml
@@ -444,12 +444,12 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
- <version>2.8</version>
+ <version>${apache.log4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
- <version>2.8</version>
+ <version>${apache.log4j.version}</version>
</dependency>
</dependencies>
<executions>
diff --git a/addons/hive-bridge/pom.xml b/addons/hive-bridge/pom.xml
index 54a6d8e..82412ab 100755
--- a/addons/hive-bridge/pom.xml
+++ b/addons/hive-bridge/pom.xml
@@ -409,12 +409,12 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
- <version>2.8</version>
+ <version>${apache.log4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
- <version>2.8</version>
+ <version>${apache.log4j.version}</version>
</dependency>
</dependencies>
<executions>
diff --git a/addons/impala-bridge/pom.xml b/addons/impala-bridge/pom.xml
index 14150dd..60892c5 100644
--- a/addons/impala-bridge/pom.xml
+++ b/addons/impala-bridge/pom.xml
@@ -30,12 +30,6 @@
<name>Apache Atlas Impala Bridge</name>
<packaging>jar</packaging>
- <properties>
- <!-- log4j 2.9 and later are multi-release jars for Java 9. Our Jetty
version don't support
- that. Therefore, we have to use log4j 2.8 in integration test -->
- <log4j.version>2.8</log4j.version>
- </properties>
-
<dependencies>
<!-- Logging -->
<dependency>
@@ -68,13 +62,13 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
- <version>${log4j.version}</version>
+ <version>${apache.log4j.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
- <version>${log4j.version}</version>
+ <version>${apache.log4j.version}</version>
<scope>test</scope>
</dependency>
@@ -436,12 +430,12 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
- <version>${log4j.version}</version>
+ <version>${apache.log4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
- <version>${log4j.version}</version>
+ <version>${apache.log4j.version}</version>
</dependency>
</dependencies>
<executions>
diff --git a/notification/pom.xml b/notification/pom.xml
index 740e8e5..468cd87 100644
--- a/notification/pom.xml
+++ b/notification/pom.xml
@@ -58,13 +58,13 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
- <version>${log4j.version}</version>
+ <version>${apache.log4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
- <version>${log4j.version}</version>
+ <version>${apache.log4j.version}</version>
</dependency>
<dependency>
@@ -166,7 +166,7 @@
<artifactItem>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.17</version>
+ <version>${log4j.version}</version>
</artifactItem>
<artifactItem>
<groupId>org.apache.kafka</groupId>
diff --git a/pom.xml b/pom.xml
index d6cd6de..f23a0d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -699,7 +699,7 @@
<javax.servlet.version>3.1.0</javax.servlet.version>
<guava.version>25.1-jre</guava.version>
<antlr4.version>4.7</antlr4.version>
- <log4j.version>2.8</log4j.version>
+ <apache.log4j.version>2.8</apache.log4j.version>
<!-- Needed for hooks -->
<aopalliance.version>1.0</aopalliance.version>
@@ -929,7 +929,7 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.17</version>
+ <version>${log4j.version}</version>
<scope>compile</scope>
<exclusions>
<exclusion>
