Code Review / vid.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Upgrade portal SDK to 2.4
[vid.git] / epsdk-app-onap / pom.xml
diff --git a/epsdk-app-onap/pom.xml b/epsdk-app-onap/pom.xml
index e9f4225..025b63a 100755 (executable)
--- a/epsdk-app-onap/pom.xml
+++ b/epsdk-app-onap/pom.xml
@@ -6,9 +6,9 @@
        <!-- This is the Maven project object model (POM) file for the open-source \r
                SDK web app. This is NOT the Portal - but it is developed and supported by \r
                the Portal team. -->\r
-       <groupId>org.openecomp.vid</groupId>\r
+       <groupId>org.onap.vid</groupId>\r
        <artifactId>epsdk-app-onap</artifactId>\r
-       <version>1.1.0-SNAPSHOT</version>\r
+       <version>3.0.0-SNAPSHOT</version>\r
        <packaging>war</packaging>\r
        <name>ECOMP SDK Webapp for OpenSource</name>\r
        <description>ECOMP SDK Web Application for public release</description>\r
@@ -17,26 +17,24 @@
                <encoding>UTF-8</encoding>\r
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
                <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>\r
-               <epsdk.version>1.3.0-SNAPSHOT</epsdk.version>\r
-               <springframework.version>4.2.0.RELEASE</springframework.version>\r
+               <epsdk.version>2.4.0</epsdk.version>\r
+               <springframework.version>4.2.9.RELEASE</springframework.version>\r
                <hibernate.version>4.3.11.Final</hibernate.version>\r
                <!-- Skip assembling the zip; assemble via mvn -Dskipassembly=false .. -->\r
                <skipassembly>true</skipassembly>\r
                <!-- Tests usually require some setup that maven cannot do, so skip. -->\r
-               <skiptests>true</skiptests>\r
+               <skiptests>false</skiptests>\r
                <nexusproxy>https://nexus.onap.org</nexusproxy>\r
                <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>\r
                <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>\r
                <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>\r
-               <sitePath>/content/sites/site/org/openecomp/vid/${project.version}</sitePath>\r
-               \r
+               <sitePath>/content/sites/site/org/onap/vid/${project.version}</sitePath>\r
+\r
                <!-- SONAR -->\r
-        <sonar.language>java</sonar.language>\r
-        <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>\r
-        <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>\r
-        <sonar.jacoco.reportPath>${project.build.directory}/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPath>\r
-        <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>\r
-        <sonar.projectVersion>${project.version}</sonar.projectVersion>\r
+               <sonar.language>java</sonar.language>\r
+               <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>\r
+               <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>\r
+               <sonar.projectVersion>${project.version}</sonar.projectVersion>\r
        </properties>\r
 \r
        <repositories>\r
@@ -105,11 +103,6 @@
        <build>\r
                <finalName>vid</finalName>\r
                <plugins>\r
-                       <plugin>\r
-                               <groupId>org.codehaus.mojo</groupId>\r
-                               <artifactId>versions-maven-plugin</artifactId>\r
-                               <version>1.3.1</version>\r
-                       </plugin>\r
                        <plugin>\r
                                <groupId>org.sonatype.plugins</groupId>\r
                                <artifactId>nexus-staging-maven-plugin</artifactId>\r
@@ -170,11 +163,11 @@
                                        </archive>\r
                                        <overlays>\r
                                                <overlay>\r
-                                                       <groupId>org.openecomp.vid</groupId>\r
+                                                       <groupId>org.onap.vid</groupId>\r
                                                        <artifactId>vid-app-common</artifactId>\r
                                                </overlay>\r
                                                <overlay>\r
-                                                       <groupId>org.openecomp.ecompsdkos</groupId>\r
+                                                       <groupId>org.onap.portal.sdk</groupId>\r
                                                        <artifactId>epsdk-app-overlay</artifactId>\r
                                                </overlay>\r
                                        </overlays>\r
