From d859da901dfd362b13881e443c5bc86c38cefe09 Mon Sep 17 00:00:00 2001 From: "Determe, Sebastien (sd378r)" Date: Fri, 29 Sep 2017 12:10:40 +0200 Subject: Fix the SO build issues Fix the AAI java package names that was still openecomp, remove the variable for LF repositories due to Oparent, Fix the jacoco to overwrite the oparent settings (fix test coverage) Change-Id: I40b9b326e33ff27992a1bf2cc9d3094d338f8828 Issue-ID: SO-168 Signed-off-by: Determe, Sebastien (sd378r) --- .../openecomp/mso/client/aai/AAIRestClient.java | 6 +- .../mso/client/aai/AAIRestClientImpl.java | 8 +- .../openecomp/mso/client/aai/AAIValidatorImpl.java | 4 +- .../openecomp/mso/client/aai/AAIPServerTest.java | 2 +- .../openecomp/mso/client/aai/AAIValidatorTest.java | 4 +- bpmn/pom.xml | 263 +++---- pom.xml | 808 +++++++++++---------- 7 files changed, 530 insertions(+), 565 deletions(-) diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/aai/AAIRestClient.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/aai/AAIRestClient.java index 725a289be0..ca815cf904 100644 --- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/aai/AAIRestClient.java +++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/aai/AAIRestClient.java @@ -23,9 +23,9 @@ import java.io.IOException; import java.io.UnsupportedEncodingException; import java.util.List; -import org.openecomp.aai.domain.yang.GenericVnf; -import org.openecomp.aai.domain.yang.Pserver; -import org.openecomp.aai.domain.yang.Pservers; +import org.onap.aai.domain.yang.GenericVnf; +import org.onap.aai.domain.yang.Pserver; +import org.onap.aai.domain.yang.Pservers; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.databind.JsonMappingException; diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/aai/AAIRestClientImpl.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/aai/AAIRestClientImpl.java index 6b7b1692b2..c58f22f949 100644 --- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/aai/AAIRestClientImpl.java +++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/aai/AAIRestClientImpl.java @@ -35,10 +35,10 @@ import javax.ws.rs.client.Entity; import javax.ws.rs.client.WebTarget; import javax.ws.rs.core.MediaType; -import org.openecomp.aai.domain.yang.GenericVnf; -import org.openecomp.aai.domain.yang.GenericVnfs; -import org.openecomp.aai.domain.yang.Pserver; -import org.openecomp.aai.domain.yang.Pservers; +import org.onap.aai.domain.yang.GenericVnf; +import org.onap.aai.domain.yang.GenericVnfs; +import org.onap.aai.domain.yang.Pserver; +import org.onap.aai.domain.yang.Pservers; import org.openecomp.mso.bpmn.core.PropertyConfiguration; import org.openecomp.mso.client.aai.entities.CustomQuery; import org.openecomp.mso.client.aai.entities.Results; diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/aai/AAIValidatorImpl.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/aai/AAIValidatorImpl.java index 724b2d378a..ce248f010c 100644 --- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/aai/AAIValidatorImpl.java +++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/aai/AAIValidatorImpl.java @@ -23,8 +23,8 @@ package org.openecomp.mso.client.aai; import java.io.IOException; import java.util.List; -import org.openecomp.aai.domain.yang.GenericVnf; -import org.openecomp.aai.domain.yang.Pserver; +import org.onap.aai.domain.yang.GenericVnf; +import org.onap.aai.domain.yang.Pserver; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/aai/AAIPServerTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/aai/AAIPServerTest.java index 0a8660fcee..bee0a828ea 100644 --- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/aai/AAIPServerTest.java +++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/aai/AAIPServerTest.java @@ -29,7 +29,7 @@ import java.util.UUID; import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; -import org.openecomp.aai.domain.yang.Pserver; +import org.onap.aai.domain.yang.Pserver; import static org.junit.Assert.assertEquals; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.databind.JsonMappingException; diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/aai/AAIValidatorTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/aai/AAIValidatorTest.java index 9c657f800b..2272f31685 100644 --- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/aai/AAIValidatorTest.java +++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/aai/AAIValidatorTest.java @@ -33,8 +33,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import org.openecomp.aai.domain.yang.GenericVnf; -import org.openecomp.aai.domain.yang.Pserver; +import org.onap.aai.domain.yang.GenericVnf; +import org.onap.aai.domain.yang.Pserver; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.databind.JsonMappingException; diff --git a/bpmn/pom.xml b/bpmn/pom.xml index ebaa5c4860..98628d9030 100644 --- a/bpmn/pom.xml +++ b/bpmn/pom.xml @@ -1,157 +1,120 @@ - - 4.0.0 + + 4.0.0 - - org.openecomp.so - so - 1.1.0-SNAPSHOT - + + org.openecomp.so + so + 1.1.0-SNAPSHOT + - org.openecomp.so - bpmn - BPMN Subsystem - BPMN Subsystem for MSO - pom - - - 7.7.0 - 1.2 - 1.3.173 - 2.4.7 - 9.5.1-8 - 1.6 - - UTF-8 - UTF-8 - - + org.openecomp.so + bpmn + BPMN Subsystem + BPMN Subsystem for MSO + pom - - MSOCoreBPMN - MSOMockServer - MSORESTClient - MSOCommonBPMN - MSOInfrastructureBPMN - MSOURN-plugin - MSOCockpit + + 7.7.0 + 1.2 + 1.3.173 + 2.4.7 + 9.5.1-8 + 1.6 + + UTF-8 + UTF-8 + + + + + MSOCoreBPMN + MSOMockServer + MSORESTClient + MSOCommonBPMN + MSOInfrastructureBPMN + MSOURN-plugin + MSOCockpit - - - - - - org.camunda.bpm - camunda-bom - ${camunda.version} - import - pom - - - org.camunda.bpm.extension - camunda-bpm-assert - ${camunda.bpm.assert.version} - - - com.h2database - h2 - ${h2.version} - - - org.codehaus.groovy - groovy-all - ${groovy.version} - - - net.sf.saxon - Saxon-HE - ${saxon.version} - - - xmlunit - xmlunit - ${xmlunit.version} - - - javax.activation - activation - 1.1.1 - compile - - - org.springframework - spring-beans - 3.2.4.RELEASE - - - - - - - org.apache.httpcomponents - httpcore - - - org.apache.httpcomponents - httpclient - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.17 - - false - -Xss1m @{argLine} - - - - - - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.jacoco - - jacoco-maven-plugin - - - [0.7.1.201405082137,) - - - prepare-agent - - - - - - - - - - - - - - + + + + + org.camunda.bpm + camunda-bom + ${camunda.version} + import + pom + + + org.camunda.bpm.extension + camunda-bpm-assert + ${camunda.bpm.assert.version} + + + com.h2database + h2 + ${h2.version} + + + org.codehaus.groovy + groovy-all + ${groovy.version} + + + net.sf.saxon + Saxon-HE + ${saxon.version} + + + xmlunit + xmlunit + ${xmlunit.version} + + + javax.activation + activation + 1.1.1 + compile + + + org.springframework + spring-beans + 3.2.4.RELEASE + + + + + + + org.apache.httpcomponents + httpcore + + + org.apache.httpcomponents + httpclient + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.17 + + false + -Xss1m + 1 + once + + + + + + + diff --git a/pom.xml b/pom.xml index 39c12df54f..d69476f346 100644 --- a/pom.xml +++ b/pom.xml @@ -1,412 +1,414 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - - org.onap.oparent - oparent - 1.0.0-SNAPSHOT - - + + org.onap.oparent + oparent + 1.0.0-SNAPSHOT + + - org.openecomp.so - so - pom - 1.1.0-SNAPSHOT - so - This Maven project is responsible to build and package all child projects - contributions in the MSO project. + org.openecomp.so + so + pom + 1.1.0-SNAPSHOT + so + This Maven project is responsible to build and package all child projects - contributions in the MSO project. This build can be configured to run Functional tests and to start/stop a jboss server + Mysql DB. "mvn clean install -P with-integration-tests -Dintegration-tests-user=root -Dintegration-tests-group=root -Dintegration-tests-db-type=MYSQL" - - OPENECOMP - MSO - http://www.onap.org/ - - - common - mso-api-handlers - mso-catalog-db - adapters - asdc-controller - status-control - bpmn - packages - - - . - UTF-8 - UTF-8 - java - jacoco - ${project.build.directory}/surefire-reports - ${project.build.directory}/coverage-reports/jacoco.exec - ${project.mso.base.folder}/packages/arquillian-unit-tests/target/mso-automated-tests/jacoco-it.exec - true - ${project.version} - - - 2.19.3-1 - 1.1.0-SNAPSHOT - https://nexus.onap.org - /content/repositories/snapshots/ - /content/repositories/releases/ - /content/repositories/staging/ - /content/sites/site/org/onap/so/${project.version} - yyyyMMdd'T'HHmm - - - - ecomp-releases - MSO Release Repository - ${nexusproxy}/${releaseNexusPath} - - - ecomp-snapshots - MSO Snapshot Repository - ${nexusproxy}/${snapshotNexusPath} - - - ecomp-site - dav:${nexusproxy}${sitePath} - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.4 - - false - org.umlgraph.doclet.UmlGraphDoc - - org.umlgraph - umlgraph - 5.6 - - -views - true - - - - - - - - - - central - http://repo1.maven.org/maven2 - + + OPENECOMP - MSO + http://www.onap.org/ + + + common + mso-api-handlers + mso-catalog-db + adapters + asdc-controller + status-control + bpmn + packages + + + . + UTF-8 + UTF-8 + java + jacoco + ${project.build.directory}/surefire-reports + ${project.build.directory}/coverage-reports/jacoco.exec + ${project.mso.base.folder}/packages/arquillian-unit-tests/target/mso-automated-tests/jacoco-it.exec + true + ${project.version} + + + 2.19.3-1 + 1.1.0-SNAPSHOT + https://nexus.onap.org + yyyyMMdd'T'HHmm + + + + ecomp-releases + Clamp Release Repository + https://nexus.onap.org/content/repositories/releases/ + + + ecomp-snapshots + Clamp Snapshot Repository + https://nexus.onap.org/content/repositories/snapshots/ + + + ecomp-site + dav:https://nexus.onap.org/content/sites/site/org/onap/so/${project.version} + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10.4 + + false + org.umlgraph.doclet.UmlGraphDoc + + org.umlgraph + umlgraph + 5.6 + + -views + true + + + + + + + + + + central + http://repo1.maven.org/maven2 + - - Restlet - Restlet Repository - http://maven.restlet.com - - - - - central - Maven 2 repository 2 - http://repo2.maven.org/maven2/ - - - JBOSS - JBoss Repository - http://repository.jboss.org/nexus/content/groups/public-jboss/ - - - jboss-deprecated-repository - JBoss Deprecated Maven Repository - https://repository.jboss.org/nexus/content/repositories/deprecated/ - - - ecomp-releases - MSO Release Repository - ${nexusproxy}/${releaseNexusPath} - + + Restlet + Restlet Repository + http://maven.restlet.com + + + + + Onap public + https://nexus.onap.org/content/groups/public/ + Onap public + + + JBOSS + JBoss Repository + http://repository.jboss.org/nexus/content/groups/public-jboss/ + + + jboss-deprecated-repository + JBoss Deprecated Maven Repository + https://repository.jboss.org/nexus/content/repositories/deprecated/ + + + ecomp-releases + ONAP Release Repository + https://nexus.onap.org/content/repositories/releases/ + + + ecomp-staging + ONAP Staging Repository + https://nexus.onap.org/content/repositories/staging/ + + + ecomp-snapshots + ONAP Snapshot Repository + https://nexus.onap.org/content/repositories/snapshots/ + + true + + + false + + + + + CamundaWebRepo + https://app.camunda.com/nexus/content/repositories/camunda-bpm/ + Camunda Web Repository + + + CamundaPublicRepo + https://app.camunda.com/nexus/content/groups/public + Camunda Public repository + - - ecomp-staging - MSO Staging Repository - ${nexusproxy}/${stagingNexusPath} - - - ecomp-snapshots - MSO Snapshot Repository - ${nexusproxy}/${snapshotNexusPath} - - - - CamundaWebRepo - https://app.camunda.com/nexus/content/repositories/camunda-bpm/ - Camunda Web Repository - - - CamundaPublicRepo - https://app.camunda.com/nexus/content/groups/public - Camunda Public repository - - - soapUI - http://www.soapui.org/repository/maven2/ - SoapUI plugin - - - - - - - - src/main/resources - true - - - target/generated-sources/license - - third-party-licenses.txt - - - - target/generated-resources/licenses - - *.* - - third-party-licenses - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ${nexusproxy} - 176c31dfe190a - ecomp-staging - - - - org.apache.maven.plugins - maven-deploy-plugin - 2.8 - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.17 - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.6.1 - - true - -Xlint - true - true - true - 1.8 - 1.8 - - - - - - - - - org.apache.maven.plugins - maven-ejb-plugin - 2.2.1 - - 3.0 - - - true - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - 2.17 - - **/org/openecomp/**/*.java - /google_checks.xml - - - - org.codehaus.mojo - findbugs-maven-plugin - 2.5.2 - - project-configs/code-tools/findbugs_include_filter.xml - true - true - true - true - - - - org.codehaus.mojo - sonar-maven-plugin - 3.2 - - - maven-scm-plugin - 1.8.1 - - ${project.artifactId}-${project.version} - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9 - - - org.apache.maven.plugins - maven-site-plugin - 3.6 - - - org.apache.maven.wagon - wagon-webdav-jackrabbit - 2.10 - - - - - org.codehaus.mojo - cobertura-maven-plugin - 2.5.2 - - - xml - - - - - org.codehaus.mojo - versions-maven-plugin - 1.3.1 - - - org.codehaus.mojo - jboss-packaging-maven-plugin - 2.2 - - true - - - org.jacoco - jacoco-maven-plugin - 0.7.7.201606060606 - - true - - org.openecomp.* - - - - - jacoco-initialize-unit-tests - - prepare-agent - - - ${project.build.directory}/coverage-reports/jacoco.exec - - - - - - - com.fortify.ps.maven.plugin - sca-maven-plugin - 4.20 - - mso-${project.version} - 1.8 - - - - - - - - - junit - junit - 4.12 - test - - - - - - - - org.apache.httpcomponents - httpclient - 4.5 - compile - - - org.apache.httpcomponents - httpcore - 4.4.1 - compile - - - commons-codec - commons-codec - 1.10 - compile - - - commons-io - commons-io - 2.5 - compile - - - org.hamcrest - hamcrest-core - 1.3 - test - - - log4j - log4j - 1.2.17 - compile - - - org.slf4j - slf4j-api - 1.7.10 - compile - - - com.sun.xml.fastinfoset - FastInfoset - 1.2.13 - compile - - - + + soapUI + http://www.soapui.org/repository/maven2/ + SoapUI plugin + + + + + + + + src/main/resources + true + + + target/generated-sources/license + + third-party-licenses.txt + + + + target/generated-resources/licenses + + *.* + + third-party-licenses + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + ${nexusproxy} + 176c31dfe190a + ecomp-staging + + + + org.apache.maven.plugins + maven-deploy-plugin + 2.8 + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.17 + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.6.1 + + true + -Xlint + true + true + true + 1.8 + 1.8 + + + + + + + + + org.apache.maven.plugins + maven-ejb-plugin + 2.2.1 + + 3.0 + + + true + + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 2.17 + + **/org/openecomp/**/*.java + /google_checks.xml + + + + org.codehaus.mojo + findbugs-maven-plugin + 2.5.2 + + project-configs/code-tools/findbugs_include_filter.xml + true + true + true + true + + + + org.codehaus.mojo + sonar-maven-plugin + 3.2 + + + maven-scm-plugin + 1.8.1 + + ${project.artifactId}-${project.version} + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9 + + + org.apache.maven.plugins + maven-site-plugin + 3.6 + + + org.apache.maven.wagon + wagon-webdav-jackrabbit + 2.10 + + + + + org.codehaus.mojo + cobertura-maven-plugin + 2.5.2 + + + xml + + + + + org.codehaus.mojo + versions-maven-plugin + 1.3.1 + + + org.codehaus.mojo + jboss-packaging-maven-plugin + 2.2 + + true + + + org.jacoco + jacoco-maven-plugin + 0.7.7.201606060606 + + true + + org.openecomp.* + + + + + pre-unit-test + + prepare-agent + + + ${project.build.directory}/coverage-reports/jacoco.exec + + + + + + + com.fortify.ps.maven.plugin + sca-maven-plugin + 4.20 + + mso-${project.version} + 1.8 + + + + + + + + + junit + junit + 4.12 + test + + + + + + + + org.apache.httpcomponents + httpclient + 4.5 + compile + + + org.apache.httpcomponents + httpcore + 4.4.1 + compile + + + commons-codec + commons-codec + 1.10 + compile + + + commons-io + commons-io + 2.5 + compile + + + org.hamcrest + hamcrest-core + 1.3 + test + + + log4j + log4j + 1.2.17 + compile + + + org.slf4j + slf4j-api + 1.7.10 + compile + + + com.sun.xml.fastinfoset + FastInfoset + 1.2.13 + compile + + + -- cgit 1.2.3-korg