Merge "Fix the stage builds"

diff --combined pom.xml
index 9f759e1,5ad66d2..a77f9d9
--- 1/pom.xml
--- 2/pom.xml
+++ b/pom.xml
@@@ -99,7 -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>
@@@ -428,10 -428,6 +428,10 @@@
                                        <groupId>javax.servlet</groupId>
                                        <artifactId>servlet-api</artifactId>
                                </exclusion>
 +                              <exclusion>
 +                                      <groupId>log4j</groupId>
 +                                      <artifactId>log4j</artifactId>
 +                              </exclusion>
                        </exclusions>
                </dependency>
                <dependency>
@@@ -795,6 -791,7 +795,7 @@@
                                <version>1.0</version>
                                <executions>
                                        <execution>
+                                               <id>docker-tags</id>
                                                <phase>validate</phase>
                                                <goals>
                                                        <goal>execute</goal>
@@@ -803,14 -800,8 +804,8 @@@
                                                        <source>${project.basedir}/src/main/script/TagVersion.groovy</source>
                                                </configuration>
                                        </execution>
-                               </executions>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.codehaus.groovy.maven</groupId>
-                               <artifactId>gmaven-plugin</artifactId>
-                               <version>1.0</version>
-                               <executions>
                                        <execution>
+                                               <id>npm-repos-selection</id>
                                                <phase>validate</phase>
                                                <goals>
                                                        <goal>execute</goal>