Skip to content

Commit

Permalink
#15 Update to Spring Boot 2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@christophd
christophd committed Jun 30, 2018
1 parent 3992334 commit f44acce
Show file tree
Hide file tree
Showing 26 changed files with 890 additions and 468 deletions.
16 changes: 8 additions & 8 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<citrus.version>2.7.3</citrus.version>
<spring.version>4.3.14.RELEASE</spring.version>
<spring.ws.version>2.4.2.RELEASE</spring.ws.version>
<spring.boot.version>1.5.10.RELEASE</spring.boot.version>
<citrus.version>2.8.0-SNAPSHOT</citrus.version>
<spring.version>5.0.7.RELEASE</spring.version>
<spring.ws.version>3.0.1.RELEASE</spring.ws.version>
<spring.boot.version>2.0.3.RELEASE</spring.boot.version>
<slf4j.version>1.7.25</slf4j.version>
<logback.classic.version>1.2.3</logback.classic.version>
<testng.version>6.11</testng.version>
<lombok.version>1.16.18</lombok.version>
<testng.version>6.14.3</testng.version>
<lombok.version>1.18.0</lombok.version>

<javadoc.options>-Xdoclint:none</javadoc.options>

Expand Down Expand Up @@ -365,7 +365,7 @@

<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.20.1</version>
<version>2.22.0</version>
<configuration>
<forkMode>once</forkMode>
<failIfNoTests>false</failIfNoTests>
Expand All @@ -374,7 +374,7 @@

<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.20.1</version>
<version>2.22.0</version>
<configuration>
<failIfNoTests>false</failIfNoTests>
</configuration>
Expand Down
128 changes: 85 additions & 43 deletions simulator-archetypes/archetype-jms/src/main/resources/archetype-resources/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<citrus.version>2.7.3</citrus.version>
<citrus.version>2.7.8-SNAPSHOT</citrus.version>
<citrus.simulator.version>1.1.0-SNAPSHOT</citrus.simulator.version>
<spring.boot.version>1.5.10.RELEASE</spring.boot.version>
<activemq.version>5.15.2</activemq.version>
<testng.version>6.11</testng.version>
<spring.boot.version>2.0.3.RELEASE</spring.boot.version>
<activemq.version>5.15.4</activemq.version>
<testng.version>6.14.3</testng.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -72,11 +72,6 @@
<artifactId>activemq-spring</artifactId>
<version>${activemq.version}</version>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
<version>4.4</version>
</dependency>

<dependency>
<groupId>org.testng</groupId>
Expand All @@ -101,7 +96,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.20</version>
<version>2.22.0</version>
<configuration>
<failIfNoTests>false</failIfNoTests>
</configuration>
Expand Down Expand Up @@ -131,26 +126,13 @@
<version>${activemq.version}</version>
<configuration>
<fork>false</fork>
<systemProperties>
<property>
<name>log4j.configuration</name>
<value>log4j.properties</value>
</property>
</systemProperties>
</configuration>
<executions>
<execution>
<id>start-activemq</id>
<phase>pre-integration-test</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<fork>true</fork>
</configuration>
</execution>
<execution>
<id>stop-activemq</id>
<phase>post-integration-test</phase>
<goals>
<goal>stop</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
Expand All @@ -162,28 +144,88 @@
</configuration>
<executions>
<execution>
<id>pre-integration-test</id>
<goals>
<goal>start</goal>
</goals>
<configuration>
<fork>true</fork>
<wait>1000</wait>
<maxAttempts>180</maxAttempts>
</configuration>
</execution>
<execution>
<id>post-integration-test</id>
<goals>
<goal>stop</goal>
<goal>repackage</goal>
</goals>
<configuration>
<fork>true</fork>
<classifier>executable</classifier>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>activemq-embedded</id>
<activation>
<property>
<name>embedded</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.activemq.tooling</groupId>
<artifactId>activemq-maven-plugin</artifactId>
<executions>
<execution>
<id>start-activemq</id>
<phase>pre-integration-test</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<fork>true</fork>
</configuration>
</execution>
<execution>
<id>stop-activemq</id>
<phase>post-integration-test</phase>
<goals>
<goal>stop</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>

<profile>
<id>simulator-embedded</id>
<activation>
<property>
<name>embedded</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<fork>true</fork>
</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>
60 changes: 42 additions & 18 deletions simulator-archetypes/archetype-mail/src/main/resources/archetype-resources/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<citrus.version>2.7.8-SNAPSHOT</citrus.version>
<citrus.simulator.version>1.1.0-SNAPSHOT</citrus.simulator.version>
<citrus.version>2.7.3</citrus.version>
<spring.boot.version>1.5.10.RELEASE</spring.boot.version>
<testng.version>6.11</testng.version>
<spring.boot.version>2.0.3.RELEASE</spring.boot.version>
<testng.version>6.14.3</testng.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -83,7 +83,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.20</version>
<version>2.22.0</version>
<configuration>
<failIfNoTests>false</failIfNoTests>
</configuration>
Expand Down Expand Up @@ -116,28 +116,52 @@
</configuration>
<executions>
<execution>
<id>pre-integration-test</id>
<goals>
<goal>start</goal>
<goal>repackage</goal>
</goals>
<configuration>
<fork>true</fork>
<wait>1000</wait>
<maxAttempts>180</maxAttempts>
</configuration>
</execution>
<execution>
<id>post-integration-test</id>
<goals>
<goal>stop</goal>
</goals>
<configuration>
<fork>true</fork>
<classifier>executable</classifier>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>simulator-embedded</id>
<activation>
<property>
<name>embedded</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<fork>true</fork>
</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>
59 changes: 42 additions & 17 deletions simulator-archetypes/archetype-rest/src/main/resources/archetype-resources/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<citrus.version>2.7.8-SNAPSHOT</citrus.version>
<citrus.simulator.version>1.1.0-SNAPSHOT</citrus.simulator.version>
<spring.boot.version>1.5.10.RELEASE</spring.boot.version>
<testng.version>6.11</testng.version>
<spring.boot.version>2.0.3.RELEASE</spring.boot.version>
<testng.version>6.14.3</testng.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -75,7 +76,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.20</version>
<version>2.22.0</version>
<configuration>
<failIfNoTests>false</failIfNoTests>
</configuration>
Expand Down Expand Up @@ -108,28 +109,52 @@
</configuration>
<executions>
<execution>
<id>pre-integration-test</id>
<goals>
<goal>start</goal>
<goal>repackage</goal>
</goals>
<configuration>
<fork>true</fork>
<wait>1000</wait>
<maxAttempts>180</maxAttempts>
</configuration>
</execution>
<execution>
<id>post-integration-test</id>
<goals>
<goal>stop</goal>
</goals>
<configuration>
<fork>true</fork>
<classifier>executable</classifier>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>simulator-embedded</id>
<activation>
<property>
<name>embedded</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<fork>true</fork>
</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>
Loading

0 comments on commit f44acce

Please sign in to comment.