Merge "Replace classes in the org.json package"

diff --combined datarouter-prov/pom.xml
index a9e7e67,cd846aa..c1eae74
--- 1/datarouter-prov/pom.xml
--- 2/datarouter-prov/pom.xml
+++ b/datarouter-prov/pom.xml
@@@ -40,22 -40,13 +40,21 @@@
                <maven.compiler.source>1.8</maven.compiler.source>\r
                <maven.compiler.target>1.8</maven.compiler.target>\r
                <dockerLocation>${basedir}/target/</dockerLocation>\r
 +              <sonar.language>java</sonar.language>\r
 +                      <sonar.skip>false</sonar.skip>\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}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>\r
 +              <sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath>\r
 +              <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>\r
 +              <sonar.projectVersion>${project.version}</sonar.projectVersion>\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/${project.groupId}/${project.artifactId}/${project.version}</sitePath>\r
        </properties>\r
-       <dependencies>\r
-               \r
+        <dependencies>\r
                <dependency>\r
                        <groupId>org.json</groupId>\r
                        <artifactId>json</artifactId>\r
@@@ -498,95 -489,17 +497,95 @@@
                                  </formats>\r
                                </configuration>\r
                        </plugin>\r
 +                      \r
 +                      \r
 +              <plugin>\r
 +                              <groupId>org.sonatype.plugins</groupId>\r
 +                              <artifactId>nexus-staging-maven-plugin</artifactId>\r
 +                              <version>1.6.7</version>\r
 +                              <extensions>true</extensions>\r
 +                              <configuration>\r
 +                                      <nexusUrl>${nexusproxy}</nexusUrl>\r
 +                                      <stagingProfileId>176c31dfe190a</stagingProfileId>\r
 +                                      <serverId>ecomp-staging</serverId>\r
 +                              </configuration>\r
 +                      </plugin>\r
 +                      \r
 +                      <plugin>\r
 +          <groupId>org.jacoco</groupId>\r
 +          <artifactId>jacoco-maven-plugin</artifactId>\r
 +          <version>${jacoco.version}</version>\r
 +          <configuration>\r
 +            <excludes>\r
 +              <exclude>**/gen/**</exclude>\r
 +              <exclude>**/generated-sources/**</exclude>\r
 +              <exclude>**/yang-gen/**</exclude>\r
 +              <exclude>**/pax/**</exclude>\r
 +            </excludes>\r
 +          </configuration>\r
 +          <executions>\r
 +\r
 +            <execution>\r
 +              <id>pre-unit-test</id>\r
 +              <goals>\r
 +                <goal>prepare-agent</goal>\r
 +              </goals>\r
 +              <configuration>\r
 +                <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>\r
 +                <propertyName>surefireArgLine</propertyName>\r
 +              </configuration>\r
 +            </execution>\r
 +            \r
 +       \r
 +            <execution>\r
 +              <id>post-unit-test</id>\r
 +              <phase>test</phase>\r
 +              <goals>\r
 +                <goal>report</goal>\r
 +              </goals>\r
 +              <configuration>\r
 +                <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>\r
 +                <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>\r
 +              </configuration>\r
 +            </execution>\r
 +            <execution>\r
 +              <id>pre-integration-test</id>\r
 +              <phase>pre-integration-test</phase>\r
 +              <goals>\r
 +                <goal>prepare-agent</goal>\r
 +              </goals>\r
 +              <configuration>\r
 +                <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>\r
 +\r
 +                <propertyName>failsafeArgLine</propertyName>\r
 +              </configuration>\r
 +            </execution>\r
 +\r
 +       \r
 +            <execution>\r
 +              <id>post-integration-test</id>\r
 +              <phase>post-integration-test</phase>\r
 +              <goals>\r
 +                <goal>report</goal>\r
 +              </goals>\r
 +              <configuration>\r
 +                <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>\r
 +                <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>\r
 +              </configuration>\r
 +            </execution>\r
 +          </executions>\r
 +        </plugin>     \r
                </plugins>\r
        </build>\r
  <distributionManagement>\r
                <repository>\r
                        <id>ecomp-releases</id>\r
 -                      <name>AAF Release Repository</name>\r
 +                      <name>DR Release Repository</name>\r
                        <url>${nexusproxy}${releaseNexusPath}</url>\r
                </repository>\r
                <snapshotRepository>\r
                        <id>ecomp-snapshots</id>\r
 -                      <name>AAF Snapshot Repository</name>\r
 +                      <name>DR Snapshot Repository</name>\r
                        <url>${nexusproxy}${snapshotNexusPath}</url>\r
                </snapshotRepository>\r
                <site>\r
@@@ -601,5 -514,26 +600,5 @@@
          </pluginRepository>\r
      </pluginRepositories>\r
  \r
 -      <repositories>\r
 -              <repository>\r
 -                      <id>central</id>\r
 -                      <name>Maven 2 repository 2</name>\r
 -                      <url>http://repo2.maven.org/maven2/</url>\r
 -              </repository>\r
 -              <repository>\r
 -            <id>onap-jar-snapshots</id>\r
 -            <url>https://nexus.onap.org/content/repositories/snapshots</url>\r
 -        </repository>\r
 -              <repository>\r
 -                      <id>spring-repo</id>\r
 -                      <name>Spring repo</name>\r
 -                      <url>https://artifacts.alfresco.com/nexus/content/repositories/public/</url>\r
 -              </repository>\r
 -              <repository>\r
 -                      <id>repository.jboss.org-public</id>\r
 -                      <name>JBoss.org Maven repository</name>\r
 -                      <url>https://repository.jboss.org/nexus/content/groups/public</url>\r
 -              </repository>\r
 -      </repositories>\r
        \r
  </project>\r