Bug 5540 - ConvertorManager optimization, concurrency

[openflowplugin.git] / parent / pom.xml

diff --git a/parent/pom.xml b/parent/pom.xml
index be2d47858f19e8cec53851545106c5e9f9ae7794..52abd0da085ef574423c37220d85046f4e0a9b76 100644 (file)
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -31,18 +31,18 @@
 
     <properties>
         <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-        <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
         <openflowjava.version>0.8.0-SNAPSHOT</openflowjava.version>
         <openflowplugin.version>0.3.0-SNAPSHOT</openflowplugin.version>
         <sal.api.version>0.11.0-SNAPSHOT</sal.api.version>
-        <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
-        <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
+        <jmxGeneratorPath>target/generated-sources/config</jmxGeneratorPath>
+        <salGeneratorPath>target/generated-sources/sal</salGeneratorPath>
         <exi.nagasena.version>0000.0002.0053.0</exi.nagasena.version>
         <controller.distribution.version>0.4.0-SNAPSHOT</controller.distribution.version>
 
         <config.version>0.5.0-SNAPSHOT</config.version>
         <mdsal.version>1.4.0-SNAPSHOT</mdsal.version>
-        <yangtools.version>0.9.0-SNAPSHOT</yangtools.version>
+        <mdsal.model.version>0.9.0-SNAPSHOT</mdsal.model.version>
+        <yangtools.version>1.0.0-SNAPSHOT</yangtools.version>
     </properties>
 
     <dependencyManagement>
@@ -72,7 +72,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal.model</groupId>
                 <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.9.0-SNAPSHOT</version>
+                <version>${mdsal.model.version}</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -128,14 +128,6 @@
 
         <pluginManagement>
             <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <configuration>
-                        <source>1.7</source>
-                        <target>1.7</target>
-                    </configuration>
-                </plugin>
                 <plugin>
                     <artifactId>maven-clean-plugin</artifactId>
                     <configuration>
@@ -255,19 +247,6 @@
                                         <ignore/>
                                     </action>
                                 </pluginExecution>
-                                <pluginExecution>
-                                    <pluginExecutionFilter>
-                                        <groupId>org.opendaylight.yangtools</groupId>
-                                        <artifactId>yang-maven-plugin</artifactId>
-                                        <versionRange>[0.5,)</versionRange>
-                                        <goals>
-                                            <goal>generate-sources</goal>
-                                        </goals>
-                                    </pluginExecutionFilter>
-                                    <action>
-                                        <execute/>
-                                    </action>
-                                </pluginExecution>
                                 <pluginExecution>
                                     <pluginExecutionFilter>
                                         <groupId>org.codehaus.groovy.maven</groupId>