From 6b74d6588e5dd18a73d70ff8bb66a783beeaa494 Mon Sep 17 00:00:00 2001
From: Mustapha Zorgati <15628173+mustaphazorgati@users.noreply.github.com>
Date: Thu, 9 May 2019 10:19:37 +0200
Subject: [PATCH] TSK-850: reconfigured taskana-rest-spring-example

---
 rest/taskana-rest-spring-example/pom.xml      | 100 +++++++++---------
 .../src/main/resources/application.properties |   2 +
 2 files changed, 53 insertions(+), 49 deletions(-)

diff --git a/rest/taskana-rest-spring-example/pom.xml b/rest/taskana-rest-spring-example/pom.xml
index 1c2bad3bb..b704d959a 100644
--- a/rest/taskana-rest-spring-example/pom.xml
+++ b/rest/taskana-rest-spring-example/pom.xml
@@ -3,59 +3,28 @@
 		 xmlns="http://maven.apache.org/POM/4.0.0"
 		 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>
-
-	<groupId>pro.taskana</groupId>
 	<artifactId>taskana-rest-spring-example</artifactId>
-	<version>1.1.3-SNAPSHOT</version>
-	<packaging>jar</packaging>
 
 	<name>rest</name>
 	<description>Demo project for taskana-rest-spring</description>
 
 	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.0.2.RELEASE</version>
-		<relativePath/> <!-- lookup parent from repository -->
+		<groupId>pro.taskana</groupId>
+		<artifactId>taskana-rest-parent</artifactId>
+		<version>1.1.2-SNAPSHOT</version>
+		<relativePath>..</relativePath>
 	</parent>
-	<repositories>
-		<!-- Repository for postgresql V. 9.4.1212 driver.
-		<repository>
-			<id>postgresql</id>
-			<name>postgresql repository</name>
-			<url>https://mvnrepository.com/artifact/postgresql/postgresql</url>
-		</repository>-->
-		<!--  this repository is needed to fetch com.ibm.db2.jcc -->
-		<repository>
-			<id>novatec public</id>
-			<name>novatec-repository</name>
-			<url>https://repository.novatec-gmbh.de/content/repositories/novatec/</url>
-		</repository>
-	</repositories>
-
-
-	<profiles>
-		<profile>
-			<id>history.plugin</id>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-			</activation>
-			<dependencies>
-				<dependency>
-					<groupId>pro.taskana.simplehistory</groupId>
-					<artifactId>taskana-simplehistory-rest-spring</artifactId>
-					<version>0.0.9</version>
-				</dependency>
-			</dependencies>
-		</profile>
-	</profiles>
-
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<java.version>1.8</java.version>
-		<spring.ldap.version>2.3.2.RELEASE</spring.ldap.version>
-	</properties>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-dependencies</artifactId>
+				<version>${version.spring-boot}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
 
 	<dependencies>
 		<dependency>
@@ -77,7 +46,6 @@
 		<dependency>
 			<groupId>org.springframework.ldap</groupId>
 			<artifactId>spring-ldap-core</artifactId>
-			<version>${spring.ldap.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.h2database</groupId>
@@ -120,25 +88,50 @@
 		<dependency>
 			<groupId>org.springframework.ldap</groupId>
 			<artifactId>spring-ldap-test</artifactId>
-			<version>${spring.ldap.version}</version>
 			<scope>test</scope>
 			<exclusions>
 				<exclusion>
-					<artifactId>commons-logging</artifactId>
 					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
 				</exclusion>
 			</exclusions>
 		</dependency>
 	</dependencies>
 
+	<profiles>
+		<profile>
+			<id>history.plugin</id>
+			<activation>
+				<activeByDefault>false</activeByDefault>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>pro.taskana.simplehistory</groupId>
+					<artifactId>taskana-simplehistory-rest-spring</artifactId>
+					<version>0.0.9</version>
+				</dependency>
+			</dependencies>
+		</profile>
+	</profiles>
+
 	<build>
 		<plugins>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
+				<version>${version.spring-boot}</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>repackage</goal>
+						</goals>
+					</execution>
+				</executions>
 			</plugin>
 			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-resources-plugin</artifactId>
+				<version>3.1.0</version>
 				<executions>
 					<execution>
 						<id>copy-documentation-to-static-folder</id>
@@ -163,4 +156,13 @@
 			</plugin>
 		</plugins>
 	</build>
+
+	<repositories>
+		<!--  this repository is needed to fetch com.ibm.db2.jcc -->
+		<repository>
+			<id>novatec public</id>
+			<name>novatec-repository</name>
+			<url>https://repository.novatec-gmbh.de/content/repositories/novatec/</url>
+		</repository>
+	</repositories>
 </project>
diff --git a/rest/taskana-rest-spring-example/src/main/resources/application.properties b/rest/taskana-rest-spring-example/src/main/resources/application.properties
index 24eced016..3a4282c45 100644
--- a/rest/taskana-rest-spring-example/src/main/resources/application.properties
+++ b/rest/taskana-rest-spring-example/src/main/resources/application.properties
@@ -52,3 +52,5 @@ spring.resources.cache.cachecontrol.cache-private=true
 ####### tomcat is not detecting the x-forward headers from bluemix as a trustworthy proxy
 server.tomcat.internal-proxies=.*
 server.use-forward-headers=true
+####### allow bean overriding
+spring.main.allow-bean-definition-overriding=true