Alon Bar-Lev has uploaded a new change for review.
Change subject: packaging: remove log4j usage
......................................................................
packaging: remove log4j usage
Change-Id: Id5b4dbe479eb494aa32a52212c63a311381b5a60
Signed-off-by: Alon Bar-Lev <alon.bar...@gmail.com>
---
M data-warehouse/history_etl/etl_sources/advancedPersistentLookupLib/pom.xml
M data-warehouse/history_etl/etl_sources/packaging/pom.xml
M data-warehouse/history_etl/history_service/history_service.sh
M packaging/ovirt-engine-dwh.spec.in
M pom.xml
5 files changed, 1 insertion(+), 13 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-dwh refs/changes/66/22566/1
diff --git
a/data-warehouse/history_etl/etl_sources/advancedPersistentLookupLib/pom.xml
b/data-warehouse/history_etl/etl_sources/advancedPersistentLookupLib/pom.xml
index b459b1e..1e5db6b 100644
--- a/data-warehouse/history_etl/etl_sources/advancedPersistentLookupLib/pom.xml
+++ b/data-warehouse/history_etl/etl_sources/advancedPersistentLookupLib/pom.xml
@@ -16,11 +16,6 @@
<description>The jar that contains the advanced persistent lookup
library</description>
<dependencies>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${version.log4j}</version>
- </dependency>
<dependency>
<groupId>commons-collections</groupId>
diff --git a/data-warehouse/history_etl/etl_sources/packaging/pom.xml
b/data-warehouse/history_etl/etl_sources/packaging/pom.xml
index 90b4ec0..28a48d4 100644
--- a/data-warehouse/history_etl/etl_sources/packaging/pom.xml
+++ b/data-warehouse/history_etl/etl_sources/packaging/pom.xml
@@ -137,10 +137,6 @@
</exec>
<exec executable="/bin/bash">
<arg value="-c"/>
- <arg value="ln -s
${deployment.etl.lib.dir}/log4j-${version.log4j}.jar
${deployment.etl.lib.dir}/log4j.jar"/>
- </exec>
- <exec executable="/bin/bash">
- <arg value="-c"/>
<arg value="ln -s
${deployment.etl.lib.dir}/commons-collections-${version.commons-collections}.jar
${deployment.etl.lib.dir}/commons-collections.jar"/>
</exec>
<echo>*** To complete the deployment please run
root_etl_deploy.sh...</echo>
diff --git a/data-warehouse/history_etl/history_service/history_service.sh
b/data-warehouse/history_etl/history_service/history_service.sh
index ba45c46..1842ae8 100755
--- a/data-warehouse/history_etl/history_service/history_service.sh
+++ b/data-warehouse/history_etl/history_service/history_service.sh
@@ -12,7 +12,7 @@
JAVA_DIR=/usr/share/java
JAVA_HOME=$(/usr/share/ovirt-engine/bin/java-home)
RUN_PROPERTIES="-Xms256M -Xmx1024M"
-CP=$ETL_HOME:$JAVA_DIR/ovirt-engine-dwh/historyETLProcedure.jar:$JAVA_DIR/ovirt-engine-dwh/advancedPersistentLookupLib.jar:$JAVA_DIR/ovirt-engine-dwh/talendRoutines.jar:$JAVA_DIR/dom4j.jar:$JAVA_DIR/commons-collections.jar:$JAVA_DIR/log4j.jar:$JAVA_DIR/postgresql-jdbc.jar
+CP=$ETL_HOME:$JAVA_DIR/ovirt-engine-dwh/historyETLProcedure.jar:$JAVA_DIR/ovirt-engine-dwh/advancedPersistentLookupLib.jar:$JAVA_DIR/ovirt-engine-dwh/talendRoutines.jar:$JAVA_DIR/dom4j.jar:$JAVA_DIR/commons-collections.jar:$JAVA_DIR/postgresql-jdbc.jar
exec ${JAVA_HOME}/bin/java $RUN_PROPERTIES -cp $CP
ovirt_engine_dwh.historyetl_3_3.HistoryETL --context=Default $* >> $LOGFILE
2>&1 &
echo $! >$ETL_PID
diff --git a/packaging/ovirt-engine-dwh.spec.in
b/packaging/ovirt-engine-dwh.spec.in
index b16b06c..de68739 100644
--- a/packaging/ovirt-engine-dwh.spec.in
+++ b/packaging/ovirt-engine-dwh.spec.in
@@ -43,13 +43,11 @@
BuildRequires: maven-antrun-plugin
BuildRequires: maven-compiler-plugin
BuildRequires: apache-commons-collections
-BuildRequires: log4j
BuildRequires: postgresql-jdbc
Requires: python
Requires: java-1.7.0-openjdk
Requires: jpackage-utils
Requires: apache-commons-collections >= 3.2
-Requires: log4j
Requires: dom4j >= 1.6.1
Requires: postgresql-jdbc
Requires: postgresql-server >= 8.4.7
diff --git a/pom.xml b/pom.xml
index 82c464a..9ec5357 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,6 @@
<!-- dependency versions -->
<ovirt-dwh.version>3.3.0</ovirt-dwh.version>
<version.commons-collections>3.2.1</version.commons-collections>
- <version.log4j>1.2.14</version.log4j>
<version.dom4j>1.6.1</version.dom4j>
<version.postgresql-jdbc>9.1-901-1.jdbc4</version.postgresql-jdbc>
<version.dependency-plugin>2.4</version.dependency-plugin>
--
To view, visit http://gerrit.ovirt.org/22566
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id5b4dbe479eb494aa32a52212c63a311381b5a60
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-dwh
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
