Merge "Removal of useless test files"

[clamp.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 9f759e1..fe2ca72 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>
@@ -795,6 +778,7 @@
                                <version>1.0</version>
                                <executions>
                                        <execution>
+                                               <id>docker-tags</id>
                                                <phase>validate</phase>
                                                <goals>
                                                        <goal>execute</goal>
@@ -803,14 +787,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>