Juan Hernandez has uploaded a new change for review.
Change subject: packaging: Complete removal of Hibernate
......................................................................
packaging: Complete removal of Hibernate
Recently we have removed dead Hibernate code, this requires some
packaging changes.
Change-Id: Ibb0eb4c639f71299aa36f97fed36a34d9d1dfac9
Signed-off-by: Juan Hernandez <juan.hernan...@redhat.com>
---
M
backend/manager/tools/engine-notifier/engine-notifier-resources/src/main/resources/notifier.sh
M packaging/fedora/spec/ovirt-engine.spec.in
M pom.xml
3 files changed, 0 insertions(+), 27 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/98/11598/1
diff --git
a/backend/manager/tools/engine-notifier/engine-notifier-resources/src/main/resources/notifier.sh
b/backend/manager/tools/engine-notifier/engine-notifier-resources/src/main/resources/notifier.sh
index 60c970a..4d48801 100755
---
a/backend/manager/tools/engine-notifier/engine-notifier-resources/src/main/resources/notifier.sh
+++
b/backend/manager/tools/engine-notifier/engine-notifier-resources/src/main/resources/notifier.sh
@@ -184,7 +184,6 @@
commons-lang
commons-logging
dom4j
- hibernate-jpa-2.0-api
javamail
log4j
ovirt-engine/common
@@ -212,9 +211,6 @@
# in order to make the script less dependent on the version of oVirt Engine
# installed:
jar_names='
- hibernate-annotations
- hibernate-commons-annotations
- hibernate-core
hibernate-validator
validation-api
'
diff --git a/packaging/fedora/spec/ovirt-engine.spec.in
b/packaging/fedora/spec/ovirt-engine.spec.in
index bc2301e..7400911 100644
--- a/packaging/fedora/spec/ovirt-engine.spec.in
+++ b/packaging/fedora/spec/ovirt-engine.spec.in
@@ -113,8 +113,6 @@
BuildRequires: bea-stax-api
BuildRequires: dos2unix
BuildRequires: jackson
-BuildRequires: hibernate-commons-annotations
-BuildRequires: hibernate-jpa-2.0-api
BuildRequires: hibernate-validator
BuildRequires: jakarta-commons-httpclient
BuildRequires: java-devel
@@ -146,8 +144,6 @@
Requires: bind-utils
Requires: cracklib-python
Requires: geronimo-validation
-Requires: hibernate-commons-annotations
-Requires: hibernate-jpa-2.0-api
Requires: hibernate-validator
Requires: httpd
Requires: java-1.7.0-openjdk >= 1:1.7.0.9-2.3.3.2
@@ -441,7 +437,6 @@
commons-compress commons-compress
dom4j dom4j
geronimo-validation validation-api
-hibernate/hibernate-commons-annotations hibernate-commons-annotations
hibernate-validator hibernate-validator
jsch jsch
objectweb-asm/asm-all asm-all
diff --git a/pom.xml b/pom.xml
index bce2166..73c0fc4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,9 +76,7 @@
<mockito.version>1.9.0</mockito.version>
<javassist.version>3.12.0.GA</javassist.version>
<javax.mail.version>1.4.4</javax.mail.version>
- <hibernate-core.version>3.3.0.SP1</hibernate-core.version>
<hibernate-validator.version>4.0.2.GA</hibernate-validator.version>
- <hibernate-annotations.version>3.4.0.GA</hibernate-annotations.version>
<jackson-core-asl.version>1.9.4</jackson-core-asl.version>
<jackson-mapper-asl.version>1.9.4</jackson-mapper-asl.version>
<commons-configuration.version>1.6</commons-configuration.version>
@@ -226,24 +224,8 @@
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${hibernate-core.version}</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<version>${hibernate-validator.version}</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-annotations</artifactId>
- <version>${hibernate-annotations.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
--
To view, visit http://gerrit.ovirt.org/11598
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibb0eb4c639f71299aa36f97fed36a34d9d1dfac9
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Juan Hernandez <juan.hernan...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
