You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@onami.apache.org by si...@apache.org on 2012/11/26 23:33:54 UTC

svn commit: r1413901 - in /incubator/onami/trunk: autobind/pom.xml cache/pom.xml configuration/pom.xml guava/pom.xml lifecycle/pom.xml logging/pom.xml parent/pom.xml scheduler/pom.xml spi/pom.xml test/pom.xml

Author: simonetripodi
Date: Mon Nov 26 22:33:50 2012
New Revision: 1413901

URL: http://svn.apache.org/viewvc?rev=1413901&view=rev
Log:
[ONAMI-11] Manage shared commons dependencies in the parent

Modified:
    incubator/onami/trunk/autobind/pom.xml
    incubator/onami/trunk/cache/pom.xml
    incubator/onami/trunk/configuration/pom.xml
    incubator/onami/trunk/guava/pom.xml
    incubator/onami/trunk/lifecycle/pom.xml
    incubator/onami/trunk/logging/pom.xml
    incubator/onami/trunk/parent/pom.xml
    incubator/onami/trunk/scheduler/pom.xml
    incubator/onami/trunk/spi/pom.xml
    incubator/onami/trunk/test/pom.xml

Modified: incubator/onami/trunk/autobind/pom.xml
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/autobind/pom.xml?rev=1413901&r1=1413900&r2=1413901&view=diff
==============================================================================
--- incubator/onami/trunk/autobind/pom.xml (original)
+++ incubator/onami/trunk/autobind/pom.xml Mon Nov 26 22:33:50 2012
@@ -77,25 +77,17 @@
     <dependency>
       <groupId>javax.inject</groupId>
       <artifactId>javax.inject</artifactId>
-      <version>1</version>
-    </dependency>
-
-    <dependency>
-      <groupId>com.google.inject</groupId>
-      <artifactId>guice</artifactId>
-      <version>3.0</version>
     </dependency>
 
     <dependency>
       <groupId>com.google.inject.extensions</groupId>
       <artifactId>guice-multibindings</artifactId>
-      <version>3.0</version>
     </dependency>
 
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.10</version>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 

Modified: incubator/onami/trunk/cache/pom.xml
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/cache/pom.xml?rev=1413901&r1=1413900&r2=1413901&view=diff
==============================================================================
--- incubator/onami/trunk/cache/pom.xml (original)
+++ incubator/onami/trunk/cache/pom.xml Mon Nov 26 22:33:50 2012
@@ -58,13 +58,6 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.google.inject</groupId>
-      <artifactId>guice</artifactId>
-      <version>3.0</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
       <groupId>javax.cache</groupId>
       <artifactId>cache-api</artifactId>
       <version>0.5</version>
@@ -73,13 +66,11 @@
     <dependency>
       <groupId>aopalliance</groupId>
       <artifactId>aopalliance</artifactId>
-      <version>1.0</version>
     </dependency>
 
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.10</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: incubator/onami/trunk/configuration/pom.xml
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/configuration/pom.xml?rev=1413901&r1=1413900&r2=1413901&view=diff
==============================================================================
--- incubator/onami/trunk/configuration/pom.xml (original)
+++ incubator/onami/trunk/configuration/pom.xml Mon Nov 26 22:33:50 2012
@@ -68,21 +68,16 @@
     <dependency>
       <groupId>javax.inject</groupId>
       <artifactId>javax.inject</artifactId>
-      <version>1</version>
-      <scope>compile</scope>
     </dependency>
 
     <dependency>
       <groupId>com.google.inject</groupId>
       <artifactId>guice</artifactId>
-      <version>3.0</version>
-      <scope>compile</scope>
     </dependency>
 
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.10</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: incubator/onami/trunk/guava/pom.xml
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/guava/pom.xml?rev=1413901&r1=1413900&r2=1413901&view=diff
==============================================================================
--- incubator/onami/trunk/guava/pom.xml (original)
+++ incubator/onami/trunk/guava/pom.xml Mon Nov 26 22:33:50 2012
@@ -67,8 +67,6 @@
     <dependency>
       <groupId>com.google.inject</groupId>
       <artifactId>guice</artifactId>
-      <version>3.0</version>
-      <scope>provided</scope>
     </dependency>
 
     <dependency>
@@ -81,7 +79,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.10</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: incubator/onami/trunk/lifecycle/pom.xml
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/lifecycle/pom.xml?rev=1413901&r1=1413900&r2=1413901&view=diff
==============================================================================
--- incubator/onami/trunk/lifecycle/pom.xml (original)
+++ incubator/onami/trunk/lifecycle/pom.xml Mon Nov 26 22:33:50 2012
@@ -60,14 +60,11 @@
     <dependency>
       <groupId>com.google.inject</groupId>
       <artifactId>guice</artifactId>
