X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=third-party%2Fopenflowj%2Fpom.xml;h=8d8724dcebcaec03bf50d6f668d437e77a8dea3c;hp=4daddf11627eecdbf79554a4b5f3fcb91f42093f;hb=207dfa6ea38ed9847bb48aa052ebf70d68d0a37d;hpb=42210c03b0a4c54706320ba9f55794c0abd4d201

diff --git a/third-party/openflowj/pom.xml b/third-party/openflowj/pom.xml
index 4daddf1162..8d8724dceb 100644
--- a/third-party/openflowj/pom.xml
+++ b/third-party/openflowj/pom.xml
@@ -1,9 +1,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/maven-v4_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/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opendaylight.controller.thirdparty</groupId>
   <artifactId>org.openflow.openflowj</artifactId>
-  <version>1.0.2-SNAPSHOT</version>
+  <version>1.0.3-SNAPSHOT</version>
   <name>OpenFlow Java</name>
   <description>A Java implemention of the OpenFlow v1.0 protocol</description>
 
@@ -11,7 +10,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.thirdparty</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.1.1-SNAPSHOT</version>
     <relativePath>../commons/thirdparty</relativePath>
   </parent>
   
@@ -35,8 +34,10 @@
     </license>
   </licenses>
   <scm>
-    <connection>scm:git://gitosis.stanford.edu:openflowj.git</connection>
-    <url>https://openflow.stanford.edu/fisheye/browse/OpenFlowJ</url>
+    <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>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -46,10 +47,11 @@
     <profile>
       <id>release-sign-artifacts</id>
       <activation>
-        <property>
-          <name>performRelease</name>
-          <value>true</value>
-        </property>
+        <!-- don't activate it -->
+        <!-- <property> -->
+        <!--   <name>performRelease</name> -->
+        <!--   <value>true</value> -->
+        <!-- </property> -->
       </activation>
       <build>
         <plugins>
@@ -78,51 +80,52 @@
   <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>
-	      org.openflow.example;version="1.0.1";
-	      uses:="org.openflow.example.cli,
-	      org.openflow.protocol,
-	      org.openflow.io,
-	      org.openflow.protocol.factory",
-	      org.openflow.io;version="1.0.1";
-	      uses:="org.openflow.protocol,
-	      org.openflow.protocol.factory",
-	      org.openflow.protocol;version="1.0.1";
-	      uses:="org.openflow.protocol.statistics,
-	      org.openflow.protocol,
-	      org.openflow.protocol.factory",
-	      org.openflow.protocol.action;version="1.0.1";
-	      uses:="org.openflow.protocol",
-	      org.openflow.protocol.factory;version="1.0.1";
-	      uses:="org.openflow.protocol.statistics,
-	      org.openflow.protocol,
-	      org.openflow.protocol.action,
-	      org.openflow.protocol.queue",
-	      org.openflow.protocol.queue;version="1.0.2";
-	      uses:="org.openflow.protocol,
-	      org.openflow.protocol.factory",
-	      org.openflow.protocol.statistics;version="1.0.1";
-	      uses:="org.openflow.protocol,
-	      org.openflow.protocol.factory",
-	      org.openflow.util;version="1.0.1"
-	    </Export-Package>
-	  </instructions>
-	</configuration>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>2.3.6</version>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Export-Package>
+              org.openflow.example;version="1.0.1";
+              uses:="org.openflow.example.cli,
+              org.openflow.protocol,
+              org.openflow.io,
+              org.openflow.protocol.factory",
+              org.openflow.io;version="1.0.1";
+              uses:="org.openflow.protocol,
+              org.openflow.protocol.factory",
+              org.openflow.protocol;version="1.0.1";
+              uses:="org.openflow.protocol.statistics,
+              org.openflow.protocol,
+              org.openflow.protocol.factory",
+              org.openflow.protocol.action;version="1.0.1";
+              uses:="org.openflow.protocol",
+              org.openflow.protocol.factory;version="1.0.1";
+              uses:="org.openflow.protocol.statistics,
+              org.openflow.protocol,
+              org.openflow.protocol.action,
+              org.openflow.protocol.queue",
+              org.openflow.protocol.queue;version="1.0.2";
+              uses:="org.openflow.protocol,
+              org.openflow.protocol.factory",
+              org.openflow.protocol.statistics;version="1.0.1";
+              uses:="org.openflow.protocol,
+              org.openflow.protocol.factory",
+              org.openflow.util;version="1.0.1"
+            </Export-Package>
+          </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
+        </configuration>
       </plugin>
       <plugin>
-	<groupId>org.apache.maven.plugins</groupId>
-	<artifactId>maven-compiler-plugin</artifactId>
-	<version>2.3.2</version>
-	<configuration>
-	  <source>1.6</source>
-	  <target>1.6</target>
-	</configuration>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.5.1</version>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
       </plugin>
     </plugins>
   </build>