Merge from ECOMP's repository

[vid.git] / vid-ext-services-simulator / pom.xml

diff --git a/vid-ext-services-simulator/pom.xml b/vid-ext-services-simulator/pom.xml
index ed6a13c..165ae57 100644 (file)
--- a/vid-ext-services-simulator/pom.xml
+++ b/vid-ext-services-simulator/pom.xml
@@ -13,7 +13,7 @@
     <properties>
         <encoding>UTF-8</encoding>
         <epsdk.version>1.3.0</epsdk.version>
-        <springframework.version>4.2.0.RELEASE</springframework.version>
+        <springframework.version>4.3.4.RELEASE</springframework.version>
         <hibernate.version>4.3.11.Final</hibernate.version>
         <!-- Skip assembling the zip by default -->
         <skipassembly>true</skipassembly>
@@ -30,27 +30,9 @@
         <coberturaBuildPhase>none</coberturaBuildPhase>
     </properties>
 
-
-    <!--distributionManagement>
-        <repository>
-            <id>vid-releases</id>
-            <name>VID Release Repository</name>
-            <url>https://162.242.254.138:8443/repository/maven-releases</url>
-        </repository>
-
-        <snapshotRepository>
-            <id>vid-snapshots</id>
-            <name>VID Snapshot Repository</name>
-            <url>https://162.242.254.138:8443/repository/maven-snapshots</url>
-        </snapshotRepository>
-    </distributionManagement-->
-
-
     <profiles>
-
         <profile>
             <id>onap</id>
-
             <properties>
                 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                 <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -73,8 +55,6 @@
 
         <profile>
             <id>default</id>
-
-
         </profile>
 
         <!-- disable doclint, a new feature in Java 8, when generating javadoc -->
@@ -126,17 +106,17 @@
             <artifactId>mockserver-netty</artifactId>
             <version>3.11</version>
         </dependency>
-         <dependency>
+        <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
-            <version>4.3.4.RELEASE</version>
+            <version>${springframework.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>
-            <version>4.3.4.RELEASE</version>
+            <version>${springframework.version}</version>
         </dependency>
-         <dependency>
+        <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
             <version>2.8.7</version>
@@ -205,17 +185,4 @@
 
         </plugins>
     </build>
-
-   <!-- <build>
-        <finalName>vidSimulator</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>1.5.6.RELEASE</version>
-            </plugin>
-        </plugins>
-    </build>
--->
-
 </project>
\ No newline at end of file