Code Review
/
integration
/
distribution.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add offset 0 projects
[integration/distribution.git]
/
features
/
singles
/
odl-integration-compatible-with-all
/
pom.xml
diff --git
a/features/singles/odl-integration-compatible-with-all/pom.xml
b/features/singles/odl-integration-compatible-with-all/pom.xml
index 803fb4dabdb2153f72554c623eaf7c6ecf585bea..6d77748b84f0f6f8cc82551fa988dec48484e915 100644
(file)
--- a/
features/singles/odl-integration-compatible-with-all/pom.xml
+++ b/
features/singles/odl-integration-compatible-with-all/pom.xml
@@
-13,13
+13,13
@@
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>
1.8.0-SNAPSHOT
</version>
+ <version>
2.0.0
</version>
<relativePath/>
</parent>
<groupId>org.opendaylight.integration</groupId>
<artifactId>odl-integration-compatible-with-all</artifactId>
<!-- TODO: Shorter name? -->
<relativePath/>
</parent>
<groupId>org.opendaylight.integration</groupId>
<artifactId>odl-integration-compatible-with-all</artifactId>
<!-- TODO: Shorter name? -->
- <version>0.
6
.0-SNAPSHOT</version>
+ <version>0.
7
.0-SNAPSHOT</version>
<packaging>feature</packaging>
<!-- <name> formatting is used by autorelease to parse and notify projects on
build failure. Please do not modify this unless you have a good reason. -->
<packaging>feature</packaging>
<!-- <name> formatting is used by autorelease to parse and notify projects on
build failure. Please do not modify this unless you have a good reason. -->
@@
-51,13
+51,25
@@
</dependencies>
</dependencyManagement>
<dependencies>
</dependencies>
</dependencyManagement>
<dependencies>
- <!--
External single feature dependencies.
-->
+ <!--
Distribution
-->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>odl-distribution-version</artifactId>
<type>xml</type>
<classifier>features</classifier>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>odl-distribution-version</artifactId>
<type>xml</type>
<classifier>features</classifier>
</dependency>
+
+ <!-- User facing single features. -->
+
+ <!-- AAA -->
+ <dependency>
+ <groupId>org.opendaylight.aaa</groupId>
+ <artifactId>odl-aaa-shiro</artifactId>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </dependency>
+
+ <!-- Netconf -->
<!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=7891
<dependency>
<groupId>org.opendaylight.netconf</groupId>
<!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=7891
<dependency>
<groupId>org.opendaylight.netconf</groupId>
@@
-65,12
+77,13
@@
<type>xml</type>
<classifier>features</classifier>
</dependency>
<type>xml</type>
<classifier>features</classifier>
</dependency>
+ -->
<dependency>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>odl-restconf</artifactId>
<type>xml</type>
<classifier>features</classifier>
</dependency>
<dependency>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>odl-restconf</artifactId>
<type>xml</type>
<classifier>features</classifier>
</dependency>
- -->
+
</dependencies>
</project>
</dependencies>
</project>