Fix odl-model-project pom to include correct version of yang-bindings

[controller.git] / opendaylight / archetypes / odl-model-project / src / main / resources / archetype-resources / pom.xml

diff --git a/opendaylight/archetypes/odl-model-project/src/main/resources/archetype-resources/pom.xml b/opendaylight/archetypes/odl-model-project/src/main/resources/archetype-resources/pom.xml
index 114393c1869de022632a788161b8416052b7384b..77f419a4ff8d84c90d35e5f3c476bbdac7e42b48 100644 (file)
--- a/opendaylight/archetypes/odl-model-project/src/main/resources/archetype-resources/pom.xml
+++ b/opendaylight/archetypes/odl-model-project/src/main/resources/archetype-resources/pom.xml
@@ -36,7 +36,7 @@
       <plugin>\r
         <groupId>org.apache.maven.plugins</groupId>\r
         <artifactId>maven-compiler-plugin</artifactId>\r
-        <version>2.0</version>\r
+        <version>2.5.1</version>\r
         <inherited>true</inherited>\r
         <configuration>\r
           <source>1.7</source>\r
@@ -111,7 +111,7 @@
     </plugins>\r
     <pluginManagement>\r
       <plugins>\r
-        <!--This plugin's configuration is used to store Eclipse m2e settings \r
+        <!--This plugin's configuration is used to store Eclipse m2e settings\r
           only. It has no influence on the Maven build itself. -->\r
         <plugin>\r
           <groupId>org.eclipse.m2e</groupId>\r
@@ -141,123 +141,58 @@
     </pluginManagement>\r
   </build>\r
   <pluginRepositories>\r
+    <!-- OpenDayLight Repo Mirror -->\r
     <pluginRepository>\r
-      <id>central</id>\r
-      <name>maven repo1</name>\r
-      <url>http://repo1.maven.org/maven2</url>\r
-       <snapshots>\r
-        <enabled>false</enabled>\r
-      </snapshots>\r
-      <releases>\r
-        <enabled>true</enabled>\r
-      </releases>\r
-    </pluginRepository>\r
-    <pluginRepository>\r
-      <id>opendaylight.snapshot</id>\r
-      <name>opendaylight.snapshot</name>\r
-      <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>\r
-    </pluginRepository>\r
-    <pluginRepository>\r
-      <id>opendaylight.release</id>\r
-      <name>opendaylight.release</name>\r
-      <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>\r
-    </pluginRepository>\r
-  </pluginRepositories>\r
-\r
-  <repositories>\r
-    <!-- EBR release -->\r
-    <!-- http://repository.springsource.com/maven/bundles/release -->\r
-    <repository>\r
-      <id>ebr-bundles-release</id>\r
-      <name>ebr-bundles-release</name>\r
-      <url>${nexusproxy}/repositories/ebr-bundles-release/</url>\r
+      <id>opendaylight-mirror</id>\r
+      <name>opendaylight-mirror</name>\r
+      <url>${nexusproxy}/groups/public/</url>\r
       <snapshots>\r
           <enabled>false</enabled>\r
       </snapshots>\r
       <releases>\r
-          <updatePolicy>never</updatePolicy>\r
           <enabled>true</enabled>\r
-      </releases>\r
-    </repository>\r
-    <!-- EBR external -->\r
-    <!-- http://repository.springsource.com/maven/bundles/external -->\r
-    <repository>\r
-      <id>ebr-bundles-external</id>\r
-      <name>ebr-bundles-external</name>\r
-      <url>${nexusproxy}/repositories/ebr-bundles-external/</url>\r
-      <snapshots>\r
-           <enabled>false</enabled>\r
-      </snapshots>\r
-      <releases>\r
           <updatePolicy>never</updatePolicy>\r
-          <enabled>true</enabled>\r
       </releases>\r
