Code Review / controller.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (from parent 1: c983d7c)
Add snapshots/releases setting to all maven repos. 79/1079/3
authorAlissa Bonas <abonas@redhat.com>
Tue, 3 Sep 2013 08:03:24 +0000 (11:03 +0300)
committerAlissa Bonas <abonas@redhat.com>
Sun, 8 Sep 2013 08:38:05 +0000 (11:38 +0300)
Change-Id: I8122947d2c6dfa3828502b1629f4bf6811b77ecc
Signed-off-by: Alissa Bonas <abonas@redhat.com>
opendaylight/archetypes/odl-model-project/src/main/resources/archetype-resources/pom.xml patch | blob | history
opendaylight/commons/opendaylight/pom.xml patch | blob | history
opendaylight/northbound/integrationtest/pom.xml patch | blob | history
opendaylight/sal/yang-prototype/pom.xml patch | blob | history
opendaylight/sal/yang-prototype/sal/pom.xml patch | blob | history
opendaylight/sal/yang-prototype/sal/sal-binding-broker-impl/pom.xml patch | blob | history
opendaylight/sal/yang-prototype/sal/sal-broker-impl/pom.xml patch | blob | history

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 d9b4720503a49f55119279040557bf4b744e8b21..b84346514f17c85a3b4d24c2f1f1878747bcd623 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
@@ -139,6 +139,12 @@
       <id>central2</id>\r
       <name>central2</name>\r
       <url>http://repo2.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
@@ -166,11 +172,23 @@
       <id>central2</id>\r
       <name>central2</name>\r
       <url>http://repo2.maven.org/maven2</url>\r
+      <snapshots>\r
+        <enabled>false</enabled>\r
+      </snapshots>\r
+      <releases>\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
+      <snapshots>\r
+        <enabled>false</enabled>\r
+      </snapshots>\r
+      <releases>\r
+        <enabled>true</enabled>\r
+      </releases>\r
     </repository>\r
     <!-- Pax mirror -->\r
     <!-- https://oss.sonatype.org/content/repositories/ops4j-releases -->\r
diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index 7c6a618a31717a70f6dc66903d8c5d645527956e..75b78cf015d08759e247a15da5691f39020e331b 100644 (file)
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -125,7 +125,6 @@
           <groupId>com.google.guava</groupId>
           <artifactId>guava</artifactId>
           <version>${guava.version}</version>
-          <type>jar</type>
         </dependency>
         <dependency>
           <groupId>org.javassist</groupId>
@@ -210,11 +209,23 @@
       <id>central2</id>
       <name>central2</name>
       <url>http://repo2.maven.org/maven2</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <releases>
+          <enabled>true</enabled>
+      </releases>
     </repository>
     <repository>
       <id>central</id>
       <name>central</name>
       <url>http://repo1.maven.org/maven2</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <releases>
+          <enabled>true</enabled>
+      </releases>
     </repository>
     <!-- Pax mirror -->
     <!-- https://oss.sonatype.org/content/repositories/ops4j-releases -->
diff --git a/opendaylight/northbound/integrationtest/pom.xml b/opendaylight/northbound/integrationtest/pom.xml
index 9432d6f622114f1fb16d019ed2c33f96e043e914..4d0f663dea73f8f90d659371a9bbb1e17fb648b4 100644 (file)
--- a/opendaylight/northbound/integrationtest/pom.xml
+++ b/opendaylight/northbound/integrationtest/pom.xml
@@ -23,6 +23,12 @@
       <id>central2</id>
       <name>central2</name>
       <url>http://repo2.maven.org/maven2</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
     </pluginRepository>
   </pluginRepositories>
   <dependencies>
diff --git a/opendaylight/sal/yang-prototype/pom.xml b/opendaylight/sal/yang-prototype/pom.xml
index 4c5db1086c098cf936a1daaf0b70902368f159eb..b1107594f50fb3d60390f71b081e2b495dc89f8c 100644 (file)
--- a/opendaylight/sal/yang-prototype/pom.xml
+++ b/opendaylight/sal/yang-prototype/pom.xml
@@ -46,6 +46,12 @@
           <id>central2</id>
           <name>central2</name>
           <url>http://repo2.maven.org/maven2</url>
+          <snapshots>
+             <enabled>false</enabled>
+          </snapshots>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
         </pluginRepository>
         <pluginRepository>
             <id>opendaylight.snapshot</id>
