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 "Added a generic API to return a list of configured switches that are not conne...
[controller.git]
/
opendaylight
/
commons
/
opendaylight
/
pom.xml
diff --git
a/opendaylight/commons/opendaylight/pom.xml
b/opendaylight/commons/opendaylight/pom.xml
index 2a818067cec223101b907c90a79d4a4f84cea622..dd73815b34475757d6950662bcbcfc0dd165a51f 100644
(file)
--- a/
opendaylight/commons/opendaylight/pom.xml
+++ b/
opendaylight/commons/opendaylight/pom.xml
@@
-59,8
+59,8
@@
<yang.version>0.5.9-SNAPSHOT</yang.version>
<guava.version>14.0.1</guava.version>
<osgi.core.version>5.0.0</osgi.core.version>
<yang.version>0.5.9-SNAPSHOT</yang.version>
<guava.version>14.0.1</guava.version>
<osgi.core.version>5.0.0</osgi.core.version>
- <ietf-inet-types.version>2010.09.24.
1
</ietf-inet-types.version>
- <ietf-yang-types.version>2010.09.24.
1
</ietf-yang-types.version>
+ <ietf-inet-types.version>2010.09.24.
2-SNAPSHOT
</ietf-inet-types.version>
+ <ietf-yang-types.version>2010.09.24.
2-SNAPSHOT
</ietf-yang-types.version>
<opendaylight-l2-types.version>2013.08.27.1</opendaylight-l2-types.version>
<yang-ext.version>2013.09.07.1</yang-ext.version>
<javassist.version>3.17.1-GA</javassist.version>
<opendaylight-l2-types.version>2013.08.27.1</opendaylight-l2-types.version>
<yang-ext.version>2013.09.07.1</yang-ext.version>
<javassist.version>3.17.1-GA</javassist.version>
@@
-76,13
+76,17
@@
<yangtools.binding.version>0.6.0-SNAPSHOT</yangtools.binding.version>
<!--versions for bits of the controller -->
<controller.version>0.4.1-SNAPSHOT</controller.version>
<yangtools.binding.version>0.6.0-SNAPSHOT</yangtools.binding.version>
<!--versions for bits of the controller -->
<controller.version>0.4.1-SNAPSHOT</controller.version>
+ <hosttracker.version>0.5.1-SNAPSHOT</hosttracker.version>
+ <arphandler.version>0.5.1-SNAPSHOT</arphandler.version>
+ <forwarding.staticrouting>0.5.1-SNAPSHOT</forwarding.staticrouting>
+ <samples.loadbalancer>0.5.1-SNAPSHOT</samples.loadbalancer>
<config.version>0.2.3-SNAPSHOT</config.version>
<netconf.version>0.2.3-SNAPSHOT</netconf.version>
<mdsal.version>1.0-SNAPSHOT</mdsal.version>
<containermanager.version>0.5.1-SNAPSHOT</containermanager.version>
<config.version>0.2.3-SNAPSHOT</config.version>
<netconf.version>0.2.3-SNAPSHOT</netconf.version>
<mdsal.version>1.0-SNAPSHOT</mdsal.version>
<containermanager.version>0.5.1-SNAPSHOT</containermanager.version>
- <switchmanager.api.version>0.
6.1
-SNAPSHOT</switchmanager.api.version>
+ <switchmanager.api.version>0.
7.0
-SNAPSHOT</switchmanager.api.version>
<connectionmanager.version>0.1.1-SNAPSHOT</connectionmanager.version>
<connectionmanager.version>0.1.1-SNAPSHOT</connectionmanager.version>
- <sal.version>0.
6
.0-SNAPSHOT</sal.version>
+ <sal.version>0.
7
.0-SNAPSHOT</sal.version>
<sal.networkconfiguration.version>0.0.2-SNAPSHOT</sal.networkconfiguration.version>
<sal.connection.version>0.1.1-SNAPSHOT</sal.connection.version>
<networkconfig.bridgedomain.northbound.version>0.0.2-SNAPSHOT</networkconfig.bridgedomain.northbound.version>
<sal.networkconfiguration.version>0.0.2-SNAPSHOT</sal.networkconfiguration.version>
<sal.connection.version>0.1.1-SNAPSHOT</sal.connection.version>
<networkconfig.bridgedomain.northbound.version>0.0.2-SNAPSHOT</networkconfig.bridgedomain.northbound.version>
@@
-96,6
+100,7
@@
<sonar.language>java</sonar.language>
<forwardingrulesmanager.version>0.5.0-SNAPSHOT</forwardingrulesmanager.version>
<statisticsmanager.version>0.5.0-SNAPSHOT</statisticsmanager.version>
<sonar.language>java</sonar.language>
<forwardingrulesmanager.version>0.5.0-SNAPSHOT</forwardingrulesmanager.version>
<statisticsmanager.version>0.5.0-SNAPSHOT</statisticsmanager.version>
+ <clustering.services.version>0.5.0-SNAPSHOT</clustering.services.version>
<maven.compile.plugin.version>2.5.1</maven.compile.plugin.version>
<java.version.source>1.7</java.version.source>
<java.version.target>1.7</java.version.target>
<maven.compile.plugin.version>2.5.1</maven.compile.plugin.version>
<java.version.source>1.7</java.version.source>
<java.version.target>1.7</java.version.target>
@@
-781,6
+786,18
@@
</pluginRepositories>
<profiles>
</pluginRepositories>
<profiles>
+ <profile>
+ <id>IDE</id>
+ <activation>
+ <property>
+ <name>m2e.version</name>
+ </property>
+ </activation>
+ <build>
+ <!-- Put the IDE's build output in a folder other than target, so that IDE builds don't interact with Maven builds -->
+ <directory>target-ide</directory>
+ </build>
+ </profile>
<profile>
<id>viewbuild</id>
<activation>
<profile>
<id>viewbuild</id>
<activation>
@@
-1110,7
+1127,9
@@
</goals>
</pluginExecutionFilter>
<action>
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <execute>
+ <runOnIncremental>false</runOnIncremental>
+ </execute>
</action>
</pluginExecution>
<pluginExecution>
</action>
</pluginExecution>
<pluginExecution>
@@
-1226,7
+1245,4
@@
</plugins>
</pluginManagement>
</build>
</plugins>
</pluginManagement>
</build>
-
- <dependencies>
- </dependencies>
</project>
</project>