Alon Bar-Lev has uploaded a new change for review.
Change subject: packaging: spec: use system jars
......................................................................
packaging: spec: use system jars
PACKAGE POM FC19 EL6
apache-commons-compress 1.4.1 1.5-1 N/A
apache-commons-configuration 1.6 1.9-4 N/A
postgresql-jdbc 9.1-901-1.jdbc4 9.2.1002-2 8.4.701-8(*)
slf4j 1.5.6 1.7.4-1 1.5.8-8
spring-asm 3.1.1 N/A N/A
objectweb-asm N/A 3.3.1-7 N/A
apache-commons-jxpath 1.3 1.3-15 N/A
apache-mina 2.0.1 2.0.4-6 N/A
apache-sshd 0.7.0 0.7.0-3 N/A
jakarta-commons-httpclient 3.1 3.1-13 N/A
quartz 2.1.2 2.1.2-7 N/A
spring-ldap 1.3.1 1.3.1-5 N/A
springframework-* 1.3.1 1.3.1 N/A
ws-commons-util 1.0.2 1.0.1-26 1.0.1-13
xmlrpc-client 3.1.3 3.1.3-5 N/A
(*) too low.
objectweb-asm is used instead of spring-asm, without we get the following at
server.log:
Caused by: java.lang.NoClassDefFoundError: org/objectweb/asm/ClassVisitor
at
org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.<init>(AbstractAutowireCapableBeanFactory.java:121)
at
org.springframework.beans.factory.support.DefaultListableBeanFactory.<init>(DefaultListableBeanFactory.java:150)
at
org.springframework.jdbc.support.SQLErrorCodesFactory.<init>(SQLErrorCodesFactory.java:103)
at
org.springframework.jdbc.support.SQLErrorCodesFactory.<clinit>(SQLErrorCodesFactory.java:68)
at
org.springframework.jdbc.support.SQLErrorCodeSQLExceptionTranslator.setDataSource(SQLErrorCodeSQLExceptionTranslator.java:141)
at
org.springframework.jdbc.support.SQLErrorCodeSQLExceptionTranslator.<init>(SQLErrorCodeSQLExceptionTranslator.java:104)
at
org.ovirt.engine.core.dal.dbbroker.CustomSQLErrorCodeSQLExceptionTranslator.<init>(CustomSQLErrorCodeSQLExceptionTranslator.java:10)
Change-Id: I97995665ce34aeb2dd24d69b96919999d5498f43
Signed-off-by: Alon Bar-Lev <[email protected]>
---
M ovirt-engine.spec.in
1 file changed, 68 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/60/19060/6
diff --git a/ovirt-engine.spec.in b/ovirt-engine.spec.in
index a04fa37..203a3da 100644
--- a/ovirt-engine.spec.in
+++ b/ovirt-engine.spec.in
@@ -153,7 +153,31 @@
Requires: ovirt-iso-uploader >= 3.3.0
Requires: ovirt-log-collector >= 3.3.0
Requires: postgresql-server >= 8.4.7
+Requires: slf4j
+Requires: ws-commons-util
Requires: yum-plugin-versionlock
+
+%if 0%{?fedora}
+%if %{fedora} >= 19
+Requires: apache-commons-compress
+Requires: apache-commons-configuration
+Requires: apache-commons-jxpath
+Requires: apache-sshd
+Requires: jakarta-commons-httpclient
+Requires: objectweb-asm
+Requires: postgresql-jdbc
+Requires: quartz
+Requires: spring-ldap
+Requires: springframework-aop
+Requires: springframework-beans
+Requires: springframework-context
+Requires: springframework-expression
+Requires: springframework-instrument
+Requires: springframework-jdbc
+Requires: springframework-tx
+Requires: xmlrpc-client
+%endif
+%endif
# We can't require exactly the same version and release of the
# setup package because it needs to be updated independely as part
@@ -512,6 +536,50 @@
%endif
#
+# Link dependencies to system provided
+#
+DEPENDENCIES="
+org/ovirt/engine/core/dependencies/main/otopi.jar otopi/otopi.jar
+org/ovirt/engine/core/dependencies/main/ovirt-host-deploy.jar
ovirt-host-deploy/ovirt-host-deploy.jar
+org/ovirt/engine/core/dependencies/main/slf4j-api.jar slf4j/api.jar
+org/ovirt/engine/core/dependencies/main/ws-commons-util.jar ws-commons-util.jar
+"
+%if 0%{?fedora}
+%if %{fedora} >= 19
+DEPENDENCIES="${DEPENDENCIES}
+org/apache/commons/configuration/main/commons-configuration.jar
commons-configuration.jar
+org/apache/commons/jxpath/main/commons-jxpath.jar commons-jxpath.jar
+org/ovirt/engine/core/dependencies/main/commons-compress.jar
commons-compress.jar
+org/ovirt/engine/core/dependencies/main/commons-httpclient.jar
commons-httpclient.jar
+org/ovirt/engine/core/dependencies/main/mina-core.jar apache-mina/mina-core.jar
+org/ovirt/engine/core/dependencies/main/quartz.jar quartz.jar
+org/ovirt/engine/core/dependencies/main/spring-aop.jar
springframework/spring-aop.jar
+org/ovirt/engine/core/dependencies/main/spring-asm.jar objectweb-asm/asm.jar
+org/ovirt/engine/core/dependencies/main/spring-beans.jar
springframework/spring-beans.jar
+org/ovirt/engine/core/dependencies/main/spring-context.jar
springframework/spring-context.jar
+org/ovirt/engine/core/dependencies/main/spring-core.jar
springframework/spring-core.jar
+org/ovirt/engine/core/dependencies/main/spring-expression.jar
springframework/spring-expression.jar
+org/ovirt/engine/core/dependencies/main/spring-instrument.jar
springframework/spring-instrument.jar
+org/ovirt/engine/core/dependencies/main/spring-jdbc.jar
springframework/spring-jdbc.jar
+org/ovirt/engine/core/dependencies/main/spring-ldap-core.jar
spring-ldap/spring-ldap-core.jar
+org/ovirt/engine/core/dependencies/main/spring-tx.jar
springframework/spring-tx.jar
+org/ovirt/engine/core/dependencies/main/sshd-core.jar apache-sshd/sshd-core.jar
+org/ovirt/engine/core/dependencies/main/xmlrpc-client.jar xmlrpc-client.jar
+org/ovirt/engine/core/dependencies/main/xmlrpc-common.jar xmlrpc-common.jar
+org/postgresql/main/postgresql.jar postgresql-jdbc.jar
+"
+%endif
+%endif
+echo "${DEPENDENCIES}" | while read dst src; do
+ [ -z "${dst}" ] && continue
+
+ dst="%{engine_jboss_modules}/${dst}"
+ src="%{_javadir}/${src}"
+ rm -f "%{buildroot}${dst}"
+ ln -s "${src}" "%{buildroot}${dst}"
+done
+
+#
# Register services
#
%if %{ovirt_install_systemd}
--
To view, visit http://gerrit.ovirt.org/19060
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I97995665ce34aeb2dd24d69b96919999d5498f43
Gerrit-PatchSet: 6
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <[email protected]>
Gerrit-Reviewer: Allon Mureinik <[email protected]>
Gerrit-Reviewer: Alon Bar-Lev <[email protected]>
Gerrit-Reviewer: Barak Azulay <[email protected]>
Gerrit-Reviewer: Eyal Edri <[email protected]>
Gerrit-Reviewer: Itamar Heim <[email protected]>
Gerrit-Reviewer: Juan Hernandez <[email protected]>
Gerrit-Reviewer: Laszlo Hornyak <[email protected]>
Gerrit-Reviewer: Ofer Schreiber <[email protected]>
Gerrit-Reviewer: Roy Golan <[email protected]>
Gerrit-Reviewer: Sandro Bonazzola <[email protected]>
Gerrit-Reviewer: Yair Zaslavsky <[email protected]>
Gerrit-Reviewer: oVirt Jenkins CI Server
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
