diff options
| author |   Dan Timoney <dt5972@att.com> | 2018-09-04 13:45:09 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-09-04 13:45:09 +0000 |
| commit | 558ff7a5a5e7e66a1493510480af063a9d51529c (patch) | |
| tree | c42cd3a03d9b0d161a2ba3c53ad3c322e5af3826 /sdnr/wireless-transport | |
| parent | 208cb6ae94922c0198648aea817085793ce8bc47 (diff) | |
| parent | 5de5c41d9c9aa1fff272abd54020f40af3a6c7a9 (diff) | |
Merge "Use managed guava version"
Diffstat (limited to 'sdnr/wireless-transport')
| -rw-r--r-- | sdnr/wireless-transport/code-Carbon-SR1/apps/devicemanager/impl/pom.xml | 4 | ||||
| -rw-r--r-- | sdnr/wireless-transport/code-Carbon-SR1/apps/dlux/loader/impl/pom.xml | 2 |
2 files changed, 2 insertions, 4 deletions
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> |