diff options
| author |   liboNet <libo.zhu@intel.com> | 2019-03-20 03:10:03 +0800 |
|---|---|---|
| committer | liboNet <libo.zhu@intel.com> | 2019-03-20 03:17:48 +0800 |
| commit | efb2229057ed70b0dd46c1e4fdfb8462727cef03 (patch) | |
| tree | b83a997c45c31a6ac085bcf477ba6985fa1556fb /multivimbroker | |
| parent | eacb658bc442fe30d07a7971a12be917fb8cd692 (diff) | |
add submodule support in framework
support multi broker and fix sonar.sh issue
. add a new module of artifact broker
. update framework pom.xml to support submodules
. update the multivim broker to align with the case
like subplugins under openstack
. remove the duplicated sonar.sh
Change-Id: Ie41dc07aed9e015208e79aadff204747269af638
Issue-ID: MULTICLOUD-532
Signed-off-by: liboNet <libo.zhu@intel.com>
Diffstat (limited to 'multivimbroker')
| -rw-r--r-- | multivimbroker/pom.xml | 83 | ||||
| -rwxr-xr-x | multivimbroker/sonar.sh | 2 |
2 files changed, 68 insertions, 17 deletions
diff --git a/multivimbroker/pom.xml b/multivimbroker/pom.xml index ef627af..d9da20a 100644 --- a/multivimbroker/pom.xml +++ b/multivimbroker/pom.xml @@ -34,25 +34,76 @@ <nexusproxy>https://nexus.onap.org</nexusproxy> </properties> <build> + <pluginManagement> <plugins> <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <appendAssemblyId>false</appendAssemblyId> - <descriptors> - <descriptor>assembly.xml</descriptor> - </descriptors> - </configuration> - <executions> - <execution> - <id>make-assembly</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>1.1.1</version> + <configuration> + <executable>${project.basedir}/sonar.sh</executable> + <environmentVariables> + <!-- make mvn properties as env for our script --> + <MVN_PROJECT_GROUPID>${project.groupId}</MVN_PROJECT_GROUPID> + <MVN_PROJECT_ARTIFACTID>${project.artifactId}</MVN_PROJECT_ARTIFACTID> + <MVN_PROJECT_VERSION>${project.version}</MVN_PROJECT_VERSION> + </environmentVariables> + </configuration> </plugin> </plugins> + </pluginManagement> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>1.1.1</version> + <executions> + <execution> + <id>clean phase script</id> + <phase>clean</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <arguments> + <argument>__</argument> + <argument>clean</argument> + </arguments> + </configuration> + </execution> + <execution> + <id>test script</id> + <phase>test</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <arguments> + <argument>__</argument> + <argument>test</argument> + </arguments> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <appendAssemblyId>false</appendAssemblyId> + <descriptors> + <descriptor>assembly.xml</descriptor> + </descriptors> + </configuration> + <executions> + <execution> + <id>make-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> </build> </project> diff --git a/multivimbroker/sonar.sh b/multivimbroker/sonar.sh index e173d1f..41cc450 100755 --- a/multivimbroker/sonar.sh +++ b/multivimbroker/sonar.sh @@ -56,7 +56,7 @@ run_tox_test() pip install --upgrade pip pip install --upgrade tox argparse pip freeze - cd multivimbroker + cd ${CURDIR} tox -e cover deactivate cd .. |