X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fweb%2Ftopology%2Fpom.xml;h=e65c19ff849abe33c0d0b08e6f97446c23758c1b;hp=2a8cb9fa1ebb737fb62da89d624a437e63da4751;hb=d5702150e612565cd091f184064f017bc4cc3971;hpb=4d8ea2149206e12d7601b34667a85f48ca82af6c

diff --git a/opendaylight/web/topology/pom.xml b/opendaylight/web/topology/pom.xml
index 2a8cb9fa1e..e65c19ff84 100644
--- a/opendaylight/web/topology/pom.xml
+++ b/opendaylight/web/topology/pom.xml
@@ -1,126 +1,125 @@
 <?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>
-		<version>1.4.0-SNAPSHOT</version>
-		<relativePath>../../commons/opendaylight</relativePath>
-	</parent>
-	<artifactId>topology.web</artifactId>
-	<version>0.4.0-SNAPSHOT</version>
-	<packaging>bundle</packaging>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-				<version>2.3.6</version>
-				<extensions>true</extensions>
-				<configuration>
-					<instructions>
-						<Export-Package>
-						</Export-Package>
-						<Import-Package>
-							org.opendaylight.controller.containermanager,
-							org.opendaylight.controller.configuration,
-							org.opendaylight.controller.sal.authorization,
-							org.opendaylight.controller.sal.packet.address,
-							org.opendaylight.controller.sal.action,
-							org.opendaylight.controller.sal.core,
-							org.opendaylight.controller.sal.utils,
-							org.opendaylight.controller.switchmanager,
-							org.opendaylight.controller.topologymanager,
-							org.opendaylight.controller.usermanager,
-							org.opendaylight.controller.web,
-							com.google.gson,
-							edu.uci.ics.jung.algorithms.layout,
-							edu.uci.ics.jung.graph,
-							javax.annotation,
-							javax.naming,
-							javax.servlet,
-							javax.servlet.annotation,
-							javax.servlet.http,
-							javax.servlet.jsp,
-							javax.servlet.jsp.el,
-							javax.servlet.jsp.jstl.core,
-							javax.servlet.jsp.jstl.fmt,
-							javax.servlet.jsp.jstl.tlv,
-							javax.servlet.jsp.tagext,
-							javax.servlet.resources,
-							javax.xml.parsers,
-							javax.xml.transform,
-							org.apache.commons.logging,
-							org.apache.taglibs.standard.functions,
-							org.apache.taglibs.standard.resources,
-							org.apache.taglibs.standard.tag.common.core,
-							org.apache.taglibs.standard.tag.common.fmt,
-							org.apache.taglibs.standard.tag.rt.core,
-							org.apache.taglibs.standard.tag.rt.fmt,
-							org.apache.taglibs.standard.tei,
-							org.apache.taglibs.standard.tlv,
-							org.codehaus.jackson,
-							org.codehaus.jackson.annotate,
-							org.codehaus.jackson.map,
-							org.codehaus.jackson.map.annotate,
-							org.osgi.framework,
-							org.slf4j,
-							org.springframework.beans,
-							org.springframework.beans.factory.xml,
-							org.springframework.context.config,
-							org.springframework.stereotype,
-							org.springframework.util,
-							org.springframework.web,
-							org.springframework.web.bind.annotation,
-							org.springframework.web.servlet,
-							org.springframework.web.servlet.config,
-							org.springframework.web.servlet.view,
-							org.springframework.web.filter,
-							org.springframework.web.context,
-						</Import-Package>
-						<Web-ContextPath>/controller/web/topology</Web-ContextPath>
-					</instructions>
+<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>
+    <version>1.4.2-SNAPSHOT</version>
+    <relativePath>../../commons/opendaylight</relativePath>
+  </parent>
+
+  <artifactId>topology.web</artifactId>
+  <version>0.4.2-SNAPSHOT</version>
+  <packaging>bundle</packaging>
+  <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>configuration</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>containermanager</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>switchmanager</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>topologymanager</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>web</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller.thirdparty</groupId>
+      <artifactId>net.sf.jung2</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Export-Package></Export-Package>
+            <Import-Package>org.opendaylight.controller.containermanager,
+              org.opendaylight.controller.configuration,
+              org.opendaylight.controller.sal.authorization,
+              org.opendaylight.controller.sal.packet.address,
+              org.opendaylight.controller.sal.action,
+              org.opendaylight.controller.sal.core,
+              org.opendaylight.controller.sal.utils,
+              org.opendaylight.controller.switchmanager,
+              org.opendaylight.controller.topologymanager,
+              org.opendaylight.controller.usermanager,
+              org.opendaylight.controller.web,
+              com.google.gson,
+              edu.uci.ics.jung.algorithms.layout,
+              edu.uci.ics.jung.graph,
+              javax.annotation,
+              javax.naming,
+              javax.servlet,
+              javax.servlet.annotation,
+              javax.servlet.http,
+              javax.servlet.jsp,
+              javax.servlet.jsp.el,
+              javax.servlet.jsp.jstl.core,
+              javax.servlet.jsp.jstl.fmt,
+              javax.servlet.jsp.jstl.tlv,
+              javax.servlet.jsp.tagext,
+              javax.servlet.resources,
+              javax.xml.parsers,
+              javax.xml.transform,
+              org.apache.commons.logging,
+              org.apache.taglibs.standard.functions,
+              org.apache.taglibs.standard.resources,
+              org.apache.taglibs.standard.tag.common.core,
+              org.apache.taglibs.standard.tag.common.fmt,
+              org.apache.taglibs.standard.tag.rt.core,
+              org.apache.taglibs.standard.tag.rt.fmt,
+              org.apache.taglibs.standard.tei,
+              org.apache.taglibs.standard.tlv,
+              com.fasterxml.jackson.core,
+              com.fasterxml.jackson.databind,
+              com.fasterxml.jackson.annotation,
+              org.osgi.framework,
+              org.slf4j,
+              org.springframework.beans,
+              org.springframework.beans.factory.xml,
+              org.springframework.context.config,
+              org.springframework.stereotype,
+              org.springframework.util,
+              org.springframework.web,
+              org.springframework.web.bind.annotation,
+              org.springframework.web.servlet,
+              org.springframework.web.servlet.config,
+              org.springframework.web.servlet.view,
+              org.springframework.web.filter,
+              org.springframework.web.context,</Import-Package>
+            <Web-ContextPath>/controller/web/topology</Web-ContextPath>
+          </instructions>
           <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>org.opendaylight.controller.thirdparty</groupId>
-			<artifactId>net.sf.jung2</artifactId>
-			<version>2.0.1-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.opendaylight.controller</groupId>
-			<artifactId>containermanager</artifactId>
-			<version>0.4.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.opendaylight.controller</groupId>
-			<artifactId>configuration</artifactId>
-			<version>0.4.0-SNAPSHOT</version>
-		</dependency>		
-		<dependency>
-			<groupId>org.opendaylight.controller</groupId>
-			<artifactId>switchmanager</artifactId>
-			<version>0.4.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.opendaylight.controller</groupId>
-			<artifactId>sal</artifactId>
-			<version>0.5.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.opendaylight.controller</groupId>
-			<artifactId>topologymanager</artifactId>
-			<version>0.4.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.opendaylight.controller</groupId>
-			<artifactId>web</artifactId>
-			<version>0.4.0-SNAPSHOT</version>
-		</dependency>
-	</dependencies>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <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>