From 37f8e56603edb8030d68fefad58045f27da60124 Mon Sep 17 00:00:00 2001
From: Mustapha Zorgati <15628173+mustaphazorgati@users.noreply.github.com>
Date: Sun, 1 Dec 2019 21:32:04 +0100
Subject: [PATCH] TSK-925: added taskana-history as a child to taskana-parent

---
 .travis.yml | 6 ++----
 pom.xml     | 3 ++-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 224c0c43e..be33c53c5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -97,10 +97,8 @@ matrix:
       script: |
         mvn deploy -T 4C -P `[[ "$TRAVIS_TAG" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]] && echo "release" || echo "snapshot"` \
         --settings ci/mvnsettings.xml -DskipTests -Dcheckstyle.skip -pl !:taskana-spring-example,!:taskana-cdi-example,\
-        !:taskana-rest-spring-example,!:taskana-rest-spring-wildfly-example \
-        && mvn deploy -f history  --settings ci/mvnsettings.xml -DskipTests -Dcheckstyle.skip \
-        -P `[[ "$TRAVIS_TAG" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]] && echo "release" || echo "snapshot"` \
-        -pl !:taskana-simplehistory-spring-test,!:taskana-simplehistory-rest-spring-example
+        !:taskana-rest-spring-example,!:taskana-rest-spring-test,!:taskana-rest-spring-wildfly-example,\
+        !:taskana-simplehistory-spring-test,!:taskana-simplehistory-rest-spring-example
       before_cache: rm -rf $HOME/.m2/repository/pro/taskana
       after_success: ci/change_version.sh -i -m . && ci/commitPoms.sh
       deploy:
diff --git a/pom.xml b/pom.xml
index 8c643708c..24a8c7e68 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,8 @@
 	<modules>
 		<module>lib</module>
 		<module>rest</module>
-		<!-- History is an optional module. Thus not a child of the taskana parent. -->
+		<!-- History is an optional module. -->
+		<module>history</module>
 	</modules>
 
 	<properties>