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 "Bug 2410: Use generated serialVersionUID for messages"
[controller.git]
/
opendaylight
/
archetypes
/
opendaylight-startup
/
src
/
main
/
resources
/
archetype-resources
/
__artifactId__-features
/
pom.xml
diff --git
a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/__artifactId__-features/pom.xml
b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/__artifactId__-features/pom.xml
index 1ee28b8d5a2ed48b7540f09d41f1172fc2a2cb08..49b43f442edba2810196bf470a146df77ba83a71 100644
(file)
--- a/
opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/__artifactId__-features/pom.xml
+++ b/
opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/__artifactId__-features/pom.xml
@@
-13,6
+13,7
@@
and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>features-parent</artifactId>
<version>1.5.0-SNAPSHOT</version>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>features-parent</artifactId>
<version>1.5.0-SNAPSHOT</version>
+ <relativePath/>
</parent>
<groupId>${groupId}</groupId>
<artifactId>${artifactId}-features</artifactId>
</parent>
<groupId>${groupId}</groupId>
<artifactId>${artifactId}-features</artifactId>
@@
-64,12
+65,12
@@
and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
<scope>runtime</scope>
</dependency>
<dependency>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>${symbol_dollar}{groupId}</groupId>
+ <groupId>${symbol_dollar}{
project.
groupId}</groupId>
<artifactId>${artifactId}-impl</artifactId>
<version>${symbol_dollar}{project.version}</version>
</dependency>
<dependency>
<artifactId>${artifactId}-impl</artifactId>
<version>${symbol_dollar}{project.version}</version>
</dependency>
<dependency>
- <groupId>${symbol_dollar}{groupId}</groupId>
+ <groupId>${symbol_dollar}{
project.
groupId}</groupId>
<artifactId>${artifactId}-api</artifactId>
<version>${symbol_dollar}{project.version}</version>
</dependency>
<artifactId>${artifactId}-api</artifactId>
<version>${symbol_dollar}{project.version}</version>
</dependency>