TSK-850: refactored pom files and travis configuration

This commit is contained in:
Mustapha Zorgati 2019-05-09 14:08:36 +02:00 committed by Holger Hagen
parent 4311ae6c5c
commit 6898ff37ef
16 changed files with 147 additions and 129 deletions

View File

@ -36,7 +36,7 @@ script:
- "sh -e /etc/init.d/xvfb start"
- sleep 3 # give xvfb some time to start
- nvm install $NODE_VERSION
&& ci/change_version.sh -m "lib/ rest/" -swarm lib/taskana-cdi/src/test/java/pro/taskana/TaskanaProducersTest.java
&& ci/change_version.sh -m . -swarm lib/taskana-cdi/src/test/java/pro/taskana/TaskanaProducersTest.java
&& ci/test.sh $DB $PROJECT
jobs:
@ -45,11 +45,10 @@ jobs:
install:
- nvm install $NODE_VERSION
&& (cd web && npm install && npm rebuild node-sass)
&& ci/change_version.sh -m "lib/ rest/" -swarm lib/taskana-cdi/src/test/java/pro/taskana/TaskanaProducersTest.java
&& ci/change_version.sh -m . -swarm lib/taskana-cdi/src/test/java/pro/taskana/TaskanaProducersTest.java
script:
- (cd web && npm run build:prod)
&& mvn clean install -q -f lib -DskipTests -Dmaven.javadoc.skip
&& mvn clean install -q -f rest -DskipTests -Dmaven.javadoc.skip -P history.plugin
&& mvn clean install -q -DskipTests -Dmaven.javadoc.skip -P history.plugin
- stage: "Release / Deploy"
name: "Release stage"
script:
@ -63,7 +62,7 @@ jobs:
- stage: "Release / Deploy"
name: "Update Pom's stage"
script:
- ci/change_version.sh -i -m "lib/ rest/" -swarm lib/taskana-cdi/src/test/java/pro/taskana/TaskanaProducersTest.java
- ci/change_version.sh -i -m . -swarm lib/taskana-cdi/src/test/java/pro/taskana/TaskanaProducersTest.java
&& ci/commitPoms.sh lib/taskana-cdi/src/test/java/pro/taskana/TaskanaProducersTest.java
if: repo = env(DEPLOY_REPO) AND tag =~ ^v[0-9]+\.[0-9]+\.[0-9]+$
- stage: "Release / Deploy"

View File

