TSK-850: reconfigured taskana-rest-spring-example

This commit is contained in:
Mustapha Zorgati 2019-05-09 10:19:37 +02:00 committed by Holger Hagen
parent 5a6077121d
commit 6b74d6588e
2 changed files with 53 additions and 49 deletions

View File

@ -3,59 +3,28 @@
xmlns="http://maven.apache.org/POM/4.0.0" 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"> 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> <modelVersion>4.0.0</modelVersion>
<groupId>pro.taskana</groupId>
<artifactId>taskana-rest-spring-example</artifactId> <artifactId>taskana-rest-spring-example</artifactId>
<version>1.1.3-SNAPSHOT</version>
<packaging>jar</packaging>
<name>rest</name> <name>rest</name>
<description>Demo project for taskana-rest-spring</description> <description>Demo project for taskana-rest-spring</description>
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>pro.taskana</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>taskana-rest-parent</artifactId>
<version>2.0.2.RELEASE</version> <version>1.1.2-SNAPSHOT</version>
<relativePath/> <!-- lookup parent from repository --> <relativePath>..</relativePath>
</parent> </parent>
<repositories> <dependencyManagement>
<!-- Repository for postgresql V. 9.4.1212 driver. <dependencies>
<repository> <dependency>
<id>postgresql</id> <groupId>org.springframework.boot</groupId>
<name>postgresql repository</name> <artifactId>spring-boot-dependencies</artifactId>
<url>https://mvnrepository.com/artifact/postgresql/postgresql</url> <version>${version.spring-boot}</version>
</repository>--> <type>pom</type>
<!-- this repository is needed to fetch com.ibm.db2.jcc --> <scope>import</scope>
<repository> </dependency>
<id>novatec public</id> </dependencies>
<name>novatec-repository</name> </dependencyManagement>
<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>
<dependencies> <dependencies>
<dependency> <dependency>
@ -77,7 +46,6 @@
<dependency> <dependency>
<groupId>org.springframework.ldap</groupId> <groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap-core</artifactId> <artifactId>spring-ldap-core</artifactId>
<version>${spring.ldap.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.h2database</groupId> <groupId>com.h2database</groupId>
@ -120,25 +88,50 @@
<dependency> <dependency>
<groupId>org.springframework.ldap</groupId> <groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap-test</artifactId> <artifactId>spring-ldap-test</artifactId>
<version>${spring.ldap.version}</version>
<scope>test</scope> <scope>test</scope>
<exclusions> <exclusions>
<exclusion> <exclusion>
<artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId> <groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
</dependencies> </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> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<version>${version.spring-boot}</version>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<version>3.1.0</version>
<executions> <executions>
<execution> <execution>
<id>copy-documentation-to-static-folder</id> <id>copy-documentation-to-static-folder</id>
@ -163,4 +156,13 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </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> </project>

View File

@ -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 ####### tomcat is not detecting the x-forward headers from bluemix as a trustworthy proxy
server.tomcat.internal-proxies=.* server.tomcat.internal-proxies=.*
server.use-forward-headers=true server.use-forward-headers=true
####### allow bean overriding
spring.main.allow-bean-definition-overriding=true