Author: ptahchiev
Date: Sun Feb 24 08:12:16 2008
New Revision: 630631
URL: http://svn.apache.org/viewvc?rev=630631&view=rev
Log:
changed the names of the files that are copied in org.apache.cactus
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/maven/maven.xml
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/maven/project.properties
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/maven/project.xml
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/maven/maven.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/maven/maven.xml?rev=630631&r1=630630&r2=630631&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/maven/maven.xml
(original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/maven/maven.xml
Sun Feb 24 08:12:16 2008
@@ -32,8 +32,9 @@
<j:set var="jarsDir" value="${maven.repo.local}/${pom.groupId}/jars"/>
<ant:echo>Copying Cactus jars to ${jarsDir}</ant:echo>
<ant:mkdir dir="${jarsDir}"/>
- <ant:copy tofile="${jarsDir}/cactus-13-${pom.currentVersion}.jar"
file="${maven.jar.cactus}"/>
- <ant:copy tofile="${jarsDir}/cactus-ant-13-${pom.currentVersion}.jar"
file="${maven.jar.cactus.ant}"/>
+ <ant:copy todir="${jarsDir}" file="${maven.jar.cactus}"/>
+ <ant:copy todir="${jarsDir}" file="${maven.jar.cactus.ant}"/>
+ <ant:copy todir="${jarsDir}" file="${maven.jar.cactus.share}"/>
</j:if>
</goal>
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/maven/project.properties
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/maven/project.properties?rev=630631&r1=630630&r2=630631&view=diff
==============================================================================
---
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/maven/project.properties
(original)
+++
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/maven/project.properties
Sun Feb 24 08:12:16 2008
@@ -70,6 +70,7 @@
# ( see http://jira.codehaus.org/browse/MAVEN-581 )
maven.jar.cactus-ant=../ant/target/cactus.integration.ant-${pom.currentVersion}.jar
maven.jar.cactus.ant=../ant/target/cactus.integration.ant-${pom.currentVersion}.jar
+maven.jar.cactus.share=../shared-api/target/cactus.integration.shared.api-${pom.currentVersion}.jar
#For proxy
#maven.proxy.host=wwwproxy.swin.edu.au
#maven.proxy.port=8000
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/maven/project.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/maven/project.xml?rev=630631&r1=630630&r2=630631&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/maven/project.xml
(original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/maven/project.xml
Sun Feb 24 08:12:16 2008
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project>
- <id>cactus-maven</id>
+ <id>org.apache.cactus</id>
<!-- Note: Although we inherit from default-project.xml, we still cannot
remove the <currentVersion> tag as this project.xml is parsed at
@@ -29,28 +29,18 @@
<dependency>
<groupId>org.apache.cactus</groupId>
<artifactId>cactus.integration.ant</artifactId>
- <version>1.8.0</version>
+ <version>${pom.currentVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.cactus</groupId>
<artifactId>cactus.core.framework.uberjar.javaEE.14</artifactId>
- <version>1.8.0</version>
+ <version>${pom.currentVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.cactus</groupId>
<artifactId>cactus.integration.shared.api</artifactId>
- <version>1.8.0</version>
+ <version>${pom.currentVersion}</version>
</dependency>
- <!--dependency>
- <groupId>cactus</groupId>
- <artifactId>cactus</artifactId>
- <version>13-1.7.2</version>
- </dependency>
- <dependency>
- <groupId>cactus</groupId>
- <artifactId>cactus-ant</artifactId>
- <version>13-1.7.2</version>
- </dependency-->
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
@@ -141,7 +131,11 @@
<artifactId>commons-jelly-tags-xml</artifactId>
<version>20030211.142705</version>
</dependency>
-
+ <dependency>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ <version>0.9.93</version>
+ </dependency>
</dependencies>
<build>
<sourceDirectory>src/main</sourceDirectory>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
