Code Review / externalapi / nbi.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Update jackson-databind from 2.9.9 to 2.9.9.3
[externalapi/nbi.git] / pom.xml
diff --git a/pom.xml b/pom.xml
index 2d9ed7f..2dbd89a 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 
   <groupId>org.onap.externalapi-nbi</groupId>
   <artifactId>nbi-rest-services</artifactId>
-  <version>3.0.1</version>
+  <version>5.0.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>externalapi-nbi</name>
@@ -30,6 +30,7 @@
     <maven.compiler.target>1.8</maven.compiler.target>
     <maven.compiler.source>1.8</maven.compiler.source>
     <start-class>org.onap.nbi.Application</start-class>
+    <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
     <nexusproxy>https://nexus.onap.org</nexusproxy>
     <snapshotNexusPath>content/repositories/snapshots/</snapshotNexusPath>
     <releaseNexusPath>content/repositories/releases/</releaseNexusPath>
@@ -56,24 +57,29 @@
     <sonar.coverage.exclusions>**/model/**/*</sonar.coverage.exclusions>
   </properties>
 
-  <repositories>
-    <repository>
-      <id>maven2-repository.java.net</id>
-      <name>Java.net Repository for Maven</name>
-      <url>http://download.java.net/maven/2/</url>
-      <layout>default</layout>
-    </repository>
-    <repository>
-      <id>ecomp-snapshots</id>
-      <name>Snapshot Repository</name>
-      <url>https://nexus.onap.org/content/repositories/releases/</url>
-    </repository>
-    <repository>
-      <id>ecomp-staging</id>
-      <name>Staging Repository</name>
-      <url>https://nexus.onap.org/content/repositories/staging/</url>
-    </repository>
-  </repositories>
+  <!--<repositories>-->
+  <!--<repository>-->
+  <!--<id>maven2-repository.java.net</id>-->
+  <!--<name>Java.net Repository for Maven</name>-->
+  <!--<url>http://download.java.net/maven/2/</url>-->
+  <!--<layout>default</layout>-->
+  <!--</repository>-->
+  <!--<repository>-->
+  <!--<id>ecomp-release</id>-->
+  <!--<name>Snapshot Repository</name>-->
+  <!--<url>https://nexus.onap.org/content/repositories/releases/</url>-->
+  <!--</repository>-->
+  <!--<repository>-->
+  <!--<id>ecomp-staging</id>-->
+  <!--<name>Staging Repository</name>-->
+  <!--<url>https://nexus.onap.org/content/repositories/staging/</url>-->
+  <!--</repository>-->
+  <!--<repository>-->
+  <!--<id>ecomp-snapshots</id>-->
+  <!--<name>Snapshot Repository</name>-->
+  <!--<url>https://nexus.onap.org/content/repositories/snapshots/</url>-->
+  <!--</repository>-->
+  <!--</repositories>-->
 
   <distributionManagement>
     <repository>
@@ -100,7 +106,7 @@
       <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-dependencies</artifactId>
-        <version>2.1.3.RELEASE</version>
+        <version>2.1.7.RELEASE</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -112,6 +118,17 @@
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-web</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.tomcat.embed</groupId>
+          <artifactId>tomcat-embed-core</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.tomcat.embed</groupId>
+      <artifactId>tomcat-embed-core</artifactId>
     </dependency>
 
     <dependency>
@@ -168,7 +185,20 @@
       <version>1.5.18</version>
     </dependency>
 
+    <!-- swagger core -->
+    <dependency>
+      <groupId>io.swagger</groupId>
+      <artifactId>swagger-core</artifactId>
+      <version>1.5.18</version>
+    </dependency>
+
     <!-- jackson -->
+    
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>2.9.9.3</version>
+       </dependency>   
 
     <dependency>
       <groupId>com.fasterxml.jackson.dataformat</groupId>
@@ -180,13 +210,23 @@
     <dependency>
       <groupId>org.onap.sdc.sdc-tosca</groupId>
       <artifactId>sdc-tosca</artifactId>
-      <version>1.4.6</version>
+      <version>1.6.0</version>
       <exclusions>
         <exclusion>
           <groupId>com.google.guava</groupId>
           <artifactId>guava</artifactId>
         </exclusion>
-      </exclusions>     
+        <exclusion>
+          <groupId>commons-codec</groupId>
+          <artifactId>commons-codec</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <version>1.13</version>
     </dependency>
 
     <!-- jolt -->
