summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2018-08-24 15:16:48 -0700
committerGary Wu <gary.i.wu@huawei.com>2018-08-27 10:25:37 -0700
commit5de5c41d9c9aa1fff272abd54020f40af3a6c7a9 (patch)
tree4d34d28ac67c9ede5f4cb589629e4527d3fc228e
parent01699e4711353ea630a15561e589c0b27c783b80 (diff)
Use managed guava version
Use centrally managed guava version specified in oparent. Includes upgrade to oparent 1.2.0. This change was submitted by script and may include additional whitespace or formatting changes. Change-Id: I6b131c9311f70a46b67b81119ef201b93c28ffa5 Issue-ID: INT-619 Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
-rw-r--r--ms/blueprintsprocessor/parent/pom.xml5
-rw-r--r--ms/controllerblueprints/parent/pom.xml8
-rw-r--r--sdnr/wireless-transport/code-Carbon-SR1/apps/devicemanager/impl/pom.xml4
-rw-r--r--sdnr/wireless-transport/code-Carbon-SR1/apps/dlux/loader/impl/pom.xml2
4 files changed, 6 insertions, 13 deletions
diff --git a/ms/blueprintsprocessor/parent/pom.xml b/ms/blueprintsprocessor/parent/pom.xml
index 79039aa3..ea27c63a 100644
--- a/ms/blueprintsprocessor/parent/pom.xml
+++ b/ms/blueprintsprocessor/parent/pom.xml
@@ -14,8 +14,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<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">
+<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.onap.ccsdk.apps</groupId>
@@ -156,7 +155,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>25.1-jre</version>
+
</dependency>
<!-- Database -->
diff --git a/ms/controllerblueprints/parent/pom.xml b/ms/controllerblueprints/parent/pom.xml
index e48c1134..1e8b8f2d 100644
--- a/ms/controllerblueprints/parent/pom.xml
+++ b/ms/controllerblueprints/parent/pom.xml
@@ -14,11 +14,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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.onap.ccsdk.apps</groupId>
@@ -89,7 +85,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>25.1-jre</version>
+
</dependency>
<!-- Kotlin Dependencies -->
diff --git a/sdnr/wireless-transport/code-Carbon-SR1/apps/devicemanager/impl/pom.xml b/sdnr/wireless-transport/code-Carbon-SR1/apps/devicemanager/impl/pom.xml
index 7f9640f2..7dd3e739 100644
--- a/sdnr/wireless-transport/code-Carbon-SR1/apps/devicemanager/impl/pom.xml
+++ b/sdnr/wireless-transport/code-Carbon-SR1/apps/devicemanager/impl/pom.xml
@@ -3,8 +3,7 @@
the accompanying materials are made available under the terms of the Eclipse
Public License v1.0 which accompanies this distribution, and is available
at http://www.eclipse.org/legal/epl-v10.html INTERNAL -->
-<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">
+<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.opendaylight.mwtn</groupId>
<artifactId>config-parent</artifactId>
@@ -346,4 +345,3 @@
</build>
</project>
-
diff --git a/sdnr/wireless-transport/code-Carbon-SR1/apps/dlux/loader/impl/pom.xml b/sdnr/wireless-transport/code-Carbon-SR1/apps/dlux/loader/impl/pom.xml
index a7892d2c..e5329d89 100644
--- a/sdnr/wireless-transport/code-Carbon-SR1/apps/dlux/loader/impl/pom.xml
+++ b/sdnr/wireless-transport/code-Carbon-SR1/apps/dlux/loader/impl/pom.xml
@@ -79,7 +79,7 @@
<include>dlux/</include>
<include>index/</include>
</includes>
- <excludes></excludes>
+ <excludes/>
<followSymlinks>false</followSymlinks>
</fileset>
</filesets>