Merge "Bug 615: Removed xtend from Topology Manager"

[controller.git] / opendaylight / md-sal / topology-lldp-discovery / pom.xml

diff --git a/opendaylight/md-sal/topology-lldp-discovery/pom.xml b/opendaylight/md-sal/topology-lldp-discovery/pom.xml
index ed94c8dfb74267058b5a7f585753c0161d18783d..627934eb6743aa6cac036df44a74a89ca300074b 100644 (file)
--- a/opendaylight/md-sal/topology-lldp-discovery/pom.xml
+++ b/opendaylight/md-sal/topology-lldp-discovery/pom.xml
@@ -1,10 +1,9 @@
-<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">
+<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>sal-parent</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <groupId>org.opendaylight.controller.md</groupId>
@@ -13,7 +12,8 @@
     <scm>
         <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
         <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
-    </scm>
+      <tag>HEAD</tag>
+  </scm>
     <properties>
         <guava.version>14.0.1</guava.version>
         <xtend.version>2.4.3</xtend.version>
@@ -28,27 +28,22 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-api</artifactId>
-            <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller.model</groupId>
             <artifactId>model-flow-service</artifactId>
-            <version>1.0-SNAPSHOT</version>
         </dependency>    
            <dependency>
              <groupId>org.opendaylight.controller.model</groupId>
              <artifactId>model-flow-base</artifactId>
-             <version>1.0-SNAPSHOT</version>
            </dependency>
           <dependency>
              <groupId>org.opendaylight.controller.model</groupId>
              <artifactId>model-flow-management</artifactId>
-             <version>1.0-SNAPSHOT</version>
            </dependency>    
         <dependency>
             <groupId>org.opendaylight.controller.model</groupId>
             <artifactId>model-inventory</artifactId>
-            <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.xtend</groupId>
@@ -57,12 +52,11 @@
          <dependency>
                <groupId>equinoxSDK381</groupId>
                <artifactId>org.eclipse.osgi</artifactId>
-               <version>3.8.1.v20120830-144521</version>
              </dependency>
              <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
-            <version>2.6</version>
+            <version>2.4</version>
           </dependency>
           <dependency>
             <groupId>com.google.guava</groupId>
@@ -71,12 +65,10 @@
           <dependency>
                    <groupId>commons-codec</groupId>
                    <artifactId>commons-codec</artifactId>
-                   <version>1.8</version>
                  </dependency>
     <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal</artifactId>
-            <version>0.7.0-SNAPSHOT</version>
         </dependency>
              
     </dependencies>
@@ -91,7 +83,7 @@
                     <instructions>
                         <Bundle-Activator>org.opendaylight.md.controller.topology.lldp.LLDPActivator</Bundle-Activator>
                         <Export-Package>org.opendaylight.md.controller.topology.lldp.utils</Export-Package>
-                        <Embed-Dependency>commons-lang</Embed-Dependency>>
+                        <Embed-Dependency>commons-lang</Embed-Dependency>&gt;
                         <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
                     </instructions>
                     <manifestLocation>${project.basedir}/META-INF</manifestLocation>
@@ -100,29 +92,6 @@
             <plugin>
                 <groupId>org.eclipse.xtend</groupId>
                 <artifactId>xtend-maven-plugin</artifactId>
-                <executions>
-                  <execution>
-                      <goals>
-                          <goal>compile</goal>
-                      </goals>
-                      <configuration>
-                          <outputDirectory>${basedir}/src/main/xtend-gen</outputDirectory>
-                      </configuration>
-                  </execution>
-              </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-clean-plugin</artifactId>
-                <configuration>
-                    <filesets>
-                        <fileset>
-                            <directory>${basedir}/src/main/xtend-gen</directory>
-                            <includes>
-                                <include>**</include>
-                            </includes>
-                        </fileset>
-                    </filesets>
-                </configuration>
             </plugin>
         </plugins>
     </build>