Merge "Add SCM section to all the poms"

[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 250750c71eeccf6984bd09d9f86602958f3487c6..e592e6df8ef549a86f4bf2c994d2585082664bb6 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
@@ -10,7 +10,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
     <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>\r
     <yang.version>0.5.8-SNAPSHOT</yang.version>\r
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
     <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>\r
     <yang.version>0.5.8-SNAPSHOT</yang.version>\r

-    <maven.bundle.version>2.4.0</maven.bundle.version>\r
+    <bundle.plugin.version>2.3.7</bundle.plugin.version>\r

   </properties>\r
   <scm>\r
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>\r
   </properties>\r
   <scm>\r
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>\r


@@ -23,7 +23,7 @@
       <plugin>\r
         <groupId>org.apache.felix</groupId>\r
         <artifactId>maven-bundle-plugin</artifactId>\r
       <plugin>\r
         <groupId>org.apache.felix</groupId>\r
         <artifactId>maven-bundle-plugin</artifactId>\r

-        <version>${maven.bundle.version}</version>\r
+        <version>${bundle.plugin.version}</version>\r

         <extensions>true</extensions>\r
         <configuration>\r
           <instructions>\r
         <extensions>true</extensions>\r
         <configuration>\r
           <instructions>\r