Alon Bar-Lev has uploaded a new change for review. Change subject: build: reintroduce routines jars as it is used by the advancedPersistentLookupLib ......................................................................
build: reintroduce routines jars as it is used by the advancedPersistentLookupLib Change-Id: I949c9753e42c65ee73840c6c9d3cee7cea43ce65 Signed-off-by: Alon Bar-Lev <[email protected]> --- M Makefile M ovirt-engine-dwh.spec.in M ovirt-engine-dwh/advancedPersistentLookupLib/pom.xml M ovirt-engine-dwh/dependencies/pom.xml M ovirt-engine-dwh/dependencies/src/main/modules/org/ovirt/engine/dwh/main/module.xml M ovirt-engine-dwh/pom.xml A ovirt-engine-dwh/routines/pom.xml R ovirt-engine-dwh/routines/src/main/java/routines 8 files changed, 63 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-dwh refs/changes/95/22695/1 diff --git a/Makefile b/Makefile index aa1c069..ef3cc91 100644 --- a/Makefile +++ b/Makefile @@ -241,9 +241,10 @@ install-poms: install -dm 755 "$(DESTDIR)$(MAVENPOM_DIR)" install -m 644 ovirt-engine-dwh/advancedPersistentLookupLib/pom.xml "$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)-advancedPersistentLookupLib.pom" - install -m 644 ovirt-engine-dwh/historyETL/pom.xml "$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)-historyETL.pom" install -m 644 ovirt-engine-dwh/etltermination/pom.xml "$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)-etltermination.pom" + install -m 644 ovirt-engine-dwh/historyETL/pom.xml "$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)-historyETL.pom" install -m 644 ovirt-engine-dwh/pom.xml "$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)-ovirt-engine-dwh.pom" + install -m 644 ovirt-engine-dwh/routines/pom.xml "$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)-routines.pom" install -m 644 pom.xml "$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)-root.pom" install-packaging-files: \ diff --git a/ovirt-engine-dwh.spec.in b/ovirt-engine-dwh.spec.in index 36a7fb9..a8f50d6 100644 --- a/ovirt-engine-dwh.spec.in +++ b/ovirt-engine-dwh.spec.in @@ -148,6 +148,7 @@ %{_datadir}/ovirt-engine-dwh/modules/org/ovirt/engine/dwh/main/advancedPersistentLookupLib.jar %{_datadir}/ovirt-engine-dwh/modules/org/ovirt/engine/dwh/main/etltermination.jar %{_datadir}/ovirt-engine-dwh/modules/org/ovirt/engine/dwh/main/historyETL.jar +%{_datadir}/ovirt-engine-dwh/modules/org/ovirt/engine/dwh/main/routines.jar __EOF__ # Needed for compatibility if package is different than the directory structure diff --git a/ovirt-engine-dwh/advancedPersistentLookupLib/pom.xml b/ovirt-engine-dwh/advancedPersistentLookupLib/pom.xml index 2a7fca7..1326ac4 100644 --- a/ovirt-engine-dwh/advancedPersistentLookupLib/pom.xml +++ b/ovirt-engine-dwh/advancedPersistentLookupLib/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.ovirt.engine.dwh</groupId> - <artifactId>data-warehouse</artifactId> + <artifactId>ovirt-engine-dwh</artifactId> <version>3.3.0</version> </parent> diff --git a/ovirt-engine-dwh/dependencies/pom.xml b/ovirt-engine-dwh/dependencies/pom.xml index 3c79d52..1128426 100644 --- a/ovirt-engine-dwh/dependencies/pom.xml +++ b/ovirt-engine-dwh/dependencies/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.ovirt.engine.dwh</groupId> - <artifactId>data-warehouse</artifactId> + <artifactId>ovirt-engine-dwh</artifactId> <version>3.3.0</version> </parent> @@ -31,6 +31,12 @@ <groupId>org.ovirt.engine.dwh</groupId> <artifactId>etltermination</artifactId> <version>3.3.0</version> + </dependency> + + <dependency> + <groupId>org.ovirt.engine.dwh</groupId> + <artifactId>routines</artifactId> + <version>5.3.0</version> </dependency> <dependency> @@ -71,6 +77,12 @@ <module> <groupId>org.ovirt.engine.dwh</groupId> + <artifactId>routines</artifactId> + <moduleName>org.ovirt.engine.dwh</moduleName> + </module> + + <module> + <groupId>org.ovirt.engine.dwh</groupId> <artifactId>advancedPersistentLookupLib</artifactId> <moduleName>org.ovirt.engine.dwh</moduleName> </module> diff --git a/ovirt-engine-dwh/dependencies/src/main/modules/org/ovirt/engine/dwh/main/module.xml b/ovirt-engine-dwh/dependencies/src/main/modules/org/ovirt/engine/dwh/main/module.xml index f209124..a5fbab7 100644 --- a/ovirt-engine-dwh/dependencies/src/main/modules/org/ovirt/engine/dwh/main/module.xml +++ b/ovirt-engine-dwh/dependencies/src/main/modules/org/ovirt/engine/dwh/main/module.xml @@ -6,6 +6,7 @@ <resource-root path="advancedPersistentLookupLib.jar"/> <resource-root path="etltermination.jar"/> <resource-root path="historyETL.jar"/> + <resource-root path="routines.jar"/> </resources> <dependencies> diff --git a/ovirt-engine-dwh/pom.xml b/ovirt-engine-dwh/pom.xml index 8dbbea7..0261b15 100644 --- a/ovirt-engine-dwh/pom.xml +++ b/ovirt-engine-dwh/pom.xml @@ -15,10 +15,11 @@ <description>parent for oVirt Engine History DB ETL module</description> <modules> + <module>routines</module> <module>advancedPersistentLookupLib</module> - <module>dependencies</module> - <module>historyETL</module> <module>etltermination</module> + <module>historyETL</module> + <module>dependencies</module> </modules> </project> diff --git a/ovirt-engine-dwh/routines/pom.xml b/ovirt-engine-dwh/routines/pom.xml new file mode 100644 index 0000000..f8b8b3e --- /dev/null +++ b/ovirt-engine-dwh/routines/pom.xml @@ -0,0 +1,42 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.ovirt.engine.dwh</groupId> + <artifactId>ovirt-engine-dwh</artifactId> + <version>3.3.0</version> + </parent> + + <groupId>org.ovirt.engine.dwh</groupId> + <artifactId>routines</artifactId> + <packaging>jar</packaging> + <version>5.3.0</version> + <name>Talend's Routines</name> + <description>The talend routines required for etl jobs</description> + + <dependencies> + + <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + <version>${version.dom4j}</version> + </dependency> + + </dependencies> + + <build> + + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <encoding>${project.build.sourceEncoding}</encoding> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> + </plugins> + + </build> +</project> diff --git a/ovirt-engine-dwh/historyETL/src/main/java/routines b/ovirt-engine-dwh/routines/src/main/java/routines similarity index 100% rename from ovirt-engine-dwh/historyETL/src/main/java/routines rename to ovirt-engine-dwh/routines/src/main/java/routines -- To view, visit http://gerrit.ovirt.org/22695 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I949c9753e42c65ee73840c6c9d3cee7cea43ce65 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-dwh Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
