Merge "changes for java 11 upgradation Issue-ID: SO-3082"

author Seshu Kumar M <seshu.kumar.m@huawei.com>

Fri, 7 Aug 2020 05:37:05 +0000 (05:37 +0000)

committer Gerrit Code Review <gerrit@onap.org>

Fri, 7 Aug 2020 05:37:05 +0000 (05:37 +0000)
author Seshu Kumar M <seshu.kumar.m@huawei.com>
Fri, 7 Aug 2020 05:37:05 +0000 (05:37 +0000)
committer Gerrit Code Review <gerrit@onap.org>
Fri, 7 Aug 2020 05:37:05 +0000 (05:37 +0000)
diff --cc pom.xml
Simple merge
diff --cc so-monitoring/pom.xml
Simple merge
diff --cc so-monitoring/so-monitoring-handler/pom.xml
Simple merge
diff --cc so-monitoring/so-monitoring-ui/pom.xml
Simple merge
author	Seshu Kumar M <seshu.kumar.m@huawei.com>
	Fri, 7 Aug 2020 05:37:05 +0000 (05:37 +0000)
committer	Gerrit Code Review <gerrit@onap.org>
	Fri, 7 Aug 2020 05:37:05 +0000 (05:37 +0000)
		1	2
pom.xml	patch \|	diff1 \|	diff2 \|	blob \| history
so-monitoring/pom.xml	patch \|	diff1 \|	diff2 \|	blob \| history
so-monitoring/so-monitoring-handler/pom.xml	patch \|	diff1 \|	diff2 \|	blob \| history
so-monitoring/so-monitoring-ui/pom.xml	patch \|	diff1 \|	diff2 \|	blob \| history