From 7d04c23c7c51738d68f325e450ac408c1ae9905f Mon Sep 17 00:00:00 2001
From: liamfallon <liam.fallon@est.tech>
Date: Tue, 29 Jun 2021 17:13:09 +0100
Subject: Update CLAMP: checkstyle 8.43/Spring dependencies

Updates are indentation changes on annotations and rationallization of
the dependencies for Spring/Springboot

Generation of swagger.json, swagger.html and swagger.pdf temporarily
disabled due to a missing dependency in the generation toolchain.

Issue-ID: POLICY-3209
Change-Id: Iff5881df45ef54b20fa30f63e2393cc1cdbf4bfe
Signed-off-by: liamfallon <liam.fallon@est.tech>
---
 runtime/pom.xml | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

(limited to 'runtime/pom.xml')

diff --git a/runtime/pom.xml b/runtime/pom.xml
index 4a3ca11a7..0e458eabb 100644
--- a/runtime/pom.xml
+++ b/runtime/pom.xml
@@ -187,22 +187,18 @@
         <dependency>
             <groupId>org.apache.tomcat.embed</groupId>
             <artifactId>tomcat-embed-core</artifactId>
-            <version>${version.tomcat}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tomcat.embed</groupId>
             <artifactId>tomcat-embed-el</artifactId>
-            <version>${version.tomcat}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tomcat.embed</groupId>
             <artifactId>tomcat-embed-websocket</artifactId>
-            <version>${version.tomcat}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tomcat</groupId>
             <artifactId>tomcat-annotations-api</artifactId>
-            <version>${version.tomcat}</version>
         </dependency>
         <!-- For CAMEL -->
         <dependency>
@@ -249,7 +245,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-            <version>${version.springboot}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.springframework.boot</groupId>
@@ -260,7 +255,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-tomcat</artifactId>
-            <version>${version.springboot}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.glassfish</groupId>
@@ -275,17 +269,14 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>
-            <version>${version.springboot}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-autoconfigure</artifactId>
-            <version>${version.springboot}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
-            <version>${version.springboot}</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -297,7 +288,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
-            <version>${version.springboot}</version>
         </dependency>
         <!-- Policy dependencies mainly for the models required -->
         <dependency>
@@ -407,7 +397,6 @@
         <dependency>
             <groupId>org.onap.sdc.sdc-tosca</groupId>
             <artifactId>sdc-tosca</artifactId>
-            <version>1.5.1</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.fasterxml.jackson.core</groupId>
@@ -584,7 +573,7 @@
             </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 way -->
-            <plugin>
+            <!-- plugin>
                 <groupId>io.github.swagger2markup</groupId>
                 <artifactId>swagger2markup-maven-plugin</artifactId>
                 <version>1.3.3</version>
@@ -615,11 +604,11 @@
                         </goals>
                     </execution>
                 </executions>
-            </plugin>
+            </plugin-->
 
             <!-- Run the generated asciidoc through Asciidoctor to generate other documentation
                 types, such as PDFs or HTML5 -->
-            <plugin>
+            <!-- plugin>
                 <groupId>org.asciidoctor</groupId>
                 <artifactId>asciidoctor-maven-plugin</artifactId>
                 <version>1.5.7.1</version>
@@ -670,7 +659,7 @@
                         </configuration>
                     </execution>
                 </executions>
-            </plugin>
+            </plugin-->
             <plugin>
                 <groupId>org.codehaus.groovy.maven</groupId>
                 <artifactId>gmaven-plugin</artifactId>
@@ -809,7 +798,6 @@
             <plugin>
                 <groupId>io.fabric8</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
-                <version>0.35.0</version>
                 <dependencies>
                     <dependency>
                         <groupId>org.apache.httpcomponents</groupId>
@@ -970,7 +958,6 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>${jacoco.version}</version>
                 <configuration>
                     <dumpOnExit>true</dumpOnExit>
                     <append>true</append>
@@ -1040,7 +1027,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>versions-maven-plugin</artifactId>
-                <version>1.3.1</version>
             </plugin>
 
             <plugin>
@@ -1128,12 +1114,10 @@
             <plugin>
                 <groupId>org.sonarsource.scanner.maven</groupId>
                 <artifactId>sonar-maven-plugin</artifactId>
-                <version>${sonar.scanner.version}</version>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
-                <version>1.3.2</version>
                 <executions>
                     <execution>
                         <id>libIndexCheck</id>
-- 
cgit 1.2.3-korg