From: Liam Fallon <liam.fallon@est.tech>
Date: Wed, 16 Jun 2021 08:23:24 +0000 (+0000)
Subject: Merge "Adding dependencies and plugins from clamp to parent/integration"
X-Git-Tag: 3.4.0~25
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=cc22a32fb9e2e05f8399f66a4c649ec3ad31857f;hp=-c;p=policy%2Fparent.git

Merge "Adding dependencies and plugins from clamp to parent/integration"
---

cc22a32fb9e2e05f8399f66a4c649ec3ad31857f
diff --combined integration/pom.xml
index 6031499e,cbaf12f6..dab14d4a
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@@ -68,6 -68,24 +68,24 @@@
  
      <dependencyManagement>
          <dependencies>
+             <!-- Spring BOM -->
+             <dependency>
+                 <groupId>org.springframework.boot</groupId>
+                 <artifactId>spring-boot-dependencies</artifactId>
+                 <version>${version.springboot}</version>
+                 <type>pom</type>
+                 <scope>import</scope>
+             </dependency>
+ 
+             <!-- Camel BOM -->
+             <dependency>
+                 <groupId>org.apache.camel.springboot</groupId>
+                 <artifactId>camel-spring-boot-bom</artifactId>
+                 <version>${version.camel}</version>
+                 <type>pom</type>
+                 <scope>import</scope>
+             </dependency>
+ 
              <!-- Jackson - needed by glassfish jersey -->
              <dependency>
                  <groupId>com.fasterxml.jackson.module</groupId>
@@@ -425,6 -443,108 +443,108 @@@
                  <version>${version.drools}</version>
              </dependency>
  
+             <dependency>
+                 <groupId>org.dom4j</groupId>
+                 <artifactId>dom4j</artifactId>
+                 <version>2.1.3</version>
+             </dependency>
+ 
+             <!-- Mockserver -->
+             <dependency>
+                 <groupId>org.mock-server</groupId>
+                 <artifactId>mockserver-netty</artifactId>
+                 <version>${version.mockserver}</version>
+                 <scope>test</scope>
+             </dependency>
+ 
+             <dependency>
+                 <groupId>org.mock-server</groupId>
+                 <artifactId>mockserver-client-java</artifactId>
+                 <version>${version.mockserver}</version>
+                 <scope>test</scope>
+             </dependency>
+ 
+             <!-- Immutables -->
+             <dependency>
+                 <groupId>org.immutables</groupId>
+                 <artifactId>value</artifactId>
+                 <version>${version.immutable}</version>
+                 <scope>provided</scope>
+             </dependency>
+ 
+             <dependency>
+                 <groupId>org.immutables</groupId>
+                 <artifactId>gson</artifactId>
+                 <version>${version.immutable}</version>
+             </dependency>
+ 
+             <!-- Springfox -->
+             <dependency>
+                 <groupId>io.springfox</groupId>
+                 <artifactId>springfox-swagger2</artifactId>
+                 <version>${version.springfox}</version>
+             </dependency>
+ 
+             <dependency>
+                 <groupId>io.springfox</groupId>
+                 <artifactId>springfox-swagger-ui</artifactId>
+                 <version>${version.springfox}</version>
+                 <scope>runtime</scope>
+             </dependency>
+ 
+             <!-- File upload -->
+             <dependency>
+                 <groupId>commons-fileupload</groupId>
+                 <artifactId>commons-fileupload</artifactId>
+                 <version>1.4</version>
+             </dependency>
+ 
+             <!-- Janino -->
+             <dependency>
+                 <groupId>org.codehaus.janino</groupId>
+                 <artifactId>janino</artifactId>
+                 <version>3.0.8</version>
+             </dependency>
+ 
+             <!-- Tomcat -->
+             <dependency>
+                 <groupId>org.apache.tomcat.embed</groupId>
+                 <artifactId>tomcat-embed-core</artifactId>
+                 <version>${version.tomcat}</version>
+             </dependency>
+ 
+             <!-- jaxws -->
+             <dependency>
+                 <groupId>javax.xml.ws</groupId>
+                 <artifactId>jaxws-api</artifactId>
+                 <version>2.3.1</version>
+             </dependency>
+ 
+             <dependency>
+                 <groupId>org.onap.sdc.sdc-distribution-client</groupId>
+                 <artifactId>sdc-distribution-client</artifactId>
+                 <version>1.4.1</version>
+             </dependency>
+ 
+             <dependency>
+             <groupId>org.onap.sdc.sdc-tosca</groupId>
+             <artifactId>sdc-tosca</artifactId>
+             <version>1.5.1</version>
+             </dependency>
+ 
+             <dependency>
+                 <groupId>org.jboss.spec.javax.ws.rs</groupId>
+                 <artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
+                 <version>1.0.1.Final</version>
+             </dependency>
+ 
+             <!-- transaction api -->
+             <dependency>
+                 <groupId>javax.transaction</groupId>
+                 <artifactId>jta</artifactId>
+                 <version>1.1</version>
+             </dependency>
+ 
              <!-- Test dependencies -->
  
              <!-- In memory Database Engine -->
@@@ -443,6 -563,14 +563,14 @@@
                  <scope>test</scope>
              </dependency>
  
+             <!-- Junit vintage -->
+             <dependency>
+                 <groupId>org.junit.vintage</groupId>
+                 <artifactId>junit-vintage-engine</artifactId>
+                 <version>5.7.1</version>
+                 <scope>test</scope>
+             </dependency>
+ 
              <!-- Cucumber Tests -->
              <dependency>
                  <groupId>io.cucumber</groupId>
@@@ -541,6 -669,32 +669,32 @@@
                  <artifactId>commons-io</artifactId>
                  <version>2.8.0</version>
              </dependency>
+ 
+             <dependency>
+             <groupId>org.apache.commons</groupId>
+             <artifactId>commons-vfs2</artifactId>
+             <version>2.8.0</version>
+             </dependency>
+ 
+             <dependency>
+                 <groupId>com.googlecode.json-simple</groupId>
+                 <artifactId>json-simple</artifactId>
+                 <version>1.1.1</version>
+             </dependency>
+ 
+             <dependency>
+                 <groupId>com.github.docker-java</groupId>
+                 <artifactId>docker-java-core</artifactId>
+                 <version>3.2.7</version>
+                 <scope>test</scope>
+             </dependency>
+ 
+             <dependency>
+                 <groupId>com.github.docker-java</groupId>
+                 <artifactId>docker-java</artifactId>
+                 <version>3.2.7</version>
+                 <scope>test</scope>
+             </dependency>
          </dependencies>
  
      </dependencyManagement>
@@@ -603,7 -757,7 +757,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>
@@@ -651,19 -805,6 +805,19 @@@
                                                  <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>
                                  </lifecycleMappingMetadata>
                              </configuration>
@@@ -787,6 -928,11 +941,11 @@@
                      <version>${version.drools}</version>
                      <extensions>true</extensions>
                  </plugin>
+                 <plugin>
+                     <groupId>org.springframework.boot</groupId>
+                     <artifactId>spring-boot-maven-plugin</artifactId>
+                     <version>${version.springboot}</version>
+                 </plugin>
              </plugins>
          </pluginManagement>