diff options
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 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.openecomp.so</groupId> - <artifactId>so</artifactId> - <version>1.1.0-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.openecomp.so</groupId> + <artifactId>so</artifactId> + <version>1.1.0-SNAPSHOT</version> + </parent> - <groupId>org.openecomp.so</groupId> - <artifactId>bpmn</artifactId> - <name>BPMN Subsystem</name> - <description>BPMN Subsystem for MSO</description> - <packaging>pom</packaging> - - <properties> - <camunda.version>7.7.0</camunda.version> - <camunda.bpm.assert.version>1.2</camunda.bpm.assert.version> - <h2.version>1.3.173</h2.version> - <groovy.version>2.4.7</groovy.version> - <saxon.version>9.5.1-8</saxon.version> - <xmlunit.version>1.6</xmlunit.version> - - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - - </properties> + <groupId>org.openecomp.so</groupId> + <artifactId>bpmn</artifactId> + <name>BPMN Subsystem</name> + <description>BPMN Subsystem for MSO</description> + <packaging>pom</packaging> - <modules> - <module>MSOCoreBPMN</module> - <module>MSOMockServer</module> - <module>MSORESTClient</module> - <module>MSOCommonBPMN</module> - <module>MSOInfrastructureBPMN</module> - <module>MSOURN-plugin</module> - <module>MSOCockpit</module> + <properties> + <camunda.version>7.7.0</camunda.version> + <camunda.bpm.assert.version>1.2</camunda.bpm.assert.version> + <h2.version>1.3.173</h2.version> + <groovy.version>2.4.7</groovy.version> + <saxon.version>9.5.1-8</saxon.version> + <xmlunit.version>1.6</xmlunit.version> + + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + + </properties> + + <modules> + <module>MSOCoreBPMN</module> + <module>MSOMockServer</module> + <module>MSORESTClient</module> + <module>MSOCommonBPMN</module> + <module>MSOInfrastructureBPMN</module> + <module>MSOURN-plugin</module> + <module>MSOCockpit</module> </modules> - - <!-- Define artifact versions for child modules --> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.camunda.bpm</groupId> - <artifactId>camunda-bom</artifactId> - <version>${camunda.version}</version> - <scope>import</scope> - <type>pom</type> - </dependency> - <dependency> - <groupId>org.camunda.bpm.extension</groupId> - <artifactId>camunda-bpm-assert</artifactId> - <version>${camunda.bpm.assert.version}</version> - </dependency> - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <version>${h2.version}</version> - </dependency> - <dependency> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-all</artifactId> - <version>${groovy.version}</version> - </dependency> - <dependency> - <groupId>net.sf.saxon</groupId> - <artifactId>Saxon-HE</artifactId> - <version>${saxon.version}</version> - </dependency> - <dependency> - <groupId>xmlunit</groupId> - <artifactId>xmlunit</artifactId> - <version>${xmlunit.version}</version> - </dependency> - <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - <version>1.1.1</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-beans</artifactId> - <version>3.2.4.RELEASE</version> - </dependency> - </dependencies> - </dependencyManagement> - - <dependencies> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore</artifactId> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - </dependency> - </dependencies> - - <build> - <plugins> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.17</version> - <configuration> - <testFailureIgnore>false</testFailureIgnore> - <argLine>-Xss1m @{argLine}</argLine> - <properties> - </properties> - </configuration> - -<!-- <configuration> - <testFailureIgnore>true</testFailureIgnore> - <forkCount>1</forkCount> - <forkMode>once</forkMode> - </configuration> --> - </plugin> - </plugins> - <pluginManagement> - <plugins> - <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> - <plugin> - <groupId>org.eclipse.m2e</groupId> - <artifactId>lifecycle-mapping</artifactId> - <version>1.0.0</version> - <configuration> - <lifecycleMappingMetadata> - <pluginExecutions> - <pluginExecution> - <pluginExecutionFilter> - <groupId>org.jacoco</groupId> - <artifactId> - jacoco-maven-plugin - </artifactId> - <versionRange> - [0.7.1.201405082137,) - </versionRange> - <goals> - <goal>prepare-agent</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore></ignore> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - </plugin> - - </plugins> - </pluginManagement> - </build> + <!-- Define artifact versions for child modules --> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.camunda.bpm</groupId> + <artifactId>camunda-bom</artifactId> + <version>${camunda.version}</version> + <scope>import</scope> + <type>pom</type> + </dependency> + <dependency> + <groupId>org.camunda.bpm.extension</groupId> + <artifactId>camunda-bpm-assert</artifactId> + <version>${camunda.bpm.assert.version}</version> + </dependency> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>${h2.version}</version> + </dependency> + <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-all</artifactId> + <version>${groovy.version}</version> + </dependency> + <dependency> + <groupId>net.sf.saxon</groupId> + <artifactId>Saxon-HE</artifactId> + <version>${saxon.version}</version> + </dependency> + <dependency> + <groupId>xmlunit</groupId> + <artifactId>xmlunit</artifactId> + <version>${xmlunit.version}</version> + </dependency> + <dependency> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + <version>1.1.1</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + <version>3.2.4.RELEASE</version> + </dependency> + </dependencies> + </dependencyManagement> + + <dependencies> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </dependency> + </dependencies> + + <build> + <plugins> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.17</version> + <configuration> + <testFailureIgnore>false</testFailureIgnore> + <argLine>-Xss1m</argLine> + <forkCount>1</forkCount> + <forkMode>once</forkMode> + <properties> + </properties> + </configuration> + </plugin> + + </plugins> + </build> </project> @@ -1,412 +1,414 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.onap.oparent</groupId> - <artifactId>oparent</artifactId> - <version>1.0.0-SNAPSHOT</version> - <relativePath/> - </parent> + <parent> + <groupId>org.onap.oparent</groupId> + <artifactId>oparent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath /> + </parent> - <groupId>org.openecomp.so</groupId> - <artifactId>so</artifactId> - <packaging>pom</packaging> - <version>1.1.0-SNAPSHOT</version> - <name>so</name> - <description>This Maven project is responsible to build and package all child projects - contributions in the MSO project. + <groupId>org.openecomp.so</groupId> + <artifactId>so</artifactId> + <packaging>pom</packaging> + <version>1.1.0-SNAPSHOT</version> + <name>so</name> + <description>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" </description> - <organization> - <name>OPENECOMP - MSO</name> - <url>http://www.onap.org/</url> - </organization> - <modules> - <module>common</module> - <module>mso-api-handlers</module> - <module>mso-catalog-db</module> - <module>adapters</module> - <module>asdc-controller</module> - <module>status-control</module> - <module>bpmn</module> - <module>packages</module> - </modules> - <properties> - <project.mso.base.folder>.</project.mso.base.folder> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <sonar.language>java</sonar.language> - <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin> - <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath> - <sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath> - <sonar.jacoco.itReportPath>${project.mso.base.folder}/packages/arquillian-unit-tests/target/mso-automated-tests/jacoco-it.exec</sonar.jacoco.itReportPath> - <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero> - <sonar.projectVersion>${project.version}</sonar.projectVersion> - <org.apache.maven.user-settings></org.apache.maven.user-settings> - <!-- this is used for Chef mso-code cookbook --> - <swm.version>2.19.3-1</swm.version> - <openstack.version>1.1.0-SNAPSHOT</openstack.version> - <nexusproxy>https://nexus.onap.org</nexusproxy> - <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath> - <releaseNexusPath>/content/repositories/releases/</releaseNexusPath> - <stagingNexusPath>/content/repositories/staging/</stagingNexusPath> - <sitePath>/content/sites/site/org/onap/so/${project.version}</sitePath> - <maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format> - </properties> - <distributionManagement> - <repository> - <id>ecomp-releases</id> - <name>MSO Release Repository</name> - <url>${nexusproxy}/${releaseNexusPath}</url> - </repository> - <snapshotRepository> - <id>ecomp-snapshots</id> - <name>MSO Snapshot Repository</name> - <url>${nexusproxy}/${snapshotNexusPath}</url> - </snapshotRepository> - <site> - <id>ecomp-site</id> - <url>dav:${nexusproxy}${sitePath}</url> - </site> - </distributionManagement> - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.4</version> - <configuration> - <failOnError>false</failOnError> - <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet> - <docletArtifact> - <groupId>org.umlgraph</groupId> - <artifactId>umlgraph</artifactId> - <version>5.6</version> - </docletArtifact> - <additionalparam>-views</additionalparam> - <useStandardDocletOptions>true</useStandardDocletOptions> - </configuration> - </plugin> - </plugins> - </reporting> - <!-- configure build --> - <!-- *********************************************************************************************************** --> - <!-- Plugins and repositories --> - <pluginRepositories> - <pluginRepository> - <id>central</id> - <url>http://repo1.maven.org/maven2</url> - </pluginRepository> + <organization> + <name>OPENECOMP - MSO</name> + <url>http://www.onap.org/</url> + </organization> + <modules> + <module>common</module> + <module>mso-api-handlers</module> + <module>mso-catalog-db</module> + <module>adapters</module> + <module>asdc-controller</module> + <module>status-control</module> + <module>bpmn</module> + <module>packages</module> + </modules> + <properties> + <project.mso.base.folder>.</project.mso.base.folder> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + <sonar.language>java</sonar.language> + <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin> + <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath> + <sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath> + <sonar.jacoco.itReportPath>${project.mso.base.folder}/packages/arquillian-unit-tests/target/mso-automated-tests/jacoco-it.exec</sonar.jacoco.itReportPath> + <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero> + <sonar.projectVersion>${project.version}</sonar.projectVersion> + <org.apache.maven.user-settings></org.apache.maven.user-settings> + <!-- this is used for Chef mso-code cookbook --> + <swm.version>2.19.3-1</swm.version> + <openstack.version>1.1.0-SNAPSHOT</openstack.version> + <nexusproxy>https://nexus.onap.org</nexusproxy> + <maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format> + </properties> + <distributionManagement> + <repository> + <id>ecomp-releases</id> + <name>Clamp Release Repository</name> + <url>https://nexus.onap.org/content/repositories/releases/</url> + </repository> + <snapshotRepository> + <id>ecomp-snapshots</id> + <name>Clamp Snapshot Repository</name> + <url>https://nexus.onap.org/content/repositories/snapshots/</url> + </snapshotRepository> + <site> + <id>ecomp-site</id> + <url>dav:https://nexus.onap.org/content/sites/site/org/onap/so/${project.version}</url> + </site> + </distributionManagement> + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.10.4</version> + <configuration> + <failOnError>false</failOnError> + <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet> + <docletArtifact> + <groupId>org.umlgraph</groupId> + <artifactId>umlgraph</artifactId> + <version>5.6</version> + </docletArtifact> + <additionalparam>-views</additionalparam> + <useStandardDocletOptions>true</useStandardDocletOptions> + </configuration> + </plugin> + </plugins> + </reporting> + <!-- configure build --> + <!-- *********************************************************************************************************** --> + <!-- Plugins and repositories --> + <pluginRepositories> + <pluginRepository> + <id>central</id> + <url>http://repo1.maven.org/maven2</url> + </pluginRepository> - <pluginRepository> - <id>Restlet</id> - <name>Restlet Repository</name> - <url>http://maven.restlet.com</url> - </pluginRepository> - </pluginRepositories> - <repositories> - <repository> - <id>central</id> - <name>Maven 2 repository 2</name> - <url>http://repo2.maven.org/maven2/</url> - </repository> - <repository> - <id>JBOSS</id> - <name>JBoss Repository</name> - <url>http://repository.jboss.org/nexus/content/groups/public-jboss/</url> - </repository> - <repository> - <id>jboss-deprecated-repository</id> - <name>JBoss Deprecated Maven Repository</name> - <url>https://repository.jboss.org/nexus/content/repositories/deprecated/</url> - </repository> - <repository> - <id>ecomp-releases</id> - <name>MSO Release Repository</name> - <url>${nexusproxy}/${releaseNexusPath}</url> - </repository> + <pluginRepository> + <id>Restlet</id> + <name>Restlet Repository</name> + <url>http://maven.restlet.com</url> + </pluginRepository> + </pluginRepositories> + <repositories> + <repository> + <id>Onap public</id> + <url>https://nexus.onap.org/content/groups/public/</url> + <name>Onap public</name> + </repository> + <repository> + <id>JBOSS</id> + <name>JBoss Repository</name> + <url>http://repository.jboss.org/nexus/content/groups/public-jboss/</url> + </repository> + <repository> + <id>jboss-deprecated-repository</id> + <name>JBoss Deprecated Maven Repository</name> + <url>https://repository.jboss.org/nexus/content/repositories/deprecated/</url> + </repository> + <repository> + <id>ecomp-releases</id> + <name>ONAP Release Repository</name> + <url>https://nexus.onap.org/content/repositories/releases/</url> + </repository> + <repository> + <id>ecomp-staging</id> + <name>ONAP Staging Repository</name> + <url>https://nexus.onap.org/content/repositories/staging/</url> + </repository> + <repository> + <id>ecomp-snapshots</id> + <name>ONAP Snapshot Repository</name> + <url>https://nexus.onap.org/content/repositories/snapshots/</url> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>false</enabled> + </releases> + </repository> + <!-- Camunda Web Repository --> + <repository> + <id>CamundaWebRepo</id> + <url>https://app.camunda.com/nexus/content/repositories/camunda-bpm/</url> + <name>Camunda Web Repository</name> + </repository> + <repository> + <id>CamundaPublicRepo</id> + <url>https://app.camunda.com/nexus/content/groups/public</url> + <name>Camunda Public repository</name> + </repository> - <repository> - <id>ecomp-staging</id> - <name>MSO Staging Repository</name> - <url>${nexusproxy}/${stagingNexusPath}</url> - </repository> - <repository> - <id>ecomp-snapshots</id> - <name>MSO Snapshot Repository</name> - <url>${nexusproxy}/${snapshotNexusPath}</url> - </repository> - <!-- Camunda Web Repository --> - <repository> - <id>CamundaWebRepo</id> - <url>https://app.camunda.com/nexus/content/repositories/camunda-bpm/</url> - <name>Camunda Web Repository</name> - </repository> - <repository> - <id>CamundaPublicRepo</id> - <url>https://app.camunda.com/nexus/content/groups/public</url> - <name>Camunda Public repository</name> - </repository> - <repository> - <id>soapUI</id> - <url>http://www.soapui.org/repository/maven2/</url> - <name>SoapUI plugin</name> - </repository> - </repositories> - <!-- *********************************************************************************************************** --> - <!-- Build --> - <build> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - </resource> - <resource> - <directory>target/generated-sources/license</directory> - <includes> - <include>third-party-licenses.txt</include> - </includes> - </resource> - <resource> - <directory>target/generated-resources/licenses</directory> - <includes> - <include>*.*</include> - </includes> - <targetPath>third-party-licenses</targetPath> - </resource> - </resources> - <plugins> - <plugin> - <groupId>org.sonatype.plugins</groupId> - <artifactId>nexus-staging-maven-plugin</artifactId> - <version>1.6.7</version> - <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-deploy-plugin</artifactId> - <version>2.8</version> <!-- This version supports the "deployAtEnd" parameter --> - <configuration> - <skip /> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.17</version> - <configuration> - <!-- <forkCount>2C</forkCount> - <reuseForks>true</reuseForks> --> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.6.1</version> - <configuration> - <debug>true</debug> - <compilerArgument>-Xlint</compilerArgument> - <verbose>true</verbose> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - <source>1.8</source> - <target>1.8</target> - </configuration> - </plugin> - <!-- <plugin> --> - <!-- <groupId>org.codehaus.mojo</groupId> --> - <!-- <artifactId>sonar-maven-plugin</artifactId> --> - <!-- <version>2.1</version> --> - <!-- </plugin> --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-ejb-plugin</artifactId> - <version>2.2.1</version> - <configuration> - <ejbVersion>3.0</ejbVersion> - <archive> - <manifest> - <addClasspath>true</addClasspath> - </manifest> - </archive> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.17</version> - <configuration> - <includes>**/org/openecomp/**/*.java</includes> - <configLocation>/google_checks.xml</configLocation> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <version>2.5.2</version> - <configuration> - <includeFilterFile>project-configs/code-tools/findbugs_include_filter.xml</includeFilterFile> - <nested>true</nested> - <findbugsXmlOutput>true</findbugsXmlOutput> - <findbugsXmlWithMessages>true</findbugsXmlWithMessages> - <xmlOutput>true</xmlOutput> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>sonar-maven-plugin</artifactId> - <version>3.2</version> - </plugin> - <plugin> - <artifactId>maven-scm-plugin</artifactId> - <version>1.8.1</version> - <configuration> - <tag>${project.artifactId}-${project.version}</tag> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.9</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <version>3.6</version> - <dependencies> - <dependency> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-webdav-jackrabbit</artifactId> - <version>2.10</version> - </dependency> - </dependencies> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>cobertura-maven-plugin</artifactId> - <version>2.5.2</version> - <configuration> - <formats> - <format>xml</format> - </formats> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>versions-maven-plugin</artifactId> - <version>1.3.1</version> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jboss-packaging-maven-plugin</artifactId> - <version>2.2</version> - <!-- <configuration> <archive> <manifest> <addClasspath>true</addClasspath> - </manifest> </archive> </configuration> Enable 'jboss-sar', etc., as a recoginized - maven packaging type --> - <extensions>true</extensions> - </plugin> - <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - <version>0.7.7.201606060606</version> - <configuration> - <dumpOnExit>true</dumpOnExit> - <includes> - <include>org.openecomp.*</include> - </includes> - </configuration> - <executions> - <execution> - <id>jacoco-initialize-unit-tests</id> - <goals> - <goal>prepare-agent</goal> - </goals> - <configuration> - <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile> - <!-- <append>true</append> --> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>com.fortify.ps.maven.plugin</groupId> - <artifactId>sca-maven-plugin</artifactId> - <version>4.20</version> - <configuration> - <buildId>mso-${project.version}</buildId> - <source>1.8</source> - </configuration> - </plugin> - </plugins> - </build> - <!-- *********************************************************************************************************** --> - <!-- Dependencies --> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.12</version> - <scope>test</scope> - </dependency> - </dependencies> - <dependencyManagement> - <dependencies> - <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient --> - <!-- force use of version 4.5 everywhere in transient deps, aligned on WildFly 10 version --> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - <version>4.5</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore</artifactId> - <version>4.4.1</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>1.10</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>2.5</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-core</artifactId> - <version>1.3</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.17</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>1.7.10</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>com.sun.xml.fastinfoset</groupId> - <artifactId>FastInfoset</artifactId> - <version>1.2.13</version> - <scope>compile</scope> - </dependency> - </dependencies> - </dependencyManagement> + <repository> + <id>soapUI</id> + <url>http://www.soapui.org/repository/maven2/</url> + <name>SoapUI plugin</name> + </repository> + </repositories> + <!-- *********************************************************************************************************** --> + <!-- Build --> + <build> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + </resource> + <resource> + <directory>target/generated-sources/license</directory> + <includes> + <include>third-party-licenses.txt</include> + </includes> + </resource> + <resource> + <directory>target/generated-resources/licenses</directory> + <includes> + <include>*.*</include> + </includes> + <targetPath>third-party-licenses</targetPath> + </resource> + </resources> + <plugins> + <plugin> + <groupId>org.sonatype.plugins</groupId> + <artifactId>nexus-staging-maven-plugin</artifactId> + <version>1.6.7</version> + <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-deploy-plugin</artifactId> + <version>2.8</version> <!-- This version supports the "deployAtEnd" parameter --> + <configuration> + <skip /> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.17</version> + <configuration> + <!-- <forkCount>2C</forkCount> <reuseForks>true</reuseForks> --> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.6.1</version> + <configuration> + <debug>true</debug> + <compilerArgument>-Xlint</compilerArgument> + <verbose>true</verbose> + <showDeprecation>true</showDeprecation> + <showWarnings>true</showWarnings> + <source>1.8</source> + <target>1.8</target> + </configuration> + </plugin> + <!-- <plugin> --> + <!-- <groupId>org.codehaus.mojo</groupId> --> + <!-- <artifactId>sonar-maven-plugin</artifactId> --> + <!-- <version>2.1</version> --> + <!-- </plugin> --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-ejb-plugin</artifactId> + <version>2.2.1</version> + <configuration> + <ejbVersion>3.0</ejbVersion> + <archive> + <manifest> + <addClasspath>true</addClasspath> + </manifest> + </archive> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <version>2.17</version> + <configuration> + <includes>**/org/openecomp/**/*.java</includes> + <configLocation>/google_checks.xml</configLocation> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>findbugs-maven-plugin</artifactId> + <version>2.5.2</version> + <configuration> + <includeFilterFile>project-configs/code-tools/findbugs_include_filter.xml</includeFilterFile> + <nested>true</nested> + <findbugsXmlOutput>true</findbugsXmlOutput> + <findbugsXmlWithMessages>true</findbugsXmlWithMessages> + <xmlOutput>true</xmlOutput> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>sonar-maven-plugin</artifactId> + <version>3.2</version> + </plugin> + <plugin> + <artifactId>maven-scm-plugin</artifactId> + <version>1.8.1</version> + <configuration> + <tag>${project.artifactId}-${project.version}</tag> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.9</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-site-plugin</artifactId> + <version>3.6</version> + <dependencies> + <dependency> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-webdav-jackrabbit</artifactId> + <version>2.10</version> + </dependency> + </dependencies> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>cobertura-maven-plugin</artifactId> + <version>2.5.2</version> + <configuration> + <formats> + <format>xml</format> + </formats> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>versions-maven-plugin</artifactId> + <version>1.3.1</version> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jboss-packaging-maven-plugin</artifactId> + <version>2.2</version> + <!-- <configuration> <archive> <manifest> <addClasspath>true</addClasspath> + </manifest> </archive> </configuration> Enable 'jboss-sar', etc., as a recoginized + maven packaging type --> + <extensions>true</extensions> + </plugin> + <plugin> + <groupId>org.jacoco</groupId> + <artifactId>jacoco-maven-plugin</artifactId> + <version>0.7.7.201606060606</version> + <configuration> + <dumpOnExit>true</dumpOnExit> + <includes> + <include>org.openecomp.*</include> + </includes> + </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> + </executions> + </plugin> + <plugin> + <groupId>com.fortify.ps.maven.plugin</groupId> + <artifactId>sca-maven-plugin</artifactId> + <version>4.20</version> + <configuration> + <buildId>mso-${project.version}</buildId> + <source>1.8</source> + </configuration> + </plugin> + </plugins> + </build> + <!-- *********************************************************************************************************** --> + <!-- Dependencies --> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.12</version> + <scope>test</scope> + </dependency> + </dependencies> + <dependencyManagement> + <dependencies> + <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient --> + <!-- force use of version 4.5 everywhere in transient deps, aligned + on WildFly 10 version --> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>4.5</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + <version>4.4.1</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.10</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>2.5</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-core</artifactId> + <version>1.3</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.17</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.7.10</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>com.sun.xml.fastinfoset</groupId> + <artifactId>FastInfoset</artifactId> + <version>1.2.13</version> + <scope>compile</scope> + </dependency> + </dependencies> + </dependencyManagement> </project> |