Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Revert "Integrate the Distribution Sanity Test with the build"
[controller.git]
/
opendaylight
/
usermanager
/
api
/
pom.xml
diff --git
a/opendaylight/usermanager/api/pom.xml
b/opendaylight/usermanager/api/pom.xml
index 057955f06e60d5f8e8e8838461ba8e93b06ad617..97121b348c4417fc18c4d27e83f23c24cff7e77d 100644
(file)
--- a/
opendaylight/usermanager/api/pom.xml
+++ b/
opendaylight/usermanager/api/pom.xml
@@
-1,23
+1,27
@@
-<?xml version="1.0" encoding="UTF-8"?> <project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>commons.opendaylight</artifactId>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>commons.opendaylight</artifactId>
- <version>1.4.
0
-SNAPSHOT</version>
+ <version>1.4.
1
-SNAPSHOT</version>
<relativePath>../../commons/opendaylight</relativePath>
</parent>
<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>
+ <tag>HEAD</tag>
+ </scm>
<artifactId>usermanager</artifactId>
<artifactId>usermanager</artifactId>
- <version>0.4.
0
-SNAPSHOT</version>
+ <version>0.4.
1
-SNAPSHOT</version>
<packaging>bundle</packaging>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<packaging>bundle</packaging>
<build>
<plugins>
<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>
@@
-28,7
+32,6
@@
org.opendaylight.controller.sal.core,
org.opendaylight.controller.sal.packet,
org.opendaylight.controller.sal.utils,
org.opendaylight.controller.sal.core,
org.opendaylight.controller.sal.packet,
org.opendaylight.controller.sal.utils,
- org.opendaylight.controller.switchmanager,
org.opendaylight.controller.containermanager,
org.slf4j,
org.eclipse.osgi.framework.console,
org.opendaylight.controller.containermanager,
org.slf4j,
org.eclipse.osgi.framework.console,
@@
-48,12
+51,12
@@
</Import-Package>
<Export-Package>
org.opendaylight.controller.usermanager,
</Import-Package>
<Export-Package>
org.opendaylight.controller.usermanager,
-<!--
+<!--
org.opendaylight.controller.usermanager.internal
-->
</Export-Package>
<Bundle-Activator>
org.opendaylight.controller.usermanager.internal
-->
</Export-Package>
<Bundle-Activator>
-<!--
+<!--
org.opendaylight.controller.usermanager.internal.Activator
-->
</Bundle-Activator>
org.opendaylight.controller.usermanager.internal.Activator
-->
</Bundle-Activator>
@@
-64,30
+67,25
@@
</plugins>
</build>
<dependencies>
</plugins>
</build>
<dependencies>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>switchmanager</artifactId>
- <version>0.4.0-SNAPSHOT</version>
- </dependency>
<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.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.
0
-SNAPSHOT</version>
+ <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.
0
-SNAPSHOT</version>
+ <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.
0
-SNAPSHOT</version>
+ <version>0.5.
1
-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
</dependency>
</dependencies>
</project>