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 2005/09/25 14:44:36 UTC
svn commit: r291401 - in /cocoon: blocks/axis/trunk/ blocks/chaperon/trunk/
blocks/javaflow/trunk/ blocks/portal-sample/trunk/ blocks/portal/trunk/
blocks/scratchpad/trunk/ blocks/xsp/trunk/ trunk/core/
Author: cziegeler
Date: Sun Sep 25 05:44:20 2005
New Revision: 291401
URL: http://svn.apache.org/viewcvs?rev=291401&view=rev
Log:
Update some m2 poms
Modified:
cocoon/blocks/axis/trunk/pom.xml
cocoon/blocks/chaperon/trunk/pom.xml
cocoon/blocks/javaflow/trunk/pom.xml
cocoon/blocks/portal-sample/trunk/pom.xml
cocoon/blocks/portal/trunk/pom.xml
cocoon/blocks/scratchpad/trunk/pom.xml
cocoon/blocks/xsp/trunk/pom.xml
cocoon/trunk/core/pom.xml
Modified: cocoon/blocks/axis/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/axis/trunk/pom.xml?rev=291401&r1=291400&r2=291401&view=diff
==============================================================================
--- cocoon/blocks/axis/trunk/pom.xml (original)
+++ cocoon/blocks/axis/trunk/pom.xml Sun Sep 25 05:44:20 2005
@@ -52,6 +52,16 @@
<version>1.2.1</version>
</dependency>
<dependency>
+ <groupId>axis</groupId>
+ <artifactId>axis-jaxrpc</artifactId>
+ <version>1.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>axis</groupId>
+ <artifactId>axis-saaj</artifactId>
+ <version>1.2.1</version>
+ </dependency>
+ <dependency>
<groupId>servletapi</groupId>
<artifactId>servletapi</artifactId>
<version>2.3</version>
Modified: cocoon/blocks/chaperon/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/chaperon/trunk/pom.xml?rev=291401&r1=291400&r2=291401&view=diff
==============================================================================
--- cocoon/blocks/chaperon/trunk/pom.xml (original)
+++ cocoon/blocks/chaperon/trunk/pom.xml Sun Sep 25 05:44:20 2005
@@ -55,7 +55,7 @@
<dependency>
<groupId>castor</groupId>
<artifactId>castor</artifactId>
- <version>0.9.7-xml</version>
+ <version>0.9.7</version>
</dependency>
<dependency>
<groupId>apache-cocoon</groupId>
Modified: cocoon/blocks/javaflow/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/javaflow/trunk/pom.xml?rev=291401&r1=291400&r2=291401&view=diff
==============================================================================
--- cocoon/blocks/javaflow/trunk/pom.xml (original)
+++ cocoon/blocks/javaflow/trunk/pom.xml Sun Sep 25 05:44:20 2005
@@ -50,15 +50,7 @@
<dependency>
<groupId>commons-javaflow</groupId>
<artifactId>commons-javaflow</artifactId>
- <version>0.1-dev</version>
+ <version>r291286</version>
</dependency>
</dependencies>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- </plugin>
- </plugins>
- </reporting>
</project>
Modified: cocoon/blocks/portal-sample/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/pom.xml?rev=291401&r1=291400&r2=291401&view=diff
==============================================================================
--- cocoon/blocks/portal-sample/trunk/pom.xml (original)
+++ cocoon/blocks/portal-sample/trunk/pom.xml Sun Sep 25 05:44:20 2005
@@ -28,7 +28,7 @@
<groupId>apache-cocoon</groupId>
<artifactId>cocoon-portal-sample</artifactId>
<version>2.2-SNAPSHOT</version>
- <packaging>jar</packaging>
+ <packaging>war</packaging>
<build>
<sourceDirectory>java</sourceDirectory>
<resources>
@@ -39,6 +39,15 @@
</excludes>
</resource>
</resources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <warSourceDirectory>samples</warSourceDirectory>
+ <webXml>${basedir}/../../../webapp/WEB-INF/web.xml</webXml>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
<dependencies>
<dependency>
@@ -62,12 +71,4 @@
<version>0.3</version>
</dependency>
</dependencies>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- </plugin>
- </plugins>
- </reporting>
</project>
Modified: cocoon/blocks/portal/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/pom.xml?rev=291401&r1=291400&r2=291401&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/pom.xml (original)
+++ cocoon/blocks/portal/trunk/pom.xml Sun Sep 25 05:44:20 2005
@@ -89,7 +89,7 @@
<dependency>
<groupId>castor</groupId>
<artifactId>castor</artifactId>
- <version>0.9.7-xml</version>
+ <version>0.9.7</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
@@ -149,12 +149,4 @@
<version>0.3</version>
</dependency>
</dependencies>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- </plugin>
- </plugins>
- </reporting>
</project>
Modified: cocoon/blocks/scratchpad/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/scratchpad/trunk/pom.xml?rev=291401&r1=291400&r2=291401&view=diff
==============================================================================
--- cocoon/blocks/scratchpad/trunk/pom.xml (original)
+++ cocoon/blocks/scratchpad/trunk/pom.xml Sun Sep 25 05:44:20 2005
@@ -75,7 +75,7 @@
<dependency>
<groupId>castor</groupId>
<artifactId>castor</artifactId>
- <version>0.9.7-xml</version>
+ <version>0.9.7</version>
</dependency>
<dependency>
<groupId>apache-cocoon</groupId>
Modified: cocoon/blocks/xsp/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/xsp/trunk/pom.xml?rev=291401&r1=291400&r2=291401&view=diff
==============================================================================
--- cocoon/blocks/xsp/trunk/pom.xml (original)
+++ cocoon/blocks/xsp/trunk/pom.xml Sun Sep 25 05:44:20 2005
@@ -66,7 +66,7 @@
<dependency>
<groupId>eclipse</groupId>
<artifactId>jdtcore</artifactId>
- <version>3.0.2</version>
+ <version>3.1.0</version>
</dependency>
<dependency>
<groupId>excalibur-datasource</groupId>
Modified: cocoon/trunk/core/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/core/pom.xml?rev=291401&r1=291400&r2=291401&view=diff
==============================================================================
--- cocoon/trunk/core/pom.xml (original)
+++ cocoon/trunk/core/pom.xml Sun Sep 25 05:44:20 2005
@@ -122,9 +122,14 @@
<version>2.0.2</version>
</dependency>
<dependency>
+ <groupId>commons-javaflow</groupId>
+ <artifactId>commons-javaflow</artifactId>
+ <version>r291286</version>
+ </dependency>
+ <dependency>
<groupId>commons-jci</groupId>
<artifactId>commons-jci</artifactId>
- <version>r159148</version>
+ <version>r291284</version>
</dependency>
<dependency>
<groupId>commons-jexl</groupId>
@@ -348,12 +353,4 @@
<scope>test</scope>
</dependency>
</dependencies>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- </plugin>
- </plugins>
- </reporting>
</project>