@@ -249,6 +289,10 @@
           <groupId>com.fasterxml.jackson.core</groupId>
           <artifactId>jackson-databind</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>commons-codec</groupId>
+          <artifactId>commons-codec</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
 
@@ -276,18 +320,28 @@
     <dependency>
       <groupId>org.onap.msb.java-sdk</groupId>
       <artifactId>msb-java-sdk</artifactId>
-      <version>1.2.0</version>
+      <version>1.1.1</version>
       <exclusions>
         <exclusion>
           <groupId>com.google.guava</groupId>
           <artifactId>guava</artifactId>
         </exclusion>
-      </exclusions>        
+        <exclusion>
+          <groupId>com.squareup.okhttp3</groupId>
+          <artifactId>okhttp</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
-    
+
     <dependency>
-         <groupId>com.google.guava</groupId>
-         <artifactId>guava</artifactId>
+      <groupId>com.squareup.okhttp3</groupId>
+      <artifactId>okhttp</artifactId>
+      <version>3.14.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
     </dependency>
 
     <!-- karate -->
@@ -338,7 +392,11 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.22.0</version>
         <configuration>
+<!--          <argLine>-->
+<!--            &#45;&#45;illegal-access=permit-->
+<!--          </argLine>-->
           <includes>
             <include>org/onap/nbi/test/KarateApiTest.java</include>
             <include>org/onap/nbi/test/ExecutionTaskTest.java</include>
@@ -347,16 +405,6 @@
           </includes>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.sonatype.plugins</groupId>
-        <artifactId>nexus-staging-maven-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <nexusUrl>${nexusproxy}</nexusUrl>
-          <stagingProfileId>176c31dfe190a</stagingProfileId>
-          <serverId>ecomp-staging</serverId>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
@@ -408,61 +456,59 @@
         <artifactId>sonar-maven-plugin</artifactId>
         <version>3.2</version>
       </plugin>
-      <!--       <plugin> -->
-      <!--         <groupId>org.jacoco</groupId> -->
-      <!--         <artifactId>jacoco-maven-plugin</artifactId> -->
-      <!--         <version>0.8.1</version> -->
-      <!--         <configuration> -->
-      <!--           <dumpOnExit>true</dumpOnExit> -->
-      <!--           <includes> -->
-      <!--             <include>org.onap.nbi.*</include> -->
-      <!--           </includes> -->
-      <!--           <excludes> -->
-      <!--             <exclude>**/model/**/*</exclude> -->
-      <!--           </excludes> -->
-      <!--         </configuration> -->
-      <!--         <executions> -->
-      <!--           <execution> -->
-      <!--             <id>pre-unit-test</id> -->
-      <!--             <goals> -->
-      <!--               <goal>prepare-agent</goal> -->
-      <!--             </goals> -->
-      <!--             <configuration> -->
-      <!--               <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile> -->
-      <!--               <append>true</append> -->
-      <!--             </configuration> -->
-      <!--           </execution> -->
-      <!--           <execution> -->
-      <!--             <id>pre-integration-test</id> -->
-      <!--             <phase>pre-integration-test</phase> -->
-      <!--             <goals> -->
-      <!--               <goal>prepare-agent</goal> -->
-      <!--             </goals> -->
-      <!--             <configuration> -->
-      <!--               <destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile> -->
-      <!--               <append>true</append> -->
-      <!--             </configuration> -->
-      <!--           </execution> -->
-      <!--           <execution> -->
-      <!--             <goals> -->
-      <!--               <goal>merge</goal> -->
-      <!--             </goals> -->
-      <!--             <phase>post-integration-test</phase> -->
-      <!--             <configuration> -->
-      <!--               <fileSets> -->
-      <!--                 <fileSet -->
-      <!--                   implementation="org.apache.maven.shared.model.fileset.FileSet"> -->
-      <!--                   <directory>${project.build.directory}/coverage-reports</directory> -->
-      <!--                   <includes> -->
-      <!--                     <include>*.exec</include> -->
-      <!--                   </includes> -->
-      <!--                 </fileSet> -->
-      <!--               </fileSets> -->
-      <!--               <destFile>${project.build.directory}/jacoco-dev.exec</destFile> -->
-      <!--             </configuration> -->
-      <!--           </execution> -->
-      <!--         </executions> -->
-      <!--       </plugin> -->
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <version>0.8.1</version>
+        <configuration>
+          <dumpOnExit>true</dumpOnExit>
+          <includes>
+            <include>org.onap.nbi.*</include>
+          </includes>
+          <excludes>
+            <exclude>**/model/**/*</exclude>
+          </excludes>
+        </configuration>
+        <executions>
+          <execution>
+            <id>pre-unit-test</id>
+            <goals>
+              <goal>prepare-agent</goal>
+            </goals>
+            <configuration>
+              <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>
+            </configuration>
+          </execution>
+          <execution>
+            <id>pre-integration-test</id>
+            <phase>pre-integration-test</phase>
+            <goals>
+              <goal>prepare-agent</goal>
+            </goals>
+            <configuration>
+              <destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>
+            </configuration>
+          </execution>
+          <execution>
+            <goals>
+              <goal>merge</goal>
+            </goals>
+            <phase>post-integration-test</phase>
+            <configuration>
+              <fileSets>
+                <fileSet
+                  implementation="org.apache.maven.shared.model.fileset.FileSet">
+                  <directory>${project.build.directory}/coverage-reports</directory>
+                  <includes>
+                    <include>*.exec</include>
+                  </includes>
+                </fileSet>
+              </fileSets>
+              <destFile>${project.build.directory}/jacoco-dev.exec</destFile>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <artifactId>maven-source-plugin</artifactId>
         <executions>
