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 "Rework NETCONF interfaces"
[controller.git]
/
opendaylight
/
usermanager
/
implementation
/
pom.xml
diff --git
a/opendaylight/usermanager/implementation/pom.xml
b/opendaylight/usermanager/implementation/pom.xml
index 4eedf7eda99f42bb70d011dd7daba2d81d2d4ae0..58bbec3dc85eebe3db7693dc119b6cfbe491adc5 100644
(file)
--- a/
opendaylight/usermanager/implementation/pom.xml
+++ b/
opendaylight/usermanager/implementation/pom.xml
@@
-3,7
+3,7
@@
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>commons.opendaylight</artifactId>
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>commons.opendaylight</artifactId>
- <version>1.4.
1
-SNAPSHOT</version>
+ <version>1.4.
2
-SNAPSHOT</version>
<relativePath>../../commons/opendaylight</relativePath>
</parent>
<scm>
<relativePath>../../commons/opendaylight</relativePath>
</parent>
<scm>
@@
-14,7
+14,7
@@
</scm>
<artifactId>usermanager.implementation</artifactId>
</scm>
<artifactId>usermanager.implementation</artifactId>
- <version>0.4.
1
-SNAPSHOT</version>
+ <version>0.4.
2
-SNAPSHOT</version>
<packaging>bundle</packaging>
<build>
<plugins>
<packaging>bundle</packaging>
<build>
<plugins>
@@
-26,8
+26,8
@@
<configuration>
<instructions>
<Import-Package>
<configuration>
<instructions>
<Import-Package>
- org.opendaylight.controller.clustering.services,
org.opendaylight.controller.configuration,
org.opendaylight.controller.configuration,
+ org.opendaylight.controller.clustering.services,
org.opendaylight.controller.sal.authorization,
org.opendaylight.controller.sal.core,
org.opendaylight.controller.sal.packet,
org.opendaylight.controller.sal.authorization,
org.opendaylight.controller.sal.core,
org.opendaylight.controller.sal.packet,
@@
-51,10
+51,10
@@
org.opendaylight.controller.usermanager
</Import-Package>
<Export-Package>
org.opendaylight.controller.usermanager
</Import-Package>
<Export-Package>
-<!--
+
<!--
org.opendaylight.controller.usermanager,
org.opendaylight.controller.usermanager.internal
org.opendaylight.controller.usermanager,
org.opendaylight.controller.usermanager.internal
- -->
+
-->
</Export-Package>
<Bundle-Activator>
org.opendaylight.controller.usermanager.internal.Activator
</Export-Package>
<Bundle-Activator>
org.opendaylight.controller.usermanager.internal.Activator
@@
-69,27
+69,22
@@
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>usermanager</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>usermanager</artifactId>
- <version>0.4.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>containermanager</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>containermanager</artifactId>
- <version>0.5.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>clustering.services</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>clustering.services</artifactId>
- <version>0.4.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>configuration</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>configuration</artifactId>
- <version>0.4.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal</artifactId>
- <version>0.5.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
@@
-107,5
+102,6
@@
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
+
</dependencies>
</project>
</dependencies>
</project>