abdera-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmsn...@apache.org
Subject svn commit: r1239281 - in /abdera/abdera2: activities/pom.xml common/pom.xml core/pom.xml examples/pom.xml ext/pom.xml pom.xml security/pom.xml test/pom.xml
Date Wed, 01 Feb 2012 19:29:05 GMT
Author: jmsnell
Date: Wed Feb  1 19:29:05 2012
New Revision: 1239281

URL: http://svn.apache.org/viewvc?rev=1239281&view=rev
Log:
Proper dependency scoping... previously, the top level pom pulled in all of the dependencies,
so no matter which modules you selected, you still got all of the dependencies for everything...
which was fine for testing, but this limits the dependencies to each individual module. 

Modified:
    abdera/abdera2/activities/pom.xml
    abdera/abdera2/common/pom.xml
    abdera/abdera2/core/pom.xml
    abdera/abdera2/examples/pom.xml
    abdera/abdera2/ext/pom.xml
    abdera/abdera2/pom.xml
    abdera/abdera2/security/pom.xml
    abdera/abdera2/test/pom.xml

Modified: abdera/abdera2/activities/pom.xml
URL: http://svn.apache.org/viewvc/abdera/abdera2/activities/pom.xml?rev=1239281&r1=1239280&r2=1239281&view=diff
==============================================================================
--- abdera/abdera2/activities/pom.xml (original)
+++ abdera/abdera2/activities/pom.xml Wed Feb  1 19:29:05 2012
@@ -45,13 +45,16 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.abdera2</groupId>
-      <artifactId>abdera2-common</artifactId>
-      <version>2.0-SNAPSHOT</version>  
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-all</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.easymock</groupId>
+      <artifactId>easymock</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.abdera2</groupId>
-      <artifactId>abdera2-client</artifactId>
+      <artifactId>abdera2-common</artifactId>
       <version>2.0-SNAPSHOT</version>  
     </dependency>
       <dependency>

Modified: abdera/abdera2/common/pom.xml
URL: http://svn.apache.org/viewvc/abdera/abdera2/common/pom.xml?rev=1239281&r1=1239280&r2=1239281&view=diff
==============================================================================
--- abdera/abdera2/common/pom.xml (original)
+++ abdera/abdera2/common/pom.xml Wed Feb  1 19:29:05 2012
@@ -66,11 +66,6 @@
     </dependency>
 
     <dependency>
-      <groupId>javax</groupId>
-      <artifactId>javaee-web-api</artifactId>
-    </dependency>
-
-    <dependency>
       <groupId>com.ibm.icu</groupId>
       <artifactId>icu4j</artifactId>
     </dependency>

Modified: abdera/abdera2/core/pom.xml
URL: http://svn.apache.org/viewvc/abdera/abdera2/core/pom.xml?rev=1239281&r1=1239280&r2=1239281&view=diff
==============================================================================
--- abdera/abdera2/core/pom.xml (original)
+++ abdera/abdera2/core/pom.xml Wed Feb  1 19:29:05 2012
@@ -64,9 +64,8 @@
     </dependency>
     
     <dependency>
-      <groupId>org.apache.abdera2</groupId>
-      <artifactId>abdera2-client</artifactId>
-      <version>2.0-SNAPSHOT</version>
+      <groupId>org.apache.ws.commons.axiom</groupId>
+      <artifactId>axiom-api</artifactId>
     </dependency>
 
     <dependency>
@@ -88,6 +87,27 @@
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
     </dependency>
+    
+      <dependency>
+        <groupId>xerces</groupId>
+        <artifactId>xercesImpl</artifactId>
+      </dependency>
+            
+      <dependency>
+        <groupId>xml-apis</groupId>
+        <artifactId>xml-apis</artifactId>
+      </dependency>
+      
+      <dependency>
+        <groupId>org.codehaus.woodstox</groupId>
+        <artifactId>wstx-asl</artifactId>
+        <scope>runtime</scope>      
+      </dependency>
+      
+      <dependency>
+        <groupId>jaxen</groupId>
+        <artifactId>jaxen</artifactId>
+      </dependency>
 
   </dependencies>
   

Modified: abdera/abdera2/examples/pom.xml
URL: http://svn.apache.org/viewvc/abdera/abdera2/examples/pom.xml?rev=1239281&r1=1239280&r2=1239281&view=diff
==============================================================================
--- abdera/abdera2/examples/pom.xml (original)
+++ abdera/abdera2/examples/pom.xml Wed Feb  1 19:29:05 2012
@@ -17,20 +17,6 @@
   
   <dependencies>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.abdera2</groupId>
-      <artifactId>abdera2-client</artifactId>
-      <version>2.0-SNAPSHOT</version>  
-    </dependency>
-    <dependency>
-      <groupId>org.apache.abdera2</groupId>
-      <artifactId>abdera2-server</artifactId>
-      <version>2.0-SNAPSHOT</version>  
-    </dependency>
-    <dependency>
       <groupId>org.apache.abdera2</groupId>
       <artifactId>abdera2-activities</artifactId>
       <version>2.0-SNAPSHOT</version>  
