X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=dcae-analytics%2Fdcae-analytics-tca-web%2Fpom.xml;fp=dcae-analytics%2Fdcae-analytics-tca-web%2Fpom.xml;h=7c81f4f88812f7748bf6717f8c586e0274218303;hb=9bb841d5faa995c2170057f93cd65303fba7979c;hp=86d332f0a54c671e22ac9b678e8161d787542fab;hpb=6302edb304f69068b108a69001d69bc6213b6a6a;p=dcaegen2%2Fanalytics%2Ftca-gen2.git

diff --git a/dcae-analytics/dcae-analytics-tca-web/pom.xml b/dcae-analytics/dcae-analytics-tca-web/pom.xml
index 86d332f..7c81f4f 100644
--- a/dcae-analytics/dcae-analytics-tca-web/pom.xml
+++ b/dcae-analytics/dcae-analytics-tca-web/pom.xml
@@ -3,6 +3,7 @@
   ~ ================================================================================
   ~ Copyright (c) 2018-2020 AT&T Intellectual Property. All rights reserved.
   ~ Copyright (c) 2021 Samsung Electronics. All rights reserved.
+  ~ Copyright (c) 2021 Nokia Intellectual Property. All rights reserved.
   ~ ================================================================================
   ~ Modifications Copyright (C) 2019 IBM
   ~ ================================================================================
@@ -43,7 +44,7 @@
     <properties>
         <main.basedir>${project.parent.basedir}</main.basedir>
         <docker.image.name>onap/${project.groupId}.${project.artifactId}</docker.image.name>
-	<maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format>	
+    <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format>
     </properties>
 
     <dependencies>
@@ -69,7 +70,6 @@
                     <artifactId>undertow-core</artifactId>
               </exclusion>
             </exclusions>
-
         </dependency>
         <dependency>
             <groupId>io.micrometer</groupId>
@@ -106,6 +106,10 @@
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger2</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.plugin</groupId>
+            <artifactId>spring-plugin-core</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger-ui</artifactId>
@@ -117,33 +121,13 @@
             <artifactId>dcae-analytics-test</artifactId>
         </dependency>
         <!-- https://mvnrepository.com/artifact/io.undertow/undertow-core -->
-      <dependency>
-        <groupId>io.undertow</groupId>
-        <artifactId>undertow-core</artifactId>
-      </dependency>
         <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-handler</artifactId>
-            <version>4.1.54.Final</version>
-        </dependency>
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-handler-proxy</artifactId>
-            <version>4.1.54.Final</version>
+            <groupId>io.undertow</groupId>
+            <artifactId>undertow-core</artifactId>
         </dependency>
 
     </dependencies>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-core</artifactId>
-                <version>5.1.12.RELEASE</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <build>
         <resources>
             <resource>
@@ -165,39 +149,39 @@
             </plugin>
             <!-- DOCKER PLUGIN -->
             <plugin>
-	           <groupId>com.spotify</groupId>
-	           <artifactId>dockerfile-maven-plugin</artifactId>
-	           <version>1.4.10</version>
-	             <configuration>
-		          <contextDirectory>${project.basedir}</contextDirectory>
-		          <repository>${docker.repository}/${docker.image.name}</repository>
-		          <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
-		       <buildArgs>
-			     <PROJECT_BUILD_DIR_NAME>target</PROJECT_BUILD_DIR_NAME>
-			     <DEPENDENCIES_DIR>${dependency.dir.name}</DEPENDENCIES_DIR>
-			     <DOCKER_ARTIFACT_DIR>/opt</DOCKER_ARTIFACT_DIR>
-			     <FINAL_JAR>${project.build.finalName}.jar</FINAL_JAR>
-		       </buildArgs>
-	         </configuration>
-	         <executions>
-			<execution>
-				<id>build-image</id>
-				<phase>install</phase>
-				<goals>
-					<goal>build</goal>
-				</goals>
-			</execution>
-			<execution>
-			       <id>tag-version</id>
-			       <phase>install</phase>
-			       <goals>
-				      <goal>tag</goal>
-				      <goal>push</goal>
-			       </goals>
-            			<configuration>
-              				<tag>${project.version}</tag>
-            			</configuration>
-          		</execution>
+               <groupId>com.spotify</groupId>
+               <artifactId>dockerfile-maven-plugin</artifactId>
+               <version>1.4.10</version>
+                 <configuration>
+                  <contextDirectory>${project.basedir}</contextDirectory>
+                  <repository>${docker.repository}/${docker.image.name}</repository>
+                  <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
+               <buildArgs>
+                 <PROJECT_BUILD_DIR_NAME>target</PROJECT_BUILD_DIR_NAME>
+                 <DEPENDENCIES_DIR>${dependency.dir.name}</DEPENDENCIES_DIR>
+                 <DOCKER_ARTIFACT_DIR>/opt</DOCKER_ARTIFACT_DIR>
+                 <FINAL_JAR>${project.build.finalName}.jar</FINAL_JAR>
+               </buildArgs>
+             </configuration>
+             <executions>
+            <execution>
+                <id>build-image</id>
+                <phase>install</phase>
+                <goals>
+                    <goal>build</goal>
+                </goals>
+            </execution>
+            <execution>
+                   <id>tag-version</id>
+                   <phase>install</phase>
+                   <goals>
+                      <goal>tag</goal>
+                      <goal>push</goal>
+                   </goals>
+                        <configuration>
+                              <tag>${project.version}</tag>
+                        </configuration>
+                  </execution>
                         <execution>
                                <id>tag-version-ts</id>
                                <phase>install</phase>
@@ -206,10 +190,10 @@
                                       <goal>push</goal>
                                </goals>
                                 <configuration>
-              				<tag>${project.version}-${maven.build.timestamp}Z</tag>
+                              <tag>${project.version}-${maven.build.timestamp}Z</tag>
                                 </configuration>
                         </execution>
-	        </executions>
+            </executions>
            </plugin>
         </plugins>
     </build>