From: Liam Fallon <liam.fallon@est.tech>
Date: Tue, 15 Jun 2021 14:24:29 +0000 (+0000)
Subject: Merge "Update plugins in Lifecycle Mapping for CLAMP"
X-Git-Tag: 3.4.0~26
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=8774b9eacbf47fc5d7fdb70acedd74c0721f98a3;hp=-c;p=policy%2Fparent.git

Merge "Update plugins in Lifecycle Mapping for CLAMP"
---

8774b9eacbf47fc5d7fdb70acedd74c0721f98a3
diff --combined integration/pom.xml
index 27cb294b,8a6d4de2..6031499e
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@@ -48,13 -48,6 +48,13 @@@
          <version.javax.bind>2.3.1</version.javax.bind>
          <version.javax.json>1.1.4</version.javax.json>
          <version.netty>4.1.63.Final</version.netty>
 +        <version.springboot>2.5.0</version.springboot>
 +        <version.eelf.core>1.0.0</version.eelf.core>
 +        <version.camel>3.7.3</version.camel>
 +        <version.tomcat>9.0.45</version.tomcat>
 +        <version.mockserver>5.11.2</version.mockserver>
 +        <version.immutable>2.8.8</version.immutable>
 +        <version.springfox>3.0.0</version.springfox>
          <jacoco.dataFile>${project.basedir}/../target/code-coverage/jacoco-ut.exec</jacoco.dataFile>
          <repo.npm>https://nexus3.onap.org/repository/npm.public/npm/-/</repo.npm>
      </properties>
@@@ -603,7 -596,7 +603,7 @@@
                                              <pluginExecutionFilter>
                                                  <groupId>de.jpdigital</groupId>
                                                  <artifactId>hibernate52-ddl-maven-plugin</artifactId>
-                                                 <versionRange>[2.3.0,)</versionRange>
+                                                 <versionRange>[2.2.0,)</versionRange>
                                                  <goals>
                                                      <goal>gen-ddl</goal>
                                                  </goals>
@@@ -649,6 -642,19 +649,19 @@@
                                              </pluginExecutionFilter>
                                              <action>
                                                  <ignore />
+                                             </action>
+                                         </pluginExecution>
+                                         <pluginExecution>
+                                             <pluginExecutionFilter>
+                                                 <groupId>com.github.eirslett</groupId>
+                                                 <artifactId>frontend-maven-plugin</artifactId>
+                                                 <versionRange>[1.11.0,)</versionRange>
+                                                 <goals>
+                                                     <goal>npm</goal>
+                                                 </goals>
+                                             </pluginExecutionFilter>
+                                             <action>
+                                                 <ignore />
                                              </action>
                                          </pluginExecution>
                                      </pluginExecutions>