@@ -213,16 +206,36 @@
                                        </dependency>\r
                                </dependencies>\r
                        </plugin>\r
-                       \r
+\r
+                       <plugin>\r
+                               <artifactId>maven-surefire-plugin</artifactId>\r
+                               <version>2.17</version>\r
+                       </plugin>\r
                        <plugin>\r
-                <artifactId>maven-surefire-plugin</artifactId>\r
-                <version>2.17</version>\r
-            </plugin>\r
+                               <groupId>org.sonarsource.scanner.maven</groupId>\r
+                               <artifactId>sonar-maven-plugin</artifactId>\r
+                               <version>3.3.0.603</version>\r
+                       </plugin>\r
                        <plugin>\r
-                <groupId>org.sonarsource.scanner.maven</groupId>\r
-                <artifactId>sonar-maven-plugin</artifactId>\r
-                <version>3.2</version>\r
-            </plugin>\r
+                               <groupId>org.jacoco</groupId>\r
+                               <artifactId>jacoco-maven-plugin</artifactId>\r
+                               <version>0.7.9</version>\r
+                               <executions>\r
+                                       <execution>\r
+                                               <id>default-prepare-agent</id>\r
+                                               <goals>\r
+                                                       <goal>prepare-agent</goal>\r
+                                               </goals>\r
+                                       </execution>\r
+                                       <execution>\r
+                                               <id>default-report</id>\r
+                                               <goals>\r
+                                                       <goal>report</goal>\r
+                                               </goals>\r
+                                       </execution>\r
+                               </executions>\r
+                       </plugin>\r
+\r
                </plugins>\r
        </build>\r
 \r
@@ -249,25 +262,37 @@
        <dependencies>\r
                <!-- SDK overlay war -->\r
                <dependency>\r
-                       <groupId>org.openecomp.ecompsdkos</groupId>\r
+                       <groupId>org.onap.portal.sdk</groupId>\r
                        <artifactId>epsdk-app-overlay</artifactId>\r
                        <version>${epsdk.version}</version>\r
                        <type>war</type>\r
                </dependency>\r
                <dependency>\r
-                       <groupId>org.openecomp.ecompsdkos</groupId>\r
+                       <groupId>org.onap.portal.sdk</groupId>\r
                        <artifactId>epsdk-app-common</artifactId>\r
                        <version>${epsdk.version}</version>\r
                        <type>jar</type>\r
+                       <exclusions>\r
+                               <exclusion>\r
+                                       <groupId>com.fasterxml.jackson.core</groupId>\r
+                                       <artifactId>jackson-core</artifactId>\r
+                               </exclusion>\r
+                       </exclusions>\r
                </dependency>\r
                <dependency>\r
-                       <groupId>org.openecomp.vid</groupId>\r
+                       <groupId>org.onap.vid</groupId>\r
                        <artifactId>vid-app-common</artifactId>\r
                        <version>${project.version}</version>\r
                        <type>war</type>\r
+                       <exclusions>\r
+                               <exclusion>\r
+                                       <groupId>com.fasterxml.jackson.core</groupId>\r
+                                       <artifactId>jackson-core</artifactId>\r
+                               </exclusion>\r
+                       </exclusions>\r
                </dependency>\r
                <dependency>\r
-                       <groupId>org.openecomp.vid</groupId>\r
+                       <groupId>org.onap.vid</groupId>\r
                        <artifactId>vid-app-common</artifactId>\r
                        <version>${project.version}</version>\r
                        <type>jar</type>\r
@@ -275,33 +300,55 @@
                </dependency>\r
                <!-- SDK components -->\r
                <dependency>\r
-                       <groupId>org.openecomp.ecompsdkos</groupId>\r
+                       <groupId>org.onap.portal.sdk</groupId>\r
                        <artifactId>epsdk-core</artifactId>\r
                        <version>${epsdk.version}</version>\r
