Code Review
/
dlux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Yangman - Highlight Expanded Collection"
[dlux.git]
/
dlux-web
/
pom.xml
diff --git
a/dlux-web/pom.xml
b/dlux-web/pom.xml
index 243860f9e56fec7e7d0ac775ddad7aaa6ecad877..bf9ee86ce45202ca93aee76ffa8f6f4d4de73414 100644
(file)
--- a/
dlux-web/pom.xml
+++ b/
dlux-web/pom.xml
@@
-4,7
+4,7
@@
<parent>
\r
<groupId>org.opendaylight.dlux</groupId>
\r
<artifactId>dlux-parent</artifactId>
\r
<parent>
\r
<groupId>org.opendaylight.dlux</groupId>
\r
<artifactId>dlux-parent</artifactId>
\r
- <version>0.
3
.0-SNAPSHOT</version>
\r
+ <version>0.
5
.0-SNAPSHOT</version>
\r
<relativePath>..</relativePath>
\r
</parent>
\r
\r
<relativePath>..</relativePath>
\r
</parent>
\r
\r
@@
-67,6
+67,11
@@
<artifactId>dlux.yangui.resources</artifactId>
\r
<version>${yangui.resources.version}</version>
\r
</dependency>
\r
<artifactId>dlux.yangui.resources</artifactId>
\r
<version>${yangui.resources.version}</version>
\r
</dependency>
\r
+ <dependency>
\r
+ <groupId>org.opendaylight.dlux</groupId>
\r
+ <artifactId>dlux.yangman.resources</artifactId>
\r
+ <version>${yangman.resources.version}</version>
\r
+ </dependency>
\r
<dependency>
\r
<groupId>org.opendaylight.dlux</groupId>
\r
<artifactId>dlux.yangvisualizer.resources</artifactId>
\r
<dependency>
\r
<groupId>org.opendaylight.dlux</groupId>
\r
<artifactId>dlux.yangvisualizer.resources</artifactId>
\r
@@
-121,6
+126,7
@@
<include>app/routingConfig.js</include>
\r
<include>app/node/</include>
\r
<include>app/yangui/</include>
\r
<include>app/routingConfig.js</include>
\r
<include>app/node/</include>
\r
<include>app/yangui/</include>
\r
+ <include>app/yangman/</include>
\r
<include>app/yangvisualizer/</include>
\r
<include>app/topology/</include>
\r
<include>app/core/</include>
\r
<include>app/yangvisualizer/</include>
\r
<include>app/topology/</include>
\r
<include>app/core/</include>
\r
@@
-144,7
+150,6
@@
<plugin>
\r
<groupId>org.apache.maven.plugins</groupId>
\r
<artifactId>maven-dependency-plugin</artifactId>
\r
<plugin>
\r
<groupId>org.apache.maven.plugins</groupId>
\r
<artifactId>maven-dependency-plugin</artifactId>
\r
- <version>2.6</version>
\r
<executions>
\r
<!--src/app/ Resources-->
\r
<execution>
\r
<executions>
\r
<!--src/app/ Resources-->
\r
<execution>
\r
@@
-159,6
+164,7
@@
<includeArtifactIds>
\r
dlux.node.resources,
\r
dlux.yangui.resources,
\r
<includeArtifactIds>
\r
dlux.node.resources,
\r
dlux.yangui.resources,
\r
+ dlux.yangman.resources,
\r
dlux.yangvisualizer.resources,
\r
dlux.topology.resources,
\r
dlux.core.resources,
\r
dlux.yangvisualizer.resources,
\r
dlux.topology.resources,
\r
dlux.core.resources,
\r