Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Declare version property for maven bundle plugin, reuse it in poms and
[controller.git]
/
opendaylight
/
web
/
flows
/
pom.xml
diff --git
a/opendaylight/web/flows/pom.xml
b/opendaylight/web/flows/pom.xml
index 7aa0ac94540fe380f65ada4a72c6e39754a4cdad..8dd5777350ee6e2be62eddfe417bf8b8f3d36ca4 100644
(file)
--- a/
opendaylight/web/flows/pom.xml
+++ b/
opendaylight/web/flows/pom.xml
@@
-8,6
+8,12
@@
<version>1.4.0-SNAPSHOT</version>
<relativePath>../../commons/opendaylight</relativePath>
</parent>
<version>1.4.0-SNAPSHOT</version>
<relativePath>../../commons/opendaylight</relativePath>
</parent>
+ <scm>
+ <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
+ <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
+ <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
+ </scm>
+
<artifactId>flows.web</artifactId>
<version>0.4.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<artifactId>flows.web</artifactId>
<version>0.4.0-SNAPSHOT</version>
<packaging>bundle</packaging>
@@
-16,7
+22,7
@@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>
2.3.6
</version>
+ <version>
${bundle.plugin.version}
</version>
<extensions>true</extensions>
<configuration>
<instructions>
<extensions>true</extensions>
<configuration>
<instructions>
@@
-73,7
+79,7
@@
org.springframework.web.servlet.config,
org.springframework.web.servlet.view,
org.springframework.web.filter,
org.springframework.web.servlet.config,
org.springframework.web.servlet.view,
org.springframework.web.filter,
- org.springframework.web.context
\r
+ org.springframework.web.context
</Import-Package>
<Web-ContextPath>/controller/web/flows</Web-ContextPath>
</instructions>
</Import-Package>
<Web-ContextPath>/controller/web/flows</Web-ContextPath>
</instructions>
@@
-91,7
+97,7
@@
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>containermanager</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>containermanager</artifactId>
- <version>0.
4
.0-SNAPSHOT</version>
+ <version>0.
5
.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
@@
-101,7
+107,7
@@
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>switchmanager</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>switchmanager</artifactId>
- <version>0.
4
.0-SNAPSHOT</version>
+ <version>0.
5
.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>