@@ -478,7 +524,6 @@
     </plugins>
   </build>
 
-
   <profiles>
     <profile>
       <id>docker</id>
@@ -540,6 +585,119 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>onap-settings</id>
+      <properties>
+        <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
+        <onap.nexus.rawrepo.baseurl.upload>https://nexus.onap.org/content/sites/raw
+        </onap.nexus.rawrepo.baseurl.upload>
+        <onap.nexus.rawrepo.baseurl.download>
+          https://nexus.onap.org/service/local/repositories/raw/content
+        </onap.nexus.rawrepo.baseurl.download>
+        <onap.nexus.rawrepo.serverid>ecomp-raw</onap.nexus.rawrepo.serverid>
+
+        <!-- properties for Nexus Docker registry -->
+        <onap.nexus.dockerregistry.daily>nexus3.onap.org:10003</onap.nexus.dockerregistry.daily>
+        <onap.nexus.dockerregistry.release>nexus3.onap.org:10002</onap.nexus.dockerregistry.release>
+        <docker.pull.registry>nexus3.onap.org:10001</docker.pull.registry>
+        <docker.push.registry>nexus3.onap.org:10003</docker.push.registry>
+      </properties>
+    </profile>
+    <profile>
+      <id>onap-snapshots</id>
+      <repositories>
+        <repository>
+          <id>onap-snapshots</id>
+          <name>onap-snapshots</name>
+          <url>https://nexus.onap.org/content/repositories/snapshots/</url>
+          <releases>
+            <enabled>false</enabled>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+          </snapshots>
+        </repository>
+      </repositories>
+      <pluginRepositories>
+        <pluginRepository>
+          <id>onap-snapshots</id>
+          <name>onap-snapshots</name>
+          <url>https://nexus.onap.org/content/repositories/snapshots/</url>
+          <releases>
+            <enabled>false</enabled>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+          </snapshots>
+        </pluginRepository>
+      </pluginRepositories>
+    </profile>
+    <profile>
+      <id>onap-releases</id>
+      <repositories>
+        <repository>
+          <id>onap-releases</id>
+          <name>onap-releases</name>
+          <url>https://nexus.onap.org/content/repositories/releases/</url>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+        </repository>
+      </repositories>
+      <pluginRepositories>
+        <pluginRepository>
+          <id>onap-releases</id>
+          <name>onap-releases</name>
+          <url>https://nexus.onap.org/content/repositories/releases/</url>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+        </pluginRepository>
+      </pluginRepositories>
+    </profile>
+    <profile>
+      <id>onap-public</id>
+      <repositories>
+        <repository>
+          <id>central</id>
+          <url>http://repo1.maven.org/maven2/</url>
+        </repository>
+        <repository>
+          <id>onap-public</id>
+          <name>onap-public</name>
+          <url>https://nexus.onap.org/content/repositories/public/</url>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+        </repository>
+      </repositories>
+      <pluginRepositories>
+        <pluginRepository>
+          <id>central</id>
+          <url>http://repo1.maven.org/maven2/</url>
+        </pluginRepository>
+        <pluginRepository>
+          <id>onap-public</id>
+          <name>onap-public</name>
+          <url>https://nexus.onap.org/content/repositories/public/</url>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+        </pluginRepository>
+      </pluginRepositories>
+    </profile>
   </profiles>
 
 </project>
ARCHIVED- 2022-02-15 at the request of the project