@ -31,17 +31,19 @@ function main {
[[ $# -eq 0 || "$1" == '-h' || "$1" == '--help' ]] && helpAndExit 0
REL=`dirname "$0"`
eval "$REL/prepare_db.sh '$1'"
#main stage H2 && REST it requires to package rest again because documentation is included in test phase
if [[ "$1" == "H2" && "$2" == "REST" ]]; then
(cd $REL/../web && npm run test)
mvn clean install -q -f $REL/../rest/ -B
mvn clean install -q -f $REL/../rest/ -B #reinstalling rest because rest-doc is built during tests.
mvn clean verify -q -f $REL/../rest/ -B -pl taskana-rest-spring-example -P history.plugin
elif [[ "$1" == "H2" && "$2" == "LIB" ]]; then
mvn clean install -q -f $REL/../lib/ -B -Dmaven.javadoc.skip
elif [[ "$1" == "POSTGRES_10_4" && "$2" == "CORE" ]]; then
mvn clean verify -q -f $REL/../lib/taskana-core -B
elif [[ "$1" == "POSTGRES_10_4" && "$2" == "WILDFLY" ]]; then
#installing dependencies for rest (since this tests runs in a different cache)
mvn clean install -q -N
mvn clean install -q -f $REL/../lib/ -B -DskipTests -Dmaven.javadoc.skip
mvn clean install -q -f $REL/../rest/ -B -DskipTests -pl !taskana-rest-spring-wildfly-example -Dmaven.javadoc.skip
mvn clean install -q -f $REL/../rest/ -B -pl taskana-rest-spring-wildfly-example -Dmaven.javadoc.skip -P postgres
else

View File

@ -5,11 +5,12 @@
<version>1.1.3-SNAPSHOT</version>
<packaging>pom</packaging>
<name>${project.groupId}:${project.artifactId}</name>
<description>This pom is parent to all taskana core modules and serves the common build.</description>
<parent>
<artifactId>taskana-parent</artifactId>
<groupId>pro.taskana</groupId>
<artifactId>taskana-parent</artifactId>
<version>1.1.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

View File

@ -2,14 +2,15 @@
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>
<artifactId>taskana-cdi-example</artifactId>
<version>1.1.2-SNAPSHOT</version>
<packaging>war</packaging>
<name>${project.groupId}:${project.artifactId}</name>
<description>The Taskana Spring sample application.</description>
<parent>
<artifactId>taskana-lib-parent</artifactId>
<groupId>pro.taskana</groupId>
<artifactId>taskana-lib-parent</artifactId>
<version>1.1.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

View File

@ -2,25 +2,18 @@
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>
<artifactId>taskana-cdi</artifactId>
<version>1.1.2-SNAPSHOT</version>
<name>${project.groupId}:${project.artifactId}</name>
<url>http://taskana.pro</url>
<description>The helper module to integrate taskana into CDI projects.</description>
<parent>
<artifactId>taskana-lib-parent</artifactId>
<groupId>pro.taskana</groupId>
<artifactId>taskana-lib-parent</artifactId>
<version>1.1.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<repositories>
<repository>
<id>jboss</id>
<url>http://repository.jboss.org/nexus/content/groups/public-jboss/</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>javax</groupId>
@ -41,14 +34,14 @@
</dependency>
<dependency>
<groupId>org.wildfly.swarm</groupId>
<version>${version.wildfly.swarm}</version>
<artifactId>jaxrs</artifactId>
<version>${version.wildfly.swarm}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.wildfly.swarm</groupId>
<version>${version.wildfly.swarm}</version>
<artifactId>cdi</artifactId>
<version>${version.wildfly.swarm}</version>
<scope>test</scope>
</dependency>
<dependency>
@ -78,6 +71,7 @@
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
@ -94,4 +88,11 @@
</plugin>
</plugins>
</build>
<repositories>
<repository>
<id>jboss</id>
<url>http://repository.jboss.org/nexus/content/groups/public-jboss/</url>
</repository>
</repositories>
</project>

View File

@ -2,13 +2,14 @@
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>
<artifactId>taskana-core</artifactId>
<version>1.1.2-SNAPSHOT</version>
<name>${project.groupId}:${project.artifactId}</name>
<description>The taskana library to include in your project.</description>
<parent>
<artifactId>taskana-lib-parent</artifactId>
<groupId>pro.taskana</groupId>
<artifactId>taskana-lib-parent</artifactId>
<version>1.1.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@ -90,9 +91,8 @@
<version>2.9.8</version>
</dependency>
</dependencies>
<!--
this repository is needed to fetch com.ibm.db2.jcc
-->
<!-- this repository is needed to fetch com.ibm.db2.jcc -->
<repositories>
<repository>
<id>novatec public</id>

View File

@ -2,13 +2,14 @@
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>
<artifactId>taskana-spring-example</artifactId>
<version>1.1.2-SNAPSHOT</version>
<name>${project.groupId}:${project.artifactId}</name>
<description>The Taskana Spring sample application.</description>
<parent>
<artifactId>taskana-lib-parent</artifactId>
<groupId>pro.taskana</groupId>
<artifactId>taskana-lib-parent</artifactId>
<version>1.1.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@ -54,6 +55,7 @@
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>

View File

@ -1,14 +1,15 @@
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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>
<artifactId>taskana-spring</artifactId>
<version>1.1.2-SNAPSHOT</version>
<name>${project.groupId}:${project.artifactId}</name>
<description>The helper module to integrate taskana into Spring projects.</description>
<parent>
<artifactId>taskana-lib-parent</artifactId>
<groupId>pro.taskana</groupId>
<artifactId>taskana-lib-parent</artifactId>
<version>1.1.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@ -19,20 +20,17 @@
<artifactId>taskana-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
<version>${version.spring}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${version.spring}</version>
</dependency>
<dependency>
<groupId>org.mybatis</groupId>
<artifactId>mybatis-spring</artifactId>

View File

@ -6,6 +6,7 @@
<version>1.1.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>${project.groupId}:${project.artifactId}</name>
<description>This pom is parent to all taskana modules and serves the common build.</description>
<url>http://taskana.pro</url>
@ -38,9 +39,9 @@
</developers>
<scm>
<url>http://github.com/taskana/taskana/tree/master</url>
<connection>scm:git:git://github.com/taskana/taskana.git</connection>
<developerConnection>scm:git:ssh://github.com:taskana/taskana.git</developerConnection>
<url>http://github.com/taskana/taskana/tree/master</url>
</scm>
<licenses>
@ -50,7 +51,6 @@
</license>
</licenses>
<profiles>
<profile>
<id>snapshot</id>
@ -157,6 +157,7 @@
<failOnWarning>false</failOnWarning>
<compilerArgs>
<arg>-Xlint:all</arg>
<arg>-proc:none</arg>
</compilerArgs>
</configuration>
</plugin>
@ -210,5 +211,4 @@
</plugin>
</plugins>
</build>
</project>

View File

@ -1,14 +1,16 @@
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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>
<artifactId>taskana-rest-parent</artifactId>
<description>This pom is parent to all taskana rest modules and serves the common build.</description>
<version>1.1.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>${project.groupId}:${project.artifactId}</name>
<description>This pom is parent to all taskana rest modules and serves the common build.</description>
<parent>
<artifactId>taskana-parent</artifactId>
<groupId>pro.taskana</groupId>
<artifactId>taskana-parent</artifactId>
<version>1.1.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

View File

@ -1,92 +1,94 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
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>
<artifactId>taskana-rest-spring-base</artifactId>
<version>1.1.2-SNAPSHOT</version>
<name>${project.groupId}:${project.artifactId}</name>
<artifactId>taskana-rest-spring-base</artifactId>
<name>${project.groupId}:${project.artifactId}</name>
<description>groups the minimum required configuration for a taskana REST APP</description>
<parent>
<artifactId>taskana-rest-parent</artifactId>
<groupId>pro.taskana</groupId>
<version>1.1.3-SNAPSHOT</version>
<parent>
<groupId>pro.taskana</groupId>
<artifactId>taskana-rest-parent</artifactId>
<version>1.1.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
</parent>
<dependencies>
<dependency>
<groupId>pro.taskana</groupId>
<artifactId>taskana-rest-spring</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>${version.spring-boot}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
<version>${version.spring-boot}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jdbc</artifactId>
<version>${version.spring-boot}</version>
</dependency>
<dependency>
<groupId>org.springframework.plugin</groupId>
<artifactId>spring-plugin-core</artifactId>
<version>1.2.0.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap-core</artifactId>
<version>${version.spring.ldap}</version>
</dependency>
<!--
<dependencies>
<dependency>
<groupId>pro.taskana</groupId>
<artifactId>taskana-rest-spring</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>${version.spring-boot}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
<version>${version.spring-boot}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jdbc</artifactId>
<version>${version.spring-boot}</version>
</dependency>
<dependency>
<groupId>org.springframework.plugin</groupId>
<artifactId>spring-plugin-core</artifactId>
<version>1.2.0.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap-core</artifactId>
<version>${version.spring.ldap}</version>
</dependency>
<!--
Since taskana-web packs its content in /static, we do not have to unpack it again.
However, when any local change has to be done to that folder you have to copy
target/classes/static manually from taskana-web.
-->
<dependency>
<groupId>pro.taskana</groupId>
<artifactId>taskana-web</artifactId>
<version>${project.version}</version>
</dependency>
<!-- Tests -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<version>${version.spring-boot}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>pro.taskana</groupId>
<artifactId>taskana-web</artifactId>
<version>${project.version}</version>
</dependency>
<!-- Tests -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<version>${version.spring-boot}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-test</artifactId>
<version>${version.spring}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-test</artifactId>
<version>${version.spring}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap-test</artifactId>
<version>${version.spring.ldap}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-thymeleaf</artifactId>
<version>${version.spring-boot}</version>
</dependency>
</dependencies>
<dependency>
<groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap-test</artifactId>
<version>${version.spring.ldap}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-thymeleaf</artifactId>
<version>${version.spring-boot}</version>
</dependency>
</dependencies>
</project>

View File

@ -4,8 +4,9 @@
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>
<artifactId>taskana-rest-spring-example</artifactId>
<version>1.1.2-SNAPSHOT</version>
<name>rest</name>
<name>${project.groupId}:${project.artifactId}</name>
<description>Demo project for taskana-rest-spring</description>
<parent>
@ -25,7 +26,6 @@
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>

View File

@ -4,10 +4,14 @@
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>
<artifactId>taskana-rest-spring-test</artifactId>
<version>1.1.2-SNAPSHOT</version>
<name>${project.groupId}:${project.artifactId}</name>
<description>Exclusive test module. Contains integration tests and build rest-doc.</description>
<parent>
<artifactId>taskana-rest-parent</artifactId>
<groupId>pro.taskana</groupId>
<artifactId>taskana-rest-parent</artifactId>
<version>1.1.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

View File

@ -2,11 +2,15 @@
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>
<artifactId>taskana-rest-spring-wildfly-example</artifactId>
<version>1.1.2-SNAPSHOT</version>
<packaging>war</packaging>
<name>${project.groupId}:${project.artifactId}</name>
<description>Demo project for the taskana REST APP in a wildfly environment.</description>
<parent>
<artifactId>taskana-rest-parent</artifactId>
<groupId>pro.taskana</groupId>
<artifactId>taskana-rest-parent</artifactId>
<version>1.1.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@ -46,12 +50,6 @@
</dependency>
</dependencies>
</dependencyManagement>
<repositories>
<repository>
<id>jboss</id>
<url>http://repository.jboss.org/nexus/content/groups/public-jboss/</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
@ -300,4 +298,11 @@
</plugin>
</plugins>
</build>
<repositories>
<repository>
<id>jboss</id>
<url>http://repository.jboss.org/nexus/content/groups/public-jboss/</url>
</repository>
</repositories>
</project>

View File

@ -3,13 +3,14 @@
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>
<artifactId>taskana-rest-spring</artifactId>
<version>1.1.2-SNAPSHOT</version>
<name>${project.groupId}:${project.artifactId}</name>
<description>The taskana rest logic.</description>
<parent>
<artifactId>taskana-rest-parent</artifactId>
<groupId>pro.taskana</groupId>
<artifactId>taskana-rest-parent</artifactId>
<version>1.1.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@ -101,8 +102,8 @@
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>

View File

@ -2,14 +2,14 @@
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>
<artifactId>taskana-web</artifactId>
<version>1.1.2-SNAPSHOT</version>
<name>${project.groupId}:${project.artifactId}</name>
<description>taskana web</description>
<parent>
<artifactId>taskana-rest-parent</artifactId>
<groupId>pro.taskana</groupId>
<artifactId>taskana-rest-parent</artifactId>
<version>1.1.2-SNAPSHOT</version>
<relativePath>../rest</relativePath>
</parent>