Merge "Improve tests"

[clamp.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 3a0cc25..99b7e52 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -145,17 +145,17 @@
 
                <distributionManagement>
                                <repository>
-                                               <id>onap-releases</id>
+                                               <id>ecomp-releases</id>
                                                <name>Clamp Release Repository</name>
                                                <url>https://nexus.onap.org/content/repositories/releases/</url>
                                </repository>
                                <snapshotRepository>
-                                               <id>onap-snapshots</id>
+                                               <id>ecomp-snapshots</id>
                                                <name>Clamp Snapshot Repository</name>
                                                <url>https://nexus.onap.org/content/repositories/snapshots/</url>
                                </snapshotRepository>
                                <site>
-                                               <id>onap-site</id>
+                                               <id>ecomp-site</id>
                                                <url>dav:https://nexus.onap.org/content/sites/site/org/onap/clamp/${project.version}</url>
                                </site>
                </distributionManagement>
@@ -167,17 +167,17 @@
                                                <url>http://repo2.maven.org/maven2/</url>
                                </repository>
                                <repository>
-                                               <id>onap-releases</id>
+                                               <id>ecomp-releases</id>
                                                <name>ONAP Release Repository</name>
                                                <url>https://nexus.onap.org/content/repositories/releases/</url>
                                </repository>
                                <repository>
-                                               <id>onap-staging</id>
+                                               <id>ecomp-staging</id>
                                                <name>ONAP Staging Repository</name>
                                                <url>https://nexus.onap.org/content/repositories/staging/</url>
                                </repository>
                                <repository>
-                                               <id>onap-snapshots</id>
+                                               <id>ecomp-snapshots</id>
                                                <name>ONAP Snapshot Repository</name>
                                                <url>https://nexus.onap.org/content/repositories/snapshots/</url>
                                                <snapshots>
@@ -334,6 +334,15 @@
                                                                </exclusion>
                                                </exclusions>
                                </dependency>
+                               <dependency>
+                                       <groupId>org.springframework.boot</groupId>
+                                       <artifactId>spring-boot-starter-data-jpa</artifactId>
+                               </dependency>
+                               <dependency>
+                                       <groupId>com.vladmihalcea</groupId>
+                                       <artifactId>hibernate-types-52</artifactId>
+                                       <version>2.4.1</version>
+                               </dependency>
                                <!-- Others dependencies -->
                                <dependency>
                                        <groupId>org.onap.aaf.authz</groupId>
@@ -684,36 +693,26 @@
 
                                <plugins>
                                                <plugin>
-                                                       <groupId>org.sonatype.plugins</groupId>
-                                                       <artifactId>port-allocator-maven-plugin</artifactId>
-                                                       <version>1.2</version>
+                                                       <groupId>de.jpdigital</groupId>
+                                                       <artifactId>hibernate52-ddl-maven-plugin</artifactId>
+                                                       <version>2.2.0</version>
                                                        <executions>
                                                                <execution>
-                                                                       <phase>validate</phase>
+                                                                       <phase>process-classes</phase>
                                                                        <goals>
-                                                                               <goal>allocate-ports</goal>
+                                                                               <goal>gen-ddl</goal>
                                                                        </goals>
                                                                        <configuration>
-                                                                               <ports>
-                                                                                       <port>
-                                                                                               <name>docker.mariadb.port.host</name>
-                                                                                       </port>
-                                                                                       <port>
-                                                                                               <name>docker.http-cache.port.host</name>
-                                                                                       </port>
-                                                                                       <port>
-                                                                                               <name>clamp.it.tests.http-redirected</name>
-                                                                                       </port>
-                                                                                       <port>
-                                                                                               <name>clamp.it.tests.https</name>
-                                                                                       </port>
-                                                                                       <port>
-                                                                                               <name>clamp.it.tests.http</name>
-                                                                                       </port>
-                                                                               </ports>
+                                                                               <packages><param>org.onap.clamp.dao.model</param></packages>
+                                                                               <dialects><param>MARIADB53</param></dialects>
+                                                                               <outputDirectory>${project.basedir}/extra/sql/bulkload/</outputDirectory>
+                                                                               <outputFileNameSuffix>create-tables</outputFileNameSuffix>
+                                                                               <!-- <createDropStatements>true</createDropStatements> -->
+                                                                               <omitDialectFromFileName>true</omitDialectFromFileName>
                                                                        </configuration>
                                                                </execution>
                                                        </executions>
+                                       
                                                </plugin>
                                                <!-- Read the swagger.json file and the definition from SwaggerConfig.java;
                                                        generate a list of .adoc files containing the APIs info in more structured
@@ -866,6 +865,22 @@
                                                                                                                </artifacts>
                                                                                                </configuration>
                                                                                </execution>
+                                                                               <execution>
+                                                                                       <id>reserve-port-for-tests</id>
+                                                                                       <phase>process-resources</phase>
+                                                                                       <goals>
+                                                                                               <goal>reserve-network-port</goal>
+                                                                                       </goals>
+                                                                                       <configuration>
+                                                                                               <portNames>
+                                                                                                       <portName>docker.mariadb.port.host</portName>
+                                                                                                       <portName>docker.http-cache.port.host</portName>
+                                                                                                       <portName>clamp.it.tests.http-redirected</portName>
+                                                                                                       <portName>clamp.it.tests.https</portName>
+                                                                                                       <portName>clamp.it.tests.http</portName>
+                                                                                               </portNames>
+                                                                                       </configuration>
+                                                                               </execution>
                                                                </executions>
                                                </plugin>
 
@@ -952,7 +967,7 @@
                                                                                <apiVersion>1.35</apiVersion>
                                                                                <images>
                                                                                                <image>
-                                                                                                               <name>library/mariadb:10.1.11</name>
+                                                                                                               <name>library/mariadb:10.3.12</name>
                                                                                                                <alias>mariadb</alias>
                                                                                                                <run>
                                                                                                                                <env>