Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Pass down a collection of cohorts"
[controller.git]
/
opendaylight
/
md-sal
/
topology-lldp-discovery
/
pom.xml
diff --git
a/opendaylight/md-sal/topology-lldp-discovery/pom.xml
b/opendaylight/md-sal/topology-lldp-discovery/pom.xml
index 50d85b786110c3cdb820c3921fc54b2be32e3f13..70cd4b87029fc6e0f9fc57ed9c62509240442680 100644
(file)
--- a/
opendaylight/md-sal/topology-lldp-discovery/pom.xml
+++ b/
opendaylight/md-sal/topology-lldp-discovery/pom.xml
@@
-4,7
+4,7
@@
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-parent</artifactId>
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-parent</artifactId>
- <version>1.
1
-SNAPSHOT</version>
+ <version>1.
2.0
-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<groupId>org.opendaylight.controller.md</groupId>
<relativePath>../</relativePath>
</parent>
<groupId>org.opendaylight.controller.md</groupId>
@@
-12,15
+12,9
@@
<packaging>bundle</packaging>
<properties>
<bundle.plugin.version>2.4.0</bundle.plugin.version>
<packaging>bundle</packaging>
<properties>
<bundle.plugin.version>2.4.0</bundle.plugin.version>
- <guava.version>14.0.1</guava.version>
<maven.clean.plugin.version>2.5</maven.clean.plugin.version>
<maven.clean.plugin.version>2.5</maven.clean.plugin.version>
- <xtend.version>2.4.3</xtend.version>
</properties>
<dependencies>
</properties>
<dependencies>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
@@
-32,32
+26,23
@@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.4</version>
</dependency>
<dependency>
<groupId>equinoxSDK381</groupId>
<artifactId>org.eclipse.osgi</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>equinoxSDK381</groupId>
<artifactId>org.eclipse.osgi</artifactId>
</dependency>
- <dependency>
- <groupId>org.eclipse.xtend</groupId>
- <artifactId>org.eclipse.xtend.lib</artifactId>
- </dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
- <artifactId>sal</artifactId>
+ <artifactId>sal
-binding-api
</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
- <artifactId>
sal-binding-api
</artifactId>
+ <artifactId>
liblldp
</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller.model</groupId>
<artifactId>model-flow-base</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>org.opendaylight.controller.model</groupId>
<artifactId>model-flow-base</artifactId>
</dependency>
- <dependency>
- <groupId>org.opendaylight.controller.model</groupId>
- <artifactId>model-flow-management</artifactId>
- </dependency>
<dependency>
<groupId>org.opendaylight.controller.model</groupId>
<artifactId>model-flow-service</artifactId>
<dependency>
<groupId>org.opendaylight.controller.model</groupId>
<artifactId>model-flow-service</artifactId>
@@
-86,10
+71,6
@@
<manifestLocation>${project.basedir}/META-INF</manifestLocation>
</configuration>
</plugin>
<manifestLocation>${project.basedir}/META-INF</manifestLocation>
</configuration>
</plugin>
- <plugin>
- <groupId>org.eclipse.xtend</groupId>
- <artifactId>xtend-maven-plugin</artifactId>
- </plugin>
</plugins>
</build>
<scm>
</plugins>
</build>
<scm>