Author: ptahchiev
Date: Thu Apr 3 10:47:30 2008
New Revision: 644420
URL: http://svn.apache.org/viewvc?rev=644420&view=rev
Log:
Small changes made for a successfull build
Modified:
jakarta/cactus/trunk/framework/framework-uberjars/javaEE-15-uberjar/pom.xml
jakarta/cactus/trunk/framework/framework-uberjars/javaEE-15-uberjar/src/assemble/main.xml
jakarta/cactus/trunk/integration/ant/pom.xml
jakarta/cactus/trunk/pom.xml
Modified:
jakarta/cactus/trunk/framework/framework-uberjars/javaEE-15-uberjar/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-uberjars/javaEE-15-uberjar/pom.xml?rev=644420&r1=644419&r2=644420&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-uberjars/javaEE-15-uberjar/pom.xml
(original)
+++ jakarta/cactus/trunk/framework/framework-uberjars/javaEE-15-uberjar/pom.xml
Thu Apr 3 10:47:30 2008
@@ -31,7 +31,7 @@
<dependencies>
<dependency>
<groupId>org.apache.cactus</groupId>
-
<artifactId>cactus.core.framework.wrapper.javaEE.15</artifactId>
+
<artifactId>cactus.core.framework.wrapper.javaEE.14</artifactId>
<version>${version}</version>
</dependency>
</dependencies>
@@ -70,23 +70,6 @@
<goals>
<goal>single</goal>
</goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
-
<artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.0-beta-2</version>
- <executions>
- <execution>
- <goals>
- <goal>process</goal>
- </goals>
- <configuration>
- <resourceBundles>
-
<resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
- </resourceBundles>
- <skip>true</skip>
- </configuration>
</execution>
</executions>
</plugin>
Modified:
jakarta/cactus/trunk/framework/framework-uberjars/javaEE-15-uberjar/src/assemble/main.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-uberjars/javaEE-15-uberjar/src/assemble/main.xml?rev=644420&r1=644419&r2=644420&view=diff
==============================================================================
---
jakarta/cactus/trunk/framework/framework-uberjars/javaEE-15-uberjar/src/assemble/main.xml
(original)
+++
jakarta/cactus/trunk/framework/framework-uberjars/javaEE-15-uberjar/src/assemble/main.xml
Thu Apr 3 10:47:30 2008
@@ -29,7 +29,7 @@
<includes>
<include>org.apache.cactus:cactus.core.framework.javaEE.12-13-14:jar</include>
<include>org.apache.cactus:cactus.core.framework.javaEE.13-14</include>
-
<include>org.apache.cactus:cactus.core.framework.wrapper.javaEE.15</include>
+
<include>org.apache.cactus:cactus.core.framework.wrapper.javaEE.14</include>
</includes>
<unpackOptions>
<excludes>
Modified: jakarta/cactus/trunk/integration/ant/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/integration/ant/pom.xml?rev=644420&r1=644419&r2=644420&view=diff
==============================================================================
--- jakarta/cactus/trunk/integration/ant/pom.xml (original)
+++ jakarta/cactus/trunk/integration/ant/pom.xml Thu Apr 3 10:47:30 2008
@@ -47,24 +47,23 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <version>3.8.2</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
+ <version>1.1</version>
</dependency>
<dependency>
<groupId>jmock</groupId>
<artifactId>jmock</artifactId>
+ <version>1.2.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ant</groupId>
<artifactId>ant-junit</artifactId>
- </dependency>
- <dependency>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-core-uberjar</artifactId>
- <version>0.9</version>
+ <version>1.6.5</version>
</dependency>
<dependency>
<groupId>org.apache.cactus</groupId>
@@ -73,13 +72,97 @@
</dependency>
<dependency>
<groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-core-uberjar</artifactId>
+ <version>0.9</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.cargo</groupId>
+
<artifactId>cargo-core-api-generic</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.cargo</groupId>
+
<artifactId>cargo-core-container-geronimo</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.cargo</groupId>
+
<artifactId>cargo-core-container-jboss</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.cargo</groupId>
+
<artifactId>cargo-core-container-jetty</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.cargo</groupId>
+
<artifactId>cargo-core-container-jo</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.cargo</groupId>
+
<artifactId>cargo-core-container-resin</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.cargo</groupId>
+
<artifactId>cargo-core-container-tomcat</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.cargo</groupId>
+
<artifactId>cargo-core-container-orion</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.cargo</groupId>
+
<artifactId>cargo-core-container-weblogic</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-ant</artifactId>
<version>0.9</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.cargo</groupId>
+
<artifactId>cargo-core-api-container</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.cargo</groupId>
+
<artifactId>cargo-core-api-generic</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.cargo</groupId>
+
<artifactId>cargo-core-container-geronimo</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.cargo</groupId>
+
<artifactId>cargo-core-container-jboss</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.cargo</groupId>
+
<artifactId>cargo-core-container-jetty</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.cargo</groupId>
+
<artifactId>cargo-core-container-jo</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.cargo</groupId>
+
<artifactId>cargo-core-container-resin</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.cargo</groupId>
+
<artifactId>cargo-core-container-tomcat</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.cargo</groupId>
+
<artifactId>cargo-core-container-orion</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.cargo</groupId>
+
<artifactId>cargo-core-container-weblogic</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
<build>
- <pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -95,6 +178,5 @@
</configuration>
</plugin>
</plugins>
- </pluginManagement>
</build>
</project>
Modified: jakarta/cactus/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/pom.xml?rev=644420&r1=644419&r2=644420&view=diff
==============================================================================
--- jakarta/cactus/trunk/pom.xml (original)
+++ jakarta/cactus/trunk/pom.xml Thu Apr 3 10:47:30 2008
@@ -503,6 +503,9 @@
<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>2.0-beta-6</version>
+ <configuration>
+
<siteDirectory>cactus-site/src/site</siteDirectory>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
