Alon Bar-Lev has uploaded a new change for review.
Change subject: aaa: ldap-core is not required outside of builtin extensions
......................................................................
aaa: ldap-core is not required outside of builtin extensions
Change-Id: I3bbf363996d098e9dfba3b1b810a1884bb8d00f9
Signed-off-by: Alon Bar-Lev <alo...@redhat.com>
---
M backend/manager/dependencies/pom.xml
A
backend/manager/dependencies/src/main/modules/org/springframework/ldap/main/module.xml
M
backend/manager/dependencies/src/main/modules/org/springframework/main/module.xml
M
backend/manager/modules/builtin-extensions/src/main/modules/org/ovirt/engine/extensions/builtin/main/module.xml
M backend/manager/modules/utils/pom.xml
M ovirt-engine.spec.in
6 files changed, 20 insertions(+), 11 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/62/31062/1
diff --git a/backend/manager/dependencies/pom.xml
b/backend/manager/dependencies/pom.xml
index 6822c08..afd06b9 100644
--- a/backend/manager/dependencies/pom.xml
+++ b/backend/manager/dependencies/pom.xml
@@ -415,7 +415,7 @@
<module>
<groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap-core</artifactId>
- <moduleName>org.springframework</moduleName>
+ <moduleName>org.springframework.ldap</moduleName>
</module>
<module>
diff --git
a/backend/manager/dependencies/src/main/modules/org/springframework/ldap/main/module.xml
b/backend/manager/dependencies/src/main/modules/org/springframework/ldap/main/module.xml
new file mode 100644
index 0000000..f93529f
--- /dev/null
+++
b/backend/manager/dependencies/src/main/modules/org/springframework/ldap/main/module.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<module xmlns="urn:jboss:module:1.1" name="org.springframework.ldap">
+
+ <resources>
+ <resource-root path="spring-ldap-core.jar"/>
+ </resources>
+
+ <dependencies>
+ <module name="javax.api"/>
+ <module name="org.apache.commons.lang"/>
+ <module name="org.apache.commons.logging"/>
+ <module name="org.springframework"/>
+ <module name="sun.jdk"/>
+ </dependencies>
+
+</module>
diff --git
a/backend/manager/dependencies/src/main/modules/org/springframework/main/module.xml
b/backend/manager/dependencies/src/main/modules/org/springframework/main/module.xml
index cf3fe4b..fe1e9f5 100644
---
a/backend/manager/dependencies/src/main/modules/org/springframework/main/module.xml
+++
b/backend/manager/dependencies/src/main/modules/org/springframework/main/module.xml
@@ -11,7 +11,6 @@
<resource-root path="spring-expression.jar"/>
<resource-root path="spring-instrument.jar"/>
<resource-root path="spring-jdbc.jar"/>
- <resource-root path="spring-ldap-core.jar"/>
<resource-root path="spring-tx.jar"/>
</resources>
diff --git
a/backend/manager/modules/builtin-extensions/src/main/modules/org/ovirt/engine/extensions/builtin/main/module.xml
b/backend/manager/modules/builtin-extensions/src/main/modules/org/ovirt/engine/extensions/builtin/main/module.xml
index 0f492d8..58ae5a8 100644
---
a/backend/manager/modules/builtin-extensions/src/main/modules/org/ovirt/engine/extensions/builtin/main/module.xml
+++
b/backend/manager/modules/builtin-extensions/src/main/modules/org/ovirt/engine/extensions/builtin/main/module.xml
@@ -19,7 +19,7 @@
<module name="org.ovirt.engine.core.compat"/>
<module name="org.ovirt.engine.core.utils"/>
<module name="org.ovirt.engine.core.uutils"/>
- <module name="org.springframework"/>
+ <module name="org.springframework.ldap"/>
<module name="sun.jdk"/>
</dependencies>
diff --git a/backend/manager/modules/utils/pom.xml
b/backend/manager/modules/utils/pom.xml
index f0d3503..6cea3bf 100644
--- a/backend/manager/modules/utils/pom.xml
+++ b/backend/manager/modules/utils/pom.xml
@@ -128,13 +128,6 @@
<artifactId>jackson-mapper-asl</artifactId>
</dependency>
- <dependency>
- <groupId>org.springframework.ldap</groupId>
- <artifactId>spring-ldap-core</artifactId>
- <version>${spring.ldap.version}</version>
- <scope>provided</scope>
- </dependency>
-
<!-- This is not used directly by the source, but the
compiler some how requires it indirectly: -->
<dependency>
diff --git a/ovirt-engine.spec.in b/ovirt-engine.spec.in
index 7c3ef9b..ef91a3f 100644
--- a/ovirt-engine.spec.in
+++ b/ovirt-engine.spec.in
@@ -733,7 +733,7 @@
org/springframework/main/spring-expression.jar
springframework/spring-expression.jar
org/springframework/main/spring-instrument.jar
springframework/spring-instrument.jar
org/springframework/main/spring-jdbc.jar springframework/spring-jdbc.jar
-org/springframework/main/spring-ldap-core.jar spring-ldap/spring-ldap-core.jar
+org/springframework/ldap/main/spring-ldap-core.jar
spring-ldap/spring-ldap-core.jar
org/springframework/main/spring-tx.jar springframework/spring-tx.jar
org/tukaani/xz/main/xz.jar
%endif
--
To view, visit http://gerrit.ovirt.org/31062
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3bbf363996d098e9dfba3b1b810a1884bb8d00f9
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
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