@@ -41,13 +27,9 @@
       <version>2.0-SNAPSHOT</version>  
     </dependency>
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty</artifactId>
-      <version>${jetty.version}</version>  
-    </dependency>
-    <dependency>
-      <groupId>javax</groupId>
-      <artifactId>javaee-web-api</artifactId>
+      <groupId>abdera2</groupId>
+      <artifactId>abdera2-core</artifactId>
+      <version>2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>

Modified: abdera/abdera2/ext/pom.xml
URL: http://svn.apache.org/viewvc/abdera/abdera2/ext/pom.xml?rev=1239281&r1=1239280&r2=1239281&view=diff
==============================================================================
--- abdera/abdera2/ext/pom.xml (original)
+++ abdera/abdera2/ext/pom.xml Wed Feb  1 19:29:05 2012
@@ -55,19 +55,7 @@
       <artifactId>abdera2-common</artifactId>
       <version>2.0-SNAPSHOT</version>  
       <scope>compile</scope>
-    </dependency>   
-    <dependency>
-      <groupId>org.apache.abdera2</groupId>
-      <artifactId>abdera2-server</artifactId>
-      <version>2.0-SNAPSHOT</version>  
-      <scope>compile</scope>
-    </dependency>  
-    <dependency>
-      <groupId>org.apache.abdera2</groupId>
-      <artifactId>abdera2-client</artifactId>
-      <version>2.0-SNAPSHOT</version>  
-      <scope>compile</scope>
-    </dependency> 
+    </dependency>      
     <dependency>
       <groupId>org.apache.abdera2</groupId>
       <artifactId>abdera2-activities</artifactId>
@@ -75,10 +63,6 @@
       <scope>compile</scope>
     </dependency> 
     
-    <dependency>
-      <groupId>javax</groupId>
-      <artifactId>javaee-web-api</artifactId>
-    </dependency>
     
     <dependency>
       <groupId>nu.validator.htmlparser</groupId>

Modified: abdera/abdera2/pom.xml
URL: http://svn.apache.org/viewvc/abdera/abdera2/pom.xml?rev=1239281&r1=1239280&r2=1239281&view=diff
==============================================================================
--- abdera/abdera2/pom.xml (original)
+++ abdera/abdera2/pom.xml Wed Feb  1 19:29:05 2012
@@ -438,12 +438,6 @@
         <version>1.1</version>  
       </dependency>
             
-      <dependency>
-        <groupId>javax</groupId>
-        <artifactId>javaee-web-api</artifactId>
-        <version>6.0</version>
-        <scope>provided</scope>
-      </dependency>
 
       <dependency>
         <groupId>com.ibm.icu</groupId>
@@ -508,30 +502,7 @@
         <artifactId>xml-apis</artifactId>
         <version>2.0.2</version>  
       </dependency>
-      
-      <dependency>
-        <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-server</artifactId>
-        <version>8.0.0.v20110901</version>
-      </dependency>
-      <dependency>
-        <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-servlet</artifactId>
-        <version>8.0.0.v20110901</version>
-      </dependency>
-      
-      <dependency>
-        <groupId>org.mockito</groupId>
-        <artifactId>mockito-all</artifactId>
-        <version>1.8.5</version>
-      </dependency>
-      
-      <dependency>
-          <groupId>org.easymock</groupId>
-          <artifactId>easymock</artifactId>
-          <version>3.0</version>
-      </dependency>
-      
+
       <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
@@ -544,147 +515,28 @@
       <version>1.2.1</version>
     </dependency>
     
