Skip to content

Commit

Permalink
chore(starter): run qa module by default without ITs
Browse files Browse the repository at this point in the history
* use auto-lookup of parent pom in parent directory
* run `starter-qa` in profiles `distro` (active by default)
  and `integration-test-spring-boot-starter`
* activate failsafe plugin (ITs) in integration test profile only
  (for all starter modules)
* deactivate surefire plugin for `starter-qa` in distro (active by default)

* run `distro` to run all modules, surefire enabled (except for `starter-qa`)
* run `integration-...` to run all modules, surefire and failsafe enabled

related to CAM-11517
  • Loading branch information
tmetzke authored and koevskinikola committed Mar 10, 2020
1 parent 0440e15 commit c682bf7
Show file tree
Hide file tree
Showing 12 changed files with 186 additions and 139 deletions.
39 changes: 25 additions & 14 deletions spring-boot-starter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
<groupId>org.camunda.bpm</groupId>
<artifactId>camunda-root</artifactId>
<version>7.13.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>

<groupId>org.camunda.bpm.springboot.project</groupId>
Expand Down Expand Up @@ -82,11 +81,36 @@
</plugins>
</build>
</profile>
<profile>
<id>distro</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<modules>
<module>starter-qa</module>
</modules>
</profile>
<profile>
<id>integration-test-spring-boot-starter</id>
<modules>
<module>starter-qa</module>
</modules>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

Expand Down Expand Up @@ -132,19 +156,6 @@
</pluginManagement>

<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<groupId>org.camunda.bpm.springboot.project</groupId>
<artifactId>camunda-bpm-spring-boot-starter-qa</artifactId>
<version>7.13.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>

<packaging>pom</packaging>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<groupId>org.camunda.bpm.springboot.project</groupId>
<artifactId>qa-plugins</artifactId>
<version>7.13.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>

<packaging>pom</packaging>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<groupId>org.camunda.bpm.springboot.project</groupId>
<artifactId>qa-plugins-spin</artifactId>
<version>7.13.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>

<artifactId>qa-plugins-spin-dataformat-all</artifactId>
Expand Down Expand Up @@ -38,31 +37,36 @@
</dependency>

</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
<executions>
<execution>
<id>pre-integration-test</id>
<goals>
<goal>start</goal>
</goals>
</execution>
<execution>
<id>post-integration-test</id>
<goals>
<goal>stop</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>integration-test-spring-boot-starter</id>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
<executions>
<execution>
<id>pre-integration-test</id>
<goals>
<goal>start</goal>
</goals>
</execution>
<execution>
<id>post-integration-test</id>
<goals>
<goal>stop</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<groupId>org.camunda.bpm.springboot.project</groupId>
<artifactId>qa-plugins-spin</artifactId>
<version>7.13.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>

<artifactId>qa-plugins-spin-dataformat-json-jackson</artifactId>
Expand Down Expand Up @@ -47,30 +46,35 @@

</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
<executions>
<execution>
<id>pre-integration-test</id>
<goals>
<goal>start</goal>
</goals>
</execution>
<execution>
<id>post-integration-test</id>
<goals>
<goal>stop</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>integration-test-spring-boot-starter</id>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
<executions>
<execution>
<id>pre-integration-test</id>
<goals>
<goal>start</goal>
</goals>
</execution>
<execution>
<id>post-integration-test</id>
<goals>
<goal>stop</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>
56 changes: 30 additions & 26 deletions spring-boot-starter/starter-qa/integration-test-simple/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<groupId>org.camunda.bpm.springboot.project</groupId>
<artifactId>camunda-bpm-spring-boot-starter-qa</artifactId>
<version>7.13.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>

<artifactId>qa-simple</artifactId>
Expand Down Expand Up @@ -35,30 +34,35 @@

</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
<executions>
<execution>
<id>pre-integration-test</id>
<goals>
<goal>start</goal>
</goals>
</execution>
<execution>
<id>post-integration-test</id>
<goals>
<goal>stop</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>integration-test-spring-boot-starter</id>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
<executions>
<execution>
<id>pre-integration-test</id>
<goals>
<goal>start</goal>
</goals>
</execution>
<execution>
<id>post-integration-test</id>
<goals>
<goal>stop</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<groupId>org.camunda.bpm.springboot.project</groupId>
<artifactId>qa-webapp</artifactId>
<version>7.13.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>

<artifactId>qa-webapp-invoice-example</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<groupId>org.camunda.bpm.springboot.project</groupId>
<artifactId>camunda-bpm-spring-boot-starter-qa</artifactId>
<version>7.13.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>

<packaging>pom</packaging>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<groupId>org.camunda.bpm.springboot.project</groupId>
<artifactId>qa-webapp-runtimes</artifactId>
<version>7.13.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>

<artifactId>qa-webapp-ce-runtime</artifactId>
Expand All @@ -24,24 +23,29 @@

</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.googlecode.maven-download-plugin</groupId>
<artifactId>download-maven-plugin</artifactId>
</plugin>
</plugins>

<testResources>
<testResource>
<directory>src/test/resources</directory>
<filtering>true</filtering>
</testResource>
</testResources>
</build>
<profiles>
<profile>
<id>integration-test-spring-boot-starter</id>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.googlecode.maven-download-plugin</groupId>
<artifactId>download-maven-plugin</artifactId>
</plugin>
</plugins>

<testResources>
<testResource>
<directory>src/test/resources</directory>
<filtering>true</filtering>
</testResource>
</testResources>
</build>
</profile>
</profiles>

</project>
Loading

0 comments on commit c682bf7

Please sign in to comment.