-    </repository>\r
-    <repository>\r
-      <id>central</id>\r
-      <name>central</name>\r
-      <url>http://repo1.maven.org/maven2</url>\r
+    </pluginRepository>\r
+    <!-- OpenDayLight Snapshot artifact -->\r
+    <pluginRepository>\r
+      <id>opendaylight-snapshot</id>\r
+      <name>opendaylight-snapshot</name>\r
+      <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>\r
       <snapshots>\r
-        <enabled>false</enabled>\r
+          <enabled>true</enabled>\r
       </snapshots>\r
       <releases>\r
-        <updatePolicy>never</updatePolicy>\r
-        <enabled>true</enabled>\r
-      </releases>\r
-    </repository>\r
-    <!-- Pax mirror -->\r
-    <!-- https://oss.sonatype.org/content/repositories/ops4j-releases -->\r
-    <repository>\r
-      <id>ops4j-releases</id>\r
-      <name>ops4j-releases</name>\r
-      <url>${nexusproxy}/repositories/ops4j-releases/</url>\r
-      <snapshots>\r
           <enabled>false</enabled>\r
-      </snapshots>\r
-      <releases>\r
-          <updatePolicy>never</updatePolicy>\r
-          <enabled>true</enabled>\r
       </releases>\r
-    </repository>\r
-    <!-- Third Packages hosted in local maven because not available in other \r
-      places -->\r
+    </pluginRepository>\r
+  </pluginRepositories>\r
+\r
+  <repositories>\r
+    <!-- OpenDayLight Repo Mirror -->\r
     <repository>\r
-      <id>thirdparty</id>\r
-      <name>thirdparty</name>\r
-      <url>${nexusproxy}/repositories/thirdparty/</url>\r
+      <id>opendaylight-mirror</id>\r
+      <name>opendaylight-mirror</name>\r
+      <url>${nexusproxy}/groups/public/</url>\r
       <snapshots>\r
           <enabled>false</enabled>\r
       </snapshots>\r
       <releases>\r
-          <updatePolicy>never</updatePolicy>\r
           <enabled>true</enabled>\r
+          <updatePolicy>never</updatePolicy>\r
       </releases>\r
     </repository>\r
-    <!-- Jboss mirror -->\r
-    <!-- https://repository.jboss.org/nexus/content/repositories/releases -->\r
-    <repository>\r
-      <id>jboss.releases</id>\r
-      <name>jboss.releases</name>\r
-      <url>${nexusproxy}/repositories/jboss.releases/</url>\r
-      <snapshots>\r
-        <enabled>false</enabled>\r
-      </snapshots>\r
-      <releases>\r
-        <updatePolicy>never</updatePolicy>\r
-        <enabled>true</enabled>\r
-      </releases>\r
-    </repository>\r
-    <!-- OpenDayLight Released artifact -->\r
-    <repository>\r
-      <id>opendaylight-release</id>\r
-      <name>opendaylight-release</name>\r
-      <url>${nexusproxy}/repositories/opendaylight.release/</url>\r
-    </repository>\r
     <!-- OpenDayLight Snapshot artifact -->\r
     <repository>\r
       <id>opendaylight-snapshot</id>\r
       <name>opendaylight-snapshot</name>\r
       <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>\r
+      <snapshots>\r
+          <enabled>true</enabled>\r
+      </snapshots>\r
+      <releases>\r
+          <enabled>false</enabled>\r
+      </releases>\r
     </repository>\r
   </repositories>\r
 \r
@@ -282,12 +217,7 @@
     <dependency>\r
       <groupId>org.opendaylight.yangtools</groupId>\r
       <artifactId>yang-binding</artifactId>\r
-      <version>${yang.version}</version>\r
-    </dependency>\r
-    <dependency>\r
-      <groupId>org.opendaylight.yangtools</groupId>\r
-      <artifactId>yang-common</artifactId>\r
-      <version>${yang.version}</version>\r
+      <version>${yang.codegen.version}</version>\r
     </dependency>\r
   </dependencies>\r
 </project>\r