Release Beryllium-SR1

[nemo.git] / nemo-renderers / openflow-renderer / pom.xml

diff --git a/nemo-renderers/openflow-renderer/pom.xml b/nemo-renderers/openflow-renderer/pom.xml
index ab0b3f56f8a1c954d4d2bc9711aacc64625cce06..5041575b93410b199367d6a94ea3b263f3615d36 100644 (file)
--- a/nemo-renderers/openflow-renderer/pom.xml
+++ b/nemo-renderers/openflow-renderer/pom.xml
@@ -12,35 +12,32 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>config-parent</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
+    <version>0.4.1-Beryllium-SR1</version>
     <relativePath />
   </parent>
 
   <groupId>org.opendaylight.nemo</groupId>
   <artifactId>openflow-renderer</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>1.0.1-Beryllium-SR1</version>
   <packaging>bundle</packaging>
   <name>${project.artifactId}</name>
 
   <properties>
+    <liblldp.version>0.10.1-Beryllium-SR1</liblldp.version>
+    <openflowplugin.version>0.2.1-Beryllium-SR1</openflowplugin.version>
     <jacoco.version>0.7.2.201409121644</jacoco.version>
     <sonar.jacoco.reportPath>target/code-coverage/jacoco.exec</sonar.jacoco.reportPath>
     <sonar.jacoco.itReportPath>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
-    <openflowplugin.version>0.2.0-SNAPSHOT</openflowplugin.version>
-    <liblldp.version>0.10.0-SNAPSHOT</liblldp.version>
   </properties>
 
   <dependencies>
-    <!-- model dependencies -->
     <dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>yang-ext</artifactId>
     </dependency>
-    <!-- project specific dependencies -->
     <dependency>
-      <groupId>org.opendaylight.openflowplugin</groupId>
-      <artifactId>openflowplugin-extension-nicira</artifactId>
-      <version>${openflowplugin.version}</version>
+      <groupId>org.opendaylight.controller.model</groupId>
+      <artifactId>model-topology</artifactId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
@@ -51,6 +48,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <groupId>commons-net</groupId>
       <artifactId>commons-net</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin</groupId>
+      <artifactId>openflowplugin-extension-nicira</artifactId>
+      <version>${openflowplugin.version}</version>
+    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>nemo-api</artifactId>
@@ -61,20 +63,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>nemo-impl</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-simple</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
@@ -91,6 +79,21 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <groupId>org.codehaus.jettison</groupId>
       <artifactId>jettison</artifactId>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-all</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>
@@ -109,9 +112,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <artifactId>maven-bundle-plugin</artifactId>
         <configuration>
           <instructions>
-            <Export-Package>org.codehaus.jackson,
+            <Export-Package>
+              org.codehaus.jackson,
               org.codehaus.jackson.*,
-              org.joda.time.*,
+              org.joda.time.*
             </Export-Package>
             <Import-Package>*</Import-Package>
           </instructions>
@@ -162,16 +166,31 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <phase>package</phase>
             <configuration>
               <artifacts>
-               <artifact>
-                  <file>${project.build.directory}/classes/etc/nemo/resource.json</file>
-                  <type>json</type>
-                  <classifier>resource</classifier>
-                </artifact>
                 <artifact>
                   <file>${project.build.directory}/classes/etc/opendaylight/karaf/config.xml</file>
                   <type>xml</type>
                   <classifier>config</classifier>
                 </artifact>
+                <artifact>
+                  <file>${project.build.directory}/classes/etc/opendaylight/karaf/node-resource.json</file>
+                  <type>json</type>
+                  <classifier>node-resource</classifier>
+                </artifact>
+                <artifact>
+                  <file>${project.build.directory}/classes/etc/opendaylight/karaf/host-resource.json</file>
+                  <type>json</type>
+                  <classifier>host-resource</classifier>
+                </artifact>
+                <artifact>
+                  <file>${project.build.directory}/classes/etc/opendaylight/karaf/link-resource.json</file>
+                  <type>json</type>
+                  <classifier>link-resource</classifier>
+                </artifact>
+                <artifact>
+                  <file>${project.build.directory}/classes/etc/opendaylight/karaf/external-resource.json</file>
+                  <type>json</type>
+                  <classifier>external-resource</classifier>
+                </artifact>
               </artifacts>
             </configuration>
           </execution>