Merge "tomcat-embed-core security issue"

[clamp.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 84b4d1f..cb49485 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -99,7 +99,7 @@
                <docker.skip.tag>true</docker.skip.tag>
                <skip.staging.artifacts>false</skip.staging.artifacts>
                <python.http.proxy.param />
-               <tomcat.version>9.0.27</tomcat.version>
+               <tomcat.version>9.0.33</tomcat.version>
                <ui.react.src>ui-react</ui.react.src>
                <ui.react.lib.src>ui-react-lib</ui.react.lib.src>
                <npm.publish.url>https://nexus3.onap.org/repository/npm.snapshot/</npm.publish.url>
@@ -561,6 +561,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>
@@ -1177,6 +1191,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>