X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflow-protocol-api%2Fpom.xml;h=20d4017b9ba14924a99afd80ec8a87dc10072d33;hb=refs%2Ftags%2Frelease%2Fcarbon;hp=80e5103f1ab16b7e8440c47fc891a9c93c5b6ab4;hpb=dcac24a922a4dca4cd16084fa9796dd8ba20d234;p=openflowjava.git

diff --git a/openflow-protocol-api/pom.xml b/openflow-protocol-api/pom.xml
index 80e5103f..20d4017b 100644
--- a/openflow-protocol-api/pom.xml
+++ b/openflow-protocol-api/pom.xml
@@ -4,12 +4,12 @@
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>0.8.0-SNAPSHOT</version>
+        <version>0.10.0-Carbon</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.openflowjava</groupId>
     <artifactId>openflow-protocol-api</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
+    <version>0.9.0-Carbon</version>
     <packaging>bundle</packaging>
     <name>Openflow Protocol Library - API</name>
     <scm>
@@ -18,8 +18,8 @@
     </scm>
 
     <properties>
-      <mdsal.version>2.0.0-SNAPSHOT</mdsal.version>
-      <mdsal.model.version>0.8.0-SNAPSHOT</mdsal.model.version>
+      <mdsal.version>2.2.0-Carbon</mdsal.version>
+      <mdsal.model.version>0.10.0-Carbon</mdsal.model.version>
     </properties>
 
     <dependencyManagement>
@@ -43,49 +43,6 @@
       </dependencies>
     </dependencyManagement>
 
-    <build>
-      <plugins>
-            <!-- TODO: maven-antrun-plugin deletes yang source files from target.
-                       This is done because otherwise openflowjava models are stored in controller
-                       and exposed for further use - which is not desired.
-                       (https://bugs.opendaylight.org/show_bug.cgi?id=2926)
-
-                       This plugin should be removed after relevant configuration is added into 
-                       yang-maven-plugin - which is supposed to happen in BERYLLIUM release -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <delete>
-                                    <fileset dir="${project.build.directory}/classes/META-INF/yang">
-                                        <include name="*.yang"/>
-                                        <exclude name="openflow-types.yang"/>
-                                        <exclude name="openflow-extensible-match.yang"/>
-                                        <exclude name="openflow-action.yang"/>
-                                        <exclude name="openflow-configuration.yang"/>
-                                    </fileset>
-                                    <fileset dir="${project.build.directory}/generated-sources/yang/META-INF/yang">
-                                        <include name="*.yang"/>
-                                        <exclude name="openflow-types.yang"/>
-                                        <exclude name="openflow-extensible-match.yang"/>
-                                        <exclude name="openflow-action.yang"/>
-                                        <exclude name="openflow-configuration.yang"/>
-                                    </fileset>
-                                </delete>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
@@ -97,11 +54,11 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-inet-types</artifactId>
+            <artifactId>ietf-inet-types-2013-07-15</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-yang-types</artifactId>
+            <artifactId>ietf-yang-types-20130715</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>
@@ -118,7 +75,7 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
+            <artifactId>mockito-core</artifactId>
         </dependency>
     </dependencies>
 </project>