change -1 to No Limit in View All Templates for # Instances Allowed

[clamp.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index a77f9d9..6eb411a 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
        <modelVersion>4.0.0</modelVersion>
        <groupId>org.onap.clamp</groupId>
        <artifactId>clds</artifactId>
-       <version>5.0.0-SNAPSHOT</version>
+       <version>5.1.0-SNAPSHOT</version>
        <name>clamp</name>
 
 
@@ -77,7 +77,7 @@
 
                <eelf.core.version>1.0.0</eelf.core.version>
                <camel.version>2.25.0</camel.version>
-               <springboot.version>2.2.5.RELEASE</springboot.version>
+               <springboot.version>2.2.6.RELEASE</springboot.version>
 
                <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
                <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
@@ -254,39 +254,6 @@
        </dependencyManagement>
 
        <dependencies>
-               <dependency>
-                       <groupId>org.apache.xmlgraphics</groupId>
-                       <artifactId>batik-svggen</artifactId>
-                       <version>1.11</version>
-                       <exclusions>
-                       <exclusion>
-                               <groupId>xml-apis</groupId>
-                               <artifactId>xml-apis</artifactId>
-                       </exclusion>
-                       </exclusions>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.xmlgraphics</groupId>
-                       <artifactId>batik-svg-dom</artifactId>
-                       <version>1.11</version>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>xml-apis</groupId>
-                                       <artifactId>xml-apis</artifactId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.xmlgraphics</groupId>
-                       <artifactId>batik-transcoder</artifactId>
-                       <version>1.11</version>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>xml-apis</groupId>
-                                       <artifactId>xml-apis</artifactId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
                <dependency>
                        <groupId>com.att.eelf</groupId>
                        <artifactId>eelf-core</artifactId>
@@ -366,6 +333,11 @@
                                </exclusion>
                        </exclusions>
                </dependency>
+               <dependency>
+                       <groupId>javax.xml.ws</groupId>
+                       <artifactId>jaxws-api</artifactId>
+                       <version>2.3.1</version>
+               </dependency>
                <dependency>
                        <groupId>javax.xml.bind</groupId>
                        <artifactId>jaxb-api</artifactId>
@@ -497,6 +469,11 @@
                        <version>1.3</version>
                </dependency>
                <!-- Other dependencies to fix nexus IQ reported vulnerabilities -->
+               <dependency>
+                       <groupId>org.springframework.security</groupId>
+                       <artifactId>spring-security-web</artifactId>
+                       <version>5.2.3.RELEASE</version>
+               </dependency>
                <dependency>
                        <groupId>org.codehaus.plexus</groupId>
                        <artifactId>plexus-utils</artifactId>
@@ -539,6 +516,12 @@
                        <artifactId>snakeyaml</artifactId>
                        <version>1.26</version>
                </dependency>
+               <dependency>
+                       <groupId>org.dom4j</groupId>
+                       <artifactId>dom4j</artifactId>
+                       <version>2.1.3</version>
+               </dependency>
+
                <!-- TESTING -->
                <dependency>
                        <groupId>org.assertj</groupId>
@@ -564,6 +547,18 @@
                        <version>2.0.4</version>
                        <scope>test</scope>
                </dependency>
+               <dependency>
+                       <groupId>com.github.docker-java</groupId>
+                       <artifactId>docker-java-core</artifactId>
+                       <version>3.2.1</version>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>com.github.docker-java</groupId>
+                       <artifactId>docker-java</artifactId>
+                       <version>3.2.1</version>
+                       <scope>test</scope>
+               </dependency>
        </dependencies>
 
        <build>
@@ -867,6 +862,7 @@
                                                                <portName>docker.mariadb.port.host</portName>
                                                                <portName>docker.http-cache.port.host</portName>
                                                                <portName>clamp.it.tests.http-redirected</portName>
+                                                               <portName>clamp.it.tests.robotframework.http</portName>
                                                                <portName>clamp.it.tests.https</portName>
                                                                <portName>clamp.it.tests.http</portName>
                                                        </portNames>
@@ -918,7 +914,7 @@
                                                        <includes>
                                                                <include>**/*ItCase.java</include>
                                                        </includes>
-                                                       <forkCount>1C</forkCount>
+                                                       <forkCount>1</forkCount>
                                                        <reuseForks>true</reuseForks>
                                                        <useSystemClassLoader>false</useSystemClassLoader>
                                                        <argLine>${failsafeArgLine}</argLine>
@@ -1227,7 +1223,6 @@
                                                </goals>
                                                <phase>deploy</phase>
                                                <configuration>
-                                                       <skip>true</skip>
                                                        <workingDirectory>${project.build.directory}/${ui.react.lib.src}</workingDirectory>
                                                        <arguments>publish</arguments>
                                                </configuration>
@@ -1248,6 +1243,26 @@
                                <artifactId>sonar-maven-plugin</artifactId>
                                <version>3.7.0.1746</version>
                        </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.3.2</version>             
+                <executions>  
+                    <execution>
+                        <id>libIndexCheck</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <executable>bash</executable>
+                    <arguments>
+                        <argument>${project.basedir}/src/main/script/checkLibIndex.sh</argument>
+                    </arguments>
+                </configuration>
+          </plugin>
                </plugins>
        </build>
 </project>