You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2006/04/10 19:34:38 UTC
svn commit: r392997 - in /cocoon/trunk/blocks: cocoon-ojb/cocoon-ojb-impl/ cocoon-proxy/cocoon-proxy-impl/ cocoon-scratchpad/cocoon-scratchpad-impl/ cocoon-scratchpad/cocoon-scratchpad-mocks/ cocoon-scratchpad/cocoon-scratchpad-mocks/src/main/java/mock...

Author: cziegeler
Date: Mon Apr 10 10:34:36 2006
New Revision: 392997

URL: http://svn.apache.org/viewcvs?rev=392997&view=rev
Log:
Fix poms

Removed:
    cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-mocks/src/main/java/mocks/commons-betwixt-0.6.jar
    cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-mocks/src/main/java/mocks/org/
    cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-mocks/src/main/java/mocks/pom.xml
    cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-mocks/
Modified:
    cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-impl/pom.xml
    cocoon/trunk/blocks/cocoon-proxy/cocoon-proxy-impl/pom.xml
    cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/pom.xml
    cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-mocks/pom.xml
    cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml
    cocoon/trunk/blocks/cocoon-xsp/pom.xml

Modified: cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-impl/pom.xml?rev=392997&r1=392996&r2=392997&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-impl/pom.xml Mon Apr 10 10:34:36 2006
@@ -40,7 +40,8 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-ojb-mocks</artifactId>
-      <version>2.2-SNAPSHOT</version>
+      <version>1.0-SNAPSHOT</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>ojb</groupId>

Modified: cocoon/trunk/blocks/cocoon-proxy/cocoon-proxy-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-proxy/cocoon-proxy-impl/pom.xml?rev=392997&r1=392996&r2=392997&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-proxy/cocoon-proxy-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-proxy/cocoon-proxy-impl/pom.xml Mon Apr 10 10:34:36 2006
@@ -37,10 +37,16 @@
       <artifactId>cocoon-core</artifactId>
       <version>2.2.0-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>commons-httpclient</groupId>
+      <artifactId>commons-httpclient</artifactId>
+      <version>2.0.2</version>
+    </dependency>
     <dependency>
       <groupId>servletapi</groupId>
       <artifactId>servletapi</artifactId>
-      <version>2.3</version>
+      <version>2.3</version>
+      <scope>provided</scope>
     </dependency>
   </dependencies>
 </project>

Modified: cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/pom.xml?rev=392997&r1=392996&r2=392997&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/pom.xml Mon Apr 10 10:34:36 2006
@@ -40,17 +40,17 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-cron</artifactId>
-      <version>2.2-SNAPSHOT</version>
+      <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-repository</artifactId>
-      <version>2.2-SNAPSHOT</version>
+      <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>axis</groupId>
       <artifactId>axis</artifactId>
-      <version>1.2.1</version>
+      <version>1.3</version>
     </dependency>
     <dependency>
       <groupId>axis</groupId>
@@ -71,11 +71,6 @@
       <groupId>castor</groupId>
       <artifactId>castor</artifactId>
       <version>0.9.7</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-scratchpad-mocks</artifactId>
-      <version>2.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>

Modified: cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-mocks/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-mocks/pom.xml?rev=392997&r1=392996&r2=392997&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-mocks/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-mocks/pom.xml Mon Apr 10 10:34:36 2006
@@ -40,7 +40,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-forms</artifactId>
-      <version>2.2-SNAPSHOT</version>
+      <version>1.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>

Modified: cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml?rev=392997&r1=392996&r2=392997&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml Mon Apr 10 10:34:36 2006
@@ -39,18 +39,9 @@
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-xsp-mocks</artifactId>
-      <version>1.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-mocks</artifactId>
-      <version>1.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-session-fw-impl</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>1.0-SNAPSHOT</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>eclipse</groupId>
@@ -61,6 +52,12 @@
       <groupId>excalibur-datasource</groupId>
       <artifactId>excalibur-datasource</artifactId>
       <version>2.1</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>d-haven-managed-pool</artifactId>
+          <groupId>d-haven-managed-pool</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
   </dependencies>
 </project>

Modified: cocoon/trunk/blocks/cocoon-xsp/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-xsp/pom.xml?rev=392997&r1=392996&r2=392997&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-xsp/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-xsp/pom.xml Mon Apr 10 10:34:36 2006
@@ -43,6 +43,5 @@
   <modules>
     <module>cocoon-xsp-impl</module>
     <module>cocoon-xsp-sample</module>
-    <module>cocoon-xsp-mocks</module>
   </modules>
 </project>