@@ -74,11 +80,23 @@
           <id>central2</id>
           <name>central2</name>
           <url>http://repo2.maven.org/maven2</url>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
         </repository>
         <repository>
           <id>central</id>
           <name>central</name>
           <url>http://repo1.maven.org/maven2</url>
+          <snapshots>
+             <enabled>false</enabled>
+          </snapshots>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
         </repository>
         <!-- Pax mirror -->
         <!-- https://oss.sonatype.org/content/repositories/ops4j-releases -->
diff --git a/opendaylight/sal/yang-prototype/sal/pom.xml b/opendaylight/sal/yang-prototype/sal/pom.xml
index fc6fb8eaed40561c666d5468484cf89e6cc84d73..0442e8f9b2646d8f9b4d159fdfff7ea1e47d0287 100644 (file)
--- a/opendaylight/sal/yang-prototype/sal/pom.xml
+++ b/opendaylight/sal/yang-prototype/sal/pom.xml
@@ -28,6 +28,7 @@
                <yang.version>0.5.7-SNAPSHOT</yang.version>
                <maven.bundle.version>2.4.0</maven.bundle.version>
         <releaseplugin.version>2.3.2</releaseplugin.version>
+        <guava.version>14.0.1</guava.version>
        </properties>
 
     <pluginRepositories>
@@ -35,6 +36,12 @@
           <id>central2</id>
           <name>central2</name>
           <url>http://repo2.maven.org/maven2</url>
+          <snapshots>
+              <enabled>false</enabled>
+          </snapshots>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
         </pluginRepository>
         <pluginRepository>
             <id>opendaylight.snapshot</id>
@@ -49,11 +56,23 @@
         <id>central2</id>
         <name>central2</name>
         <url>http://repo2.maven.org/maven2</url>
+        <snapshots>
+            <enabled>false</enabled>
+        </snapshots>
+        <releases>
+            <enabled>true</enabled>
+        </releases>
       </repository>
       <repository>
         <id>central</id>
         <name>central</name>
         <url>http://repo1.maven.org/maven2</url>
+        <snapshots>
+            <enabled>false</enabled>
+        </snapshots>
+        <releases>
+            <enabled>true</enabled>
+        </releases>
       </repository>
                <!-- EBR release -->
                <!-- http://repository.springsource.com/maven/bundles/release -->
@@ -128,8 +147,7 @@
                        <dependency>
                                <groupId>com.google.guava</groupId>
                                <artifactId>guava</artifactId>
-                               <version>14.0.1</version>
-                               <type>jar</type>
+                <version>${guava.version}</version>
                        </dependency>
                        <dependency>
                                <groupId>org.slf4j</groupId>
diff --git a/opendaylight/sal/yang-prototype/sal/sal-binding-broker-impl/pom.xml b/opendaylight/sal/yang-prototype/sal/sal-binding-broker-impl/pom.xml
index b8ba6055246a8b319f6bb25ee2161504e1cec104..549e427d82e816fb4374d3b80b3b44e2b9aeee1d 100644 (file)
--- a/opendaylight/sal/yang-prototype/sal/sal-binding-broker-impl/pom.xml
+++ b/opendaylight/sal/yang-prototype/sal/sal-binding-broker-impl/pom.xml
@@ -93,7 +93,6 @@
                <dependency>
                        <groupId>com.google.guava</groupId>
                        <artifactId>guava</artifactId>
-                       <type>jar</type>
                </dependency>
                <dependency>
                        <groupId>org.reflections</groupId>
diff --git a/opendaylight/sal/yang-prototype/sal/sal-broker-impl/pom.xml b/opendaylight/sal/yang-prototype/sal/sal-broker-impl/pom.xml
index fa3536335736d58af14725978158451eba3291a5..0965e2523109f5d24b9f23bc055523dd05f93e90 100644 (file)
--- a/opendaylight/sal/yang-prototype/sal/sal-broker-impl/pom.xml
+++ b/opendaylight/sal/yang-prototype/sal/sal-broker-impl/pom.xml
@@ -36,7 +36,6 @@
         <dependency>\r
             <groupId>com.google.guava</groupId>\r
             <artifactId>guava</artifactId>\r
-            <type>jar</type>\r
         </dependency>\r
     </dependencies>\r
 </project>\r
OpenDaylight controller