Merge "Remove unnecessary version properties"

diff --git a/pom.xml b/pom.xml
index 45c39dc..a2eb0b3 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -36,58 +36,26 @@
         <app>org.onap.cps.ncmp.Application</app>
         <base.image>${docker.pull.registry}/onap/integration-java11:8.0.0</base.image>
         <cps.version>1.1.0-SNAPSHOT</cps.version>
-        <findbugs.slf4j.version>1.5.0</findbugs.slf4j.version>
-        <groovy.version>3.0.8</groovy.version>
         <image.tag>${project.version}-${maven.build.timestamp}</image.tag>
-        <jacoco.maven.plugin.version>0.8.5</jacoco.maven.plugin.version>
         <jacoco.minimum.coverage>0.7</jacoco.minimum.coverage>
-        <java.version>11</java.version>
-        <jib-maven-plugin.version>2.8.0</jib-maven-plugin.version>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
-        <oparent.version>3.2.0</oparent.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spock-core.version>2.0-M5-groovy-3.0</spock-core.version>
-        <spock-spring.version>2.0-M5-groovy-3.0</spock-spring.version>
-        <spotbug.maven.plugin.version>4.1.3</spotbug.maven.plugin.version>
-        <springboot.version>2.5.0</springboot.version>
-        <springfox.version>3.0.0</springfox.version>
-        <swagger.version>2.1.4</swagger.version>
-        <swagger-annotations-version>1.6.2</swagger-annotations-version>
-        <swagger-codegen-maven-plugin.version>3.0.18</swagger-codegen-maven-plugin.version>
     </properties>
     <dependencyManagement>
         <dependencies>
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>${springboot.version}</version>
+                <version>2.5.0</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            <dependency>
-                <groupId>io.swagger</groupId>
-                <artifactId>swagger-annotations</artifactId>
-                <version>${swagger-annotations-version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.springfox</groupId>
-                <artifactId>springfox-boot-starter</artifactId>
-                <version>${springfox.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.codehaus.groovy</groupId>
-                <artifactId>groovy</artifactId>
-                <version>${groovy.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.spockframework</groupId>
-                <artifactId>spock-core</artifactId>
-                <version>${spock-core.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.spockframework</groupId>
-                <artifactId>spock-spring</artifactId>
-                <version>${spock-spring.version}</version>
+                <artifactId>spock-bom</artifactId>
+                <version>2.0-M5-groovy-3.0</version>
+                <type>pom</type>
+                <scope>import</scope>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -103,7 +71,6 @@
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy</artifactId>
-            <version>${groovy.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -129,11 +96,12 @@
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>${swagger-annotations-version}</version>
+            <version>1.6.2</version>
         </dependency>
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-boot-starter</artifactId>
+            <version>3.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -168,7 +136,7 @@
             <plugin>
                 <groupId>io.swagger.codegen.v3</groupId>
                 <artifactId>swagger-codegen-maven-plugin</artifactId>
-                <version>${swagger-codegen-maven-plugin.version}</version>
+                <version>3.0.18</version>
                 <executions>
                     <execution>
                         <goals>
@@ -261,7 +229,7 @@
             <plugin>
                 <groupId>com.github.spotbugs</groupId>
                 <artifactId>spotbugs-maven-plugin</artifactId>
-                <version>${spotbug.maven.plugin.version}</version>
+                <version>4.1.3</version>
                 <executions>
                     <execution>
                         <id>analyze-compile</id>
@@ -284,7 +252,7 @@
                         <plugin>
                             <groupId>jp.skypencil.findbugs.slf4j</groupId>
                             <artifactId>bug-pattern</artifactId>
-                            <version>${findbugs.slf4j.version}</version>
+                            <version>1.5.0</version>
                         </plugin>
                     </plugins>
                     <effort>Max</effort>
@@ -298,7 +266,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>${jacoco.maven.plugin.version}</version>
+                <version>0.8.5</version>
                 <configuration>
                     <excludes>
                         <exclude>org/onap/cps/ncmp/rest/model/*</exclude>
@@ -352,7 +320,7 @@
                 <plugin>
                     <groupId>com.google.cloud.tools</groupId>
                     <artifactId>jib-maven-plugin</artifactId>
-                    <version>${jib-maven-plugin.version}</version>
+                    <version>2.8.0</version>
                     <configuration>
                         <container>
                             <mainClass>${app}</mainClass>