+                       <exclusions>\r
+                               <exclusion>\r
+                                       <groupId>com.fasterxml.jackson.core</groupId>\r
+                                       <artifactId>jackson-core</artifactId>\r
+                               </exclusion>\r
+                       </exclusions>\r
                </dependency>\r
                <dependency>\r
-                       <groupId>org.openecomp.ecompsdkos</groupId>\r
+                       <groupId>org.onap.portal.sdk</groupId>\r
                        <artifactId>epsdk-analytics</artifactId>\r
                        <version>${epsdk.version}</version>\r
+                       <exclusions>\r
+                               <exclusion>\r
+                                       <groupId>com.fasterxml.jackson.core</groupId>\r
+                                       <artifactId>jackson-core</artifactId>\r
+                               </exclusion>\r
+                       </exclusions>\r
                </dependency>\r
                <dependency>\r
-                       <groupId>org.openecomp.ecompsdkos</groupId>\r
+                       <groupId>org.onap.portal.sdk</groupId>\r
                        <artifactId>epsdk-workflow</artifactId>\r
                        <version>${epsdk.version}</version>\r
+                       <exclusions>\r
+                               <exclusion>\r
+                                       <groupId>com.fasterxml.jackson.core</groupId>\r
+                                       <artifactId>jackson-core</artifactId>\r
+                               </exclusion>\r
+                       </exclusions>\r
                </dependency>\r
                <dependency>\r
                        <groupId>com.att.eelf</groupId>\r
                        <artifactId>eelf-core</artifactId>\r
                        <version>1.0.0</version>\r
                </dependency>\r
+               \r
+\r
+\r
+\r
                <dependency>\r
-                       <groupId>org.openecomp.vid</groupId>\r
+                       <groupId>org.onap.vid</groupId>\r
                        <artifactId>vid-app-common</artifactId>\r
                        <version>${version}</version>\r
                        <type>war</type>\r
                </dependency>\r
                <dependency>\r
-                       <groupId>org.openecomp.vid</groupId>\r
+                       <groupId>org.onap.vid</groupId>\r
                        <artifactId>vid-app-common</artifactId>\r
                        <version>${version}</version>\r
                        <type>jar</type>\r
@@ -316,12 +363,18 @@
                <dependency>\r
                        <groupId>com.fasterxml.jackson.core</groupId>\r
                        <artifactId>jackson-core</artifactId>\r
-                       <version>2.6.3</version>\r
+                       <version>2.8.6</version>\r
                </dependency>\r
                <dependency>\r
                        <groupId>com.fasterxml.jackson.core</groupId>\r
                        <artifactId>jackson-databind</artifactId>\r
-                       <version>2.6.3</version>\r
+                       <version>2.6.7.1</version>\r
+                       <exclusions>\r
+                               <exclusion>\r
+                                       <groupId>com.fasterxml.jackson.core</groupId>\r
+                                       <artifactId>jackson-core</artifactId>\r
+                               </exclusion>\r
+                       </exclusions>\r
                </dependency>\r
                <dependency>\r
                        <groupId>com.mchange</groupId>\r
@@ -349,9 +402,6 @@
                        <artifactId>junit</artifactId>\r
                        <version>4.12</version>\r
                </dependency>\r
-               <!-- Elastic Search -->\r
-               <!-- <dependency> <groupId>org.elasticsearch</groupId> <artifactId>elasticsearch</artifactId> \r
-                       <version>2.2.0</version> </dependency> -->\r
                <dependency>\r
                        <groupId>org.json</groupId>\r
                        <artifactId>json</artifactId>\r
@@ -391,6 +441,11 @@
                                </exclusion>\r
                        </exclusions>\r
                </dependency>\r
+               <dependency>\r
+                       <groupId>org.springframework</groupId>\r
+                       <artifactId>spring-aop</artifactId>\r
+                       <version>${springframework.version}</version>\r
+               </dependency>\r
                <dependency>\r
                        <groupId>org.springframework</groupId>\r
                        <artifactId>spring-test</artifactId>\r
ARCHIVED- 2022-02-15 at the request of the project