Merge "Fix for Bug 934 - issue in validations for nuetronPort creation and updatePort"

[controller.git] / opendaylight / security / pom.xml

diff --git a/opendaylight/security/pom.xml b/opendaylight/security/pom.xml
index 4292107ea59fb400c3784deeb732042ebde496f7..896e7184b223dda4455c7124d34f52bf2d8813da 100644 (file)
--- a/opendaylight/security/pom.xml
+++ b/opendaylight/security/pom.xml
@@ -4,33 +4,37 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-SNAPSHOT</version>
     <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>master-tagforprepareonly-controller-bulk-release-2-1</tag>
-  </scm>
 
   <artifactId>security</artifactId>
-  <version>0.4.1</version>
+  <version>0.4.2-SNAPSHOT</version>
   <packaging>bundle</packaging>
+  <dependencies>
+    <dependency>
+      <groupId>orbit</groupId>
+      <artifactId>org.apache.catalina</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>usermanager</artifactId>
+    </dependency>
+  </dependencies>
   <build>
     <plugins>
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <Fragment-Host>
-              org.apache.catalina
-            </Fragment-Host>
-            <Import-Package>
-              org.slf4j,
+            <Fragment-Host>org.apache.catalina</Fragment-Host>
+            <Import-Package>org.slf4j,
               javax.servlet,
               org.apache.catalina,
               org.apache.catalina.connector,
@@ -38,29 +42,18 @@
               org.apache.catalina.realm,
               org.opendaylight.controller.sal.utils,
               org.opendaylight.controller.sal.authorization,
-              org.opendaylight.controller.usermanager
-            </Import-Package>
-            <Export-Package>
-              org.opendaylight.controller.security
-            </Export-Package>
+              org.opendaylight.controller.usermanager</Import-Package>
+            <Export-Package>org.opendaylight.controller.security</Export-Package>
           </instructions>
           <manifestLocation>${project.basedir}/META-INF</manifestLocation>
         </configuration>
       </plugin>
     </plugins>
   </build>
-  <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>usermanager</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal</artifactId>
-    </dependency>
-    <dependency>
-        <groupId>orbit</groupId>
-        <artifactId>org.apache.catalina</artifactId>
-    </dependency>
-  </dependencies>
+  <scm>
+    <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
+    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
+    <tag>HEAD</tag>
+    <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
+  </scm>
 </project>