cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reinh...@apache.org
Subject svn commit: r614038 - in /cocoon/whiteboard/micro: misc/cocoon-micro-it-block/pom.xml misc/cocoon-webapp/pom.xml parent/pom.xml
Date Mon, 21 Jan 2008 23:01:43 GMT
Author: reinhard
Date: Mon Jan 21 15:01:40 2008
New Revision: 614038

URL: http://svn.apache.org/viewvc?rev=614038&view=rev
Log:
set versions of dependencies and plugins explicitly

Modified:
    cocoon/whiteboard/micro/misc/cocoon-micro-it-block/pom.xml
    cocoon/whiteboard/micro/misc/cocoon-webapp/pom.xml
    cocoon/whiteboard/micro/parent/pom.xml

Modified: cocoon/whiteboard/micro/misc/cocoon-micro-it-block/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/micro/misc/cocoon-micro-it-block/pom.xml?rev=614038&r1=614037&r2=614038&view=diff
==============================================================================
--- cocoon/whiteboard/micro/misc/cocoon-micro-it-block/pom.xml (original)
+++ cocoon/whiteboard/micro/misc/cocoon-micro-it-block/pom.xml Mon Jan 21 15:01:40 2008
@@ -22,7 +22,7 @@
 
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>
-  
+
   <parent>
     <artifactId>cocoon-micro</artifactId>
     <groupId>org.apache.cocoon.micro</groupId>
@@ -52,21 +52,10 @@
       <plugin>
         <groupId>org.apache.cocoon</groupId>
         <artifactId>cocoon-maven-plugin</artifactId>
-        <version>1.0.0-M1</version>
-        <executions>
-          <execution>
-            <id>rcl</id>
-            <phase>compile</phase>
-            <goals>
-              <goal>rcl</goal>
-            </goals>
-          </execution>
-        </executions>
       </plugin>
       <plugin>
         <groupId>org.mortbay.jetty</groupId>
         <artifactId>maven-jetty-plugin</artifactId>
-        <version>6.1.7</version>
         <configuration>
           <connectors>
             <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
@@ -86,7 +75,6 @@
       </plugin>
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>2.1</version>
         <configuration>
           <archive>
             <manifestEntries>
@@ -94,10 +82,6 @@
             </manifestEntries>
           </archive>
         </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-eclipse-plugin</artifactId>
-        <version>2.4</version>
       </plugin>
     </plugins>
   </build>

Modified: cocoon/whiteboard/micro/misc/cocoon-webapp/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/micro/misc/cocoon-webapp/pom.xml?rev=614038&r1=614037&r2=614038&view=diff
==============================================================================
--- cocoon/whiteboard/micro/misc/cocoon-webapp/pom.xml (original)
+++ cocoon/whiteboard/micro/misc/cocoon-webapp/pom.xml Mon Jan 21 15:01:40 2008
@@ -22,7 +22,7 @@
 
   <modelVersion>4.0.0</modelVersion>
   <packaging>war</packaging>
-  
+
   <parent>
     <artifactId>cocoon-micro</artifactId>
     <groupId>org.apache.cocoon.micro</groupId>
@@ -41,7 +41,6 @@
       <plugin>
         <groupId>org.mortbay.jetty</groupId>
         <artifactId>maven-jetty-plugin</artifactId>
-        <version>6.1.7</version>
         <configuration>
           <connectors>
             <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
@@ -56,11 +55,11 @@
     </plugins>
     <finalName>cocoon-webapp</finalName>
   </build>
-  
+
   <properties>
     <jetty.port>8888</jetty.port>
     <jetty.context>/</jetty.context>
-  </properties>  
+  </properties>
 
   <dependencies>
     <dependency>
@@ -70,7 +69,12 @@
     <dependency>
       <groupId>org.apache.cocoon.micro</groupId>
       <artifactId>cocoon-micro-it-block</artifactId>
-    </dependency>    
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-it-fw</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <profiles>
@@ -131,5 +135,5 @@
       </build>
     </profile>
   </profiles>
-  
+
 </project>

Modified: cocoon/whiteboard/micro/parent/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/micro/parent/pom.xml?rev=614038&r1=614037&r2=614038&view=diff
==============================================================================
--- cocoon/whiteboard/micro/parent/pom.xml (original)
+++ cocoon/whiteboard/micro/parent/pom.xml Mon Jan 21 15:01:40 2008
@@ -414,6 +414,13 @@
         <artifactId>cocoon-servlet-service-impl</artifactId>
         <version>1.0.0-RC2-SNAPSHOT</version>
       </dependency>
+      <!-- ~~~~~~~~~~~~~~~~~~ Cocoon Integration Test Framework ~~~~~~~~~~~~~~~ -->
+      <dependency>
+        <groupId>org.apache.cocoon</groupId>
+        <artifactId>cocoon-it-fw</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <scope>test</scope>
+      </dependency>
       <!-- ~~~~~~~~~~~~~~~~~~ Cocoon SNAPSHOT dependencies ~~~~~~~~~~~~~~~ -->
       <dependency>
         <groupId>org.apache.cocoon.micro</groupId>
@@ -556,6 +563,25 @@
         <plugin>
           <artifactId>maven-war-plugin</artifactId>
           <version>2.0.2</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.cocoon.micro</groupId>
+          <artifactId>cocoon-micro-it-fw</artifactId>
+          <version>1.0.0-SNAPSHOT</version>
+        </plugin>
+        <plugin>
+          <groupId>org.mortbay.jetty</groupId>
+          <artifactId>maven-jetty-plugin</artifactId>
+          <version>6.1.7</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.cocoon</groupId>
+          <artifactId>cocoon-maven-plugin</artifactId>
+          <version>1.0.0-M1</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>2.1</version>
         </plugin>
       </plugins>
     </pluginManagement>



Mime
View raw message