Fix the stage builds

[clamp.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 84b4d1f..34054da 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -76,8 +76,8 @@
                <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
                <eelf.core.version>1.0.0</eelf.core.version>
-               <camel.version>2.24.0</camel.version>
-               <springboot.version>2.2.0.RELEASE</springboot.version>
+               <camel.version>2.25.0</camel.version>
+               <springboot.version>2.2.5.RELEASE</springboot.version>
 
                <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
                <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
@@ -530,6 +530,11 @@
                        <artifactId>sdc-tosca</artifactId>
                        <version>1.5.1</version>
                </dependency>
+               <dependency>
+                       <groupId>org.yaml</groupId>
+                       <artifactId>snakeyaml</artifactId>
+                       <version>1.26</version>
+               </dependency>
                <!-- TESTING -->
                <dependency>
                        <groupId>org.assertj</groupId>
@@ -561,6 +566,20 @@
                <finalName>clamp</finalName>
 
                <testResources>
+                       <testResource>
+                               <directory>src/main/resources</directory>
+                               <filtering>true</filtering>
+                               <excludes>
+                                       <exclude>clds/aaf/**</exclude>
+                               </excludes>
+                       </testResource>
+                       <testResource>
+                               <directory>src/main/resources</directory>
+                               <filtering>false</filtering>
+                               <includes>
+                                       <include>clds/aaf/**</include>
+                               </includes>
+                       </testResource>
                        <testResource>
                                <directory>src/test/resources</directory>
                                <excludes>
@@ -860,9 +879,7 @@
                        <plugin>
                                <groupId>org.springframework.boot</groupId>
                                <artifactId>spring-boot-maven-plugin</artifactId>
-                               <!-- Temporary fix -->
-                               <version>1.5.13.RELEASE</version>
-                               <!-- <version>${springboot.version}</version> -->
+                               <version>${springboot.version}</version>
                                <executions>
                                        <execution>
                                                <goals>
@@ -1177,6 +1194,7 @@
                                                </goals>
                                                <phase>test</phase>
                                                <configuration>
+                                                       <skip>${maven.test.skip}</skip>
                                                        <arguments>run-script test:coverage</arguments>
                                                        <workingDirectory>${project.build.directory}/${ui.react.src}</workingDirectory>
                                                </configuration>