Code Review
/
vfc
/
nfvo
/
driver
/
vnfm
/
svnfm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Fix CVE-2018-1271, CVE-2018-10237"
[vfc/nfvo/driver/vnfm/svnfm.git]
/
pom.xml
diff --git
a/pom.xml
b/pom.xml
index
ea84369
..
f8f1902
100644
(file)
--- a/
pom.xml
+++ b/
pom.xml
@@
-14,6
+14,7
@@
See the License for the specific language governing permissions and
limitations under the License.
-->
See the License for the specific language governing permissions and
limitations under the License.
-->
+<!-- trigger merge -->
<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">
<parent>
<groupId>org.onap.oparent</groupId>
<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">
<parent>
<groupId>org.onap.oparent</groupId>
@@
-27,10
+28,23
@@
<packaging>pom</packaging>
<name>vfc-nfvo-driver-vnfm-svnfm</name>
<description>vfc-nfvo-driver-vnfm-svnfm</description>
<packaging>pom</packaging>
<name>vfc-nfvo-driver-vnfm-svnfm</name>
<description>vfc-nfvo-driver-vnfm-svnfm</description>
- <modules>
- <module>zte</module>
- <module>huawei</module>
- <module>nokia</module>
- <module>nokiav2</module>
- </modules>
+ <profiles>
+ <profile>
+ <id>all</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>huawei</module>
+ <module>nokia</module>
+ <module>nokiav2</module>
+ <module>zte</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>rootOnly</id>
+ <modules>
+ </modules>
+ </profile>
+ </profiles>
</project>
</project>