-    <dependency>
-      <groupId>joda-time</groupId>
-      <artifactId>joda-time</artifactId>
-      <version>2.0</version>
-    </dependency>
-    
-    </dependencies>
-  </dependencyManagement>
-  
-  
-    <dependencies>
-
-      <dependency>
-        <groupId>commons-codec</groupId>
-        <artifactId>commons-codec</artifactId>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.httpcomponents</groupId>
-        <artifactId>httpclient</artifactId>
-      </dependency>
-      
-      <dependency>
-        <groupId>org.apache.httpcomponents</groupId>
-        <artifactId>httpmime</artifactId>
-      </dependency>
-      
-      <dependency>
-        <groupId>org.apache.httpcomponents</groupId>
-        <artifactId>httpcore</artifactId>
-      </dependency>
-         
-      <dependency>
-        <groupId>org.apache.httpcomponents</groupId>
-        <artifactId>httpclient-cache</artifactId>
-      </dependency>
-
-      <dependency>
-        <groupId>com.google.code.gson</groupId>
-        <artifactId>gson</artifactId>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.ws.commons.axiom</groupId>
-        <artifactId>axiom-api</artifactId>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.ws.commons.axiom</groupId>
-        <artifactId>axiom-impl</artifactId>
-      </dependency>
-
-      <dependency>
-        <groupId>commons-logging</groupId>
-        <artifactId>commons-logging</artifactId>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-activation_1.1_spec</artifactId>
-      </dependency>
-            
-      <dependency>
-        <groupId>javax</groupId>
-        <artifactId>javaee-web-api</artifactId>
-        <scope>provided</scope>
-      </dependency>
-
-      <dependency>
-        <groupId>com.ibm.icu</groupId>
-        <artifactId>icu4j</artifactId>
-      </dependency>
-
-      <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <scope>test, compile, package</scope>
-      </dependency>
-            
-      <dependency>
-        <groupId>org.codehaus.woodstox</groupId>
-        <artifactId>wstx-asl</artifactId>
-        <scope>runtime</scope>      
-      </dependency>
-      
-      <dependency>
-        <groupId>jaxen</groupId>
-        <artifactId>jaxen</artifactId>
-      </dependency>
-      
-      <dependency>
-        <groupId>org.apache.santuario</groupId>
-        <artifactId>xmlsec</artifactId>
-      </dependency>
-      
-      <dependency>
-        <groupId>xerces</groupId>
-        <artifactId>xercesImpl</artifactId>
-      </dependency>
-            
-      <dependency>
-        <groupId>xml-apis</groupId>
-        <artifactId>xml-apis</artifactId>
-      </dependency>
-      
-      <dependency>
-        <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-server</artifactId>
-      </dependency>
-      <dependency>
-        <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-servlet</artifactId>
-      </dependency>
-      
-      <dependency>
+          <dependency>
         <groupId>org.mockito</groupId>
         <artifactId>mockito-all</artifactId>
+        <version>1.8.5</version>
       </dependency>
-      
-      <dependency>
+       <dependency>
           <groupId>org.easymock</groupId>
           <artifactId>easymock</artifactId>
+          <version>3.0</version>
       </dependency>
-      
-      <dependency>
-        <groupId>com.google.guava</groupId>
-        <artifactId>guava</artifactId>
-      </dependency>
-      
-    <dependency>
-      <groupId>nu.validator.htmlparser</groupId>
-      <artifactId>htmlparser</artifactId>
-    </dependency>
-      
+    
     <dependency>
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>
+      <version>2.0</version>
     </dependency>
-      
+    
     </dependencies>
+  </dependencyManagement>
   
+  <dependencies>      
+  </dependencies>
   
   <modules>
     <module>common</module>

Modified: abdera/abdera2/security/pom.xml
URL: http://svn.apache.org/viewvc/abdera/abdera2/security/pom.xml?rev=1239281&r1=1239280&r2=1239281&view=diff
==============================================================================
--- abdera/abdera2/security/pom.xml (original)
+++ abdera/abdera2/security/pom.xml Wed Feb  1 19:29:05 2012
@@ -57,12 +57,6 @@
       <scope>compile</scope>
     </dependency>    
     <dependency>
-      <groupId>org.apache.abdera2</groupId>
-      <artifactId>abdera2-server</artifactId>
-      <version>2.0-SNAPSHOT</version>  
-      <scope>compile</scope>
-    </dependency> 
-    <dependency>
       <groupId>org.apache.santuario</groupId>
       <artifactId>xmlsec</artifactId>
     </dependency>

Modified: abdera/abdera2/test/pom.xml
URL: http://svn.apache.org/viewvc/abdera/abdera2/test/pom.xml?rev=1239281&r1=1239280&r2=1239281&view=diff
==============================================================================
--- abdera/abdera2/test/pom.xml (original)
+++ abdera/abdera2/test/pom.xml Wed Feb  1 19:29:05 2012
@@ -55,18 +55,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.abdera2</groupId>
-      <artifactId>abdera2-server</artifactId>
-      <version>2.0-SNAPSHOT</version>  
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.abdera2</groupId>
-      <artifactId>abdera2-client</artifactId>
-      <version>2.0-SNAPSHOT</version>  
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.abdera2</groupId>
       <artifactId>abdera2-security</artifactId>
       <version>2.0-SNAPSHOT</version>  
       <scope>compile</scope>
@@ -84,23 +72,27 @@
       <scope>compile</scope>
     </dependency>
 
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-server</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-servlet</artifactId>
-    </dependency>
-    <dependency>
-        <groupId>org.easymock</groupId>
-        <artifactId>easymock</artifactId>
-    </dependency> 
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <scope>compile</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-server</artifactId>
+        <version>8.0.0.v20110901</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-servlet</artifactId>
+        <version>8.0.0.v20110901</version>
+      </dependency>
+      <dependency>
+          <groupId>org.easymock</groupId>
+          <artifactId>easymock</artifactId>
+      </dependency>
+      
     
     <dependency>
       <groupId>xalan</groupId>



Mime
View raw message