Merge "Improved user guide details"

[clamp.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index fb0144a..ec1033b 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -24,15 +24,15 @@
                <modelVersion>4.0.0</modelVersion>
                <groupId>org.onap.clamp</groupId>
                <artifactId>clds</artifactId>
-               <version>4.0.0-SNAPSHOT</version>
+               <version>4.1.0-SNAPSHOT</version>
                <name>clamp</name>
 
-<!--  -->
-<!--           <parent> -->
-<!--                           <groupId>org.onap.oparent</groupId> -->
-<!--                           <artifactId>oparent</artifactId> -->
-<!--                           <version>1.2.3</version> -->
-<!--           </parent> -->
+
+               <parent>
+                               <groupId>org.onap.oparent</groupId>
+                               <artifactId>oparent</artifactId>
+                               <version>2.0.0</version>
+               </parent>
 
                <description>
            This project build the ONAP CLAMP JAR that contains CLAMP back-end code and its UI part.
@@ -61,12 +61,9 @@
                                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                                <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-                               <project.scm.id>git-server</project.scm.id>
-                               <java.version>1.8</java.version>
-
                                <eelf.core.version>1.0.0</eelf.core.version>
-                               <camel.version>2.23.2</camel.version>
-                               <springboot.version>2.1.4.RELEASE</springboot.version>
+                               <camel.version>2.24.0</camel.version>
+                               <springboot.version>2.1.5.RELEASE</springboot.version>
 
                                <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
                                <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
@@ -89,7 +86,7 @@
                                <docker.skip.tag>true</docker.skip.tag>
                                <skip.staging.artifacts>false</skip.staging.artifacts>
                                <python.http.proxy.param/>
-                               <tomcat.version>9.0.16</tomcat.version>
+                               <tomcat.version>9.0.20</tomcat.version>
                </properties>
 
                <profiles>
@@ -921,19 +918,6 @@
                                                                                </execution>
                                                                </executions>
                                                </plugin>
-                                               <plugin>
-                                                               <groupId>org.sonatype.plugins</groupId>
-                                                               <artifactId>nexus-staging-maven-plugin</artifactId>
-                                                               <version>1.6.7</version>
-                                                               <extensions>true</extensions>
-                                                               <configuration>
-                                                                               <nexusUrl>https://nexus.onap.org</nexusUrl>
-                                                                               <stagingProfileId>176c31dfe190a</stagingProfileId>
-                                                                               <serverId>ecomp-staging</serverId>
-                                                                               <skipNexusStagingDeployMojo>${skip.staging.artifacts}</skipNexusStagingDeployMojo>
-                                                               </configuration>
-                                               </plugin>
-
                                                <plugin>
                                                                <groupId>org.apache.maven.plugins</groupId>
                                                                <artifactId>maven-surefire-plugin</artifactId>