-      <version>3.0</version>
-      <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.10</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: incubator/onami/trunk/logging/pom.xml
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/logging/pom.xml?rev=1413901&r1=1413900&r2=1413901&view=diff
==============================================================================
--- incubator/onami/trunk/logging/pom.xml (original)
+++ incubator/onami/trunk/logging/pom.xml Mon Nov 26 22:33:50 2012
@@ -69,20 +69,10 @@
     <javadoc.aggregate>true</javadoc.aggregate>
   </properties>
 
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>com.google.inject</groupId>
-        <artifactId>guice</artifactId>
-        <version>3.0</version>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
   <dependencies>
     <dependency>
       <groupId>org.testng</groupId>
       <artifactId>testng</artifactId>
-      <version>6.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: incubator/onami/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/parent/pom.xml?rev=1413901&r1=1413900&r2=1413901&view=diff
==============================================================================
--- incubator/onami/trunk/parent/pom.xml (original)
+++ incubator/onami/trunk/parent/pom.xml Mon Nov 26 22:33:50 2012
@@ -277,12 +277,61 @@
     <cobertura.version>2.5.2</cobertura.version>
     <plexus-utils.version>3.0.8</plexus-utils.version>
     <!--
+     | it makes easier to manage Google Guice extensions, such as multibindings, ...
+    -->
+    <guice.version>3.0</guice.version>
+    <!--
      | aux settings
     -->
     <site.skip>false</site.skip>
     <javadoc.aggregate>false</javadoc.aggregate>
   </properties>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>javax.inject</groupId>
+        <artifactId>javax.inject</artifactId>
+        <version>1</version>
+      </dependency>
+
+      <dependency>
+        <groupId>aopalliance</groupId>
+        <artifactId>aopalliance</artifactId>
+        <version>1.0</version>
+      </dependency>
+
+      <dependency>
+        <groupId>com.google.inject.extensions</groupId>
+        <artifactId>guice-multibindings</artifactId>
+        <version>${guice.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>4.10</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.testng</groupId>
+        <artifactId>testng</artifactId>
+        <version>6.0</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+  <dependencies>
+    <!--
+     | Guice is a shared dependency accross all Onami modules
+    -->
+    <dependency>
+      <groupId>com.google.inject</groupId>
+      <artifactId>guice</artifactId>
+      <version>${guice.version}</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
   <build>
     <resources>
       <resource>

Modified: incubator/onami/trunk/scheduler/pom.xml
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/scheduler/pom.xml?rev=1413901&r1=1413900&r2=1413901&view=diff
==============================================================================
--- incubator/onami/trunk/scheduler/pom.xml (original)
+++ incubator/onami/trunk/scheduler/pom.xml Mon Nov 26 22:33:50 2012
@@ -61,8 +61,6 @@
     <dependency>
       <groupId>javax.inject</groupId>
       <artifactId>javax.inject</artifactId>
-      <version>1</version>
-      <scope>compile</scope>
     </dependency>
 
     <dependency>
@@ -75,21 +73,16 @@
     <dependency>
       <groupId>com.google.inject</groupId>
       <artifactId>guice</artifactId>
-      <version>3.0</version>
-      <scope>compile</scope>
     </dependency>
 
     <dependency>
       <groupId>com.google.inject.extensions</groupId>
       <artifactId>guice-multibindings</artifactId>
-      <version>3.0</version>
-      <scope>compile</scope>
     </dependency>
 
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.2</version>
       <scope>test</scope>
     </dependency>
 

Modified: incubator/onami/trunk/spi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/spi/pom.xml?rev=1413901&r1=1413900&r2=1413901&view=diff
==============================================================================
--- incubator/onami/trunk/spi/pom.xml (original)
+++ incubator/onami/trunk/spi/pom.xml Mon Nov 26 22:33:50 2012
@@ -57,31 +57,20 @@
     </notifiers>
   </ciManagement>
 
-  <properties>
-    <!--
-     | shared versions
-    -->
-    <guice.version>3.0</guice.version>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>com.google.inject</groupId>
       <artifactId>guice</artifactId>
-      <version>${guice.version}</version>
-      <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>com.google.inject.extensions</groupId>
       <artifactId>guice-multibindings</artifactId>
-      <version>${guice.version}</version>
     </dependency>
 
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.10</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: incubator/onami/trunk/test/pom.xml
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/test/pom.xml?rev=1413901&r1=1413900&r2=1413901&view=diff
==============================================================================
--- incubator/onami/trunk/test/pom.xml (original)
+++ incubator/onami/trunk/test/pom.xml Mon Nov 26 22:33:50 2012
@@ -62,14 +62,11 @@
     <dependency>
       <groupId>com.google.inject</groupId>
       <artifactId>guice</artifactId>
-      <version>3.0</version>
-      <scope>compile</scope>
     </dependency>
 
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.10</version>
       <scope>provided</scope>
     </dependency>