Author: ptahchiev Date: Fri Jan 11 05:05:46 2008 New Revision: 611161 URL: http://svn.apache.org/viewvc?rev=611161&view=rev Log: changes made on the Maven plugin so that it could be built correctly.
Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-maven/pom.xml jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-maven/project.xml Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-maven/pom.xml URL: http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-maven/pom.xml?rev=611161&r1=611160&r2=611161&view=diff ============================================================================== --- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-maven/pom.xml (original) +++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-maven/pom.xml Fri Jan 11 05:05:46 2008 @@ -24,76 +24,10 @@ <artifactId>integration</artifactId> <version>1.8.0-SNAPSHOT</version> </parent> - <artifactId>integration-maven1</artifactId> + <artifactId>cactus-maven1-plugin</artifactId> <name>Cactus Maven 1 Plugin</name> - <packaging>jar</packaging> + <packaging>maven-one-plugin</packaging> <dependencies> - <dependency> - <groupId>org.apache.cactus</groupId> - <artifactId>wrapper-javaEE-14</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.apache.cactus</groupId> - <artifactId>integration-ant</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>2.0.2</version> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.0.4</version> - </dependency> - <dependency> - <groupId>aspectj</groupId> - <artifactId>aspectjrt</artifactId> - <version>1.2.1</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>compile</scope> - </dependency> - <!-- Cactus now depends on Cargo --> - <dependency> - <groupId>cargo</groupId> - <artifactId>cargo</artifactId> - <version>0.6</version> - </dependency> - - <!-- Note: Dependencies below are needed by HttpUnit. Xerces is also - needed by the XML report used by the junitreport Ant task --> - <dependency> - <groupId>httpunit</groupId> - <artifactId>httpunit</artifactId> - <version>1.6</version> - </dependency> - <dependency> - <groupId>nekohtml</groupId> - <artifactId>nekohtml</artifactId> - <version>0.9.1</version> - </dependency> - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.6.2</version> - </dependency> - <dependency> - <groupId>xerces</groupId> - <artifactId>xmlParserAPIs</artifactId> - <version>2.2.1</version> - </dependency> - <dependency> - <groupId>rhino</groupId> - <artifactId>js</artifactId> - <version>1.5R4.1</version> - </dependency> - <!-- Note: Dependencies below are needed by the Cactus scanner tag --> <dependency> <groupId>ant</groupId> Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-maven/project.xml URL: http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-maven/project.xml?rev=611161&r1=611160&r2=611161&view=diff ============================================================================== --- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-maven/project.xml (original) +++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-maven/project.xml Fri Jan 11 05:05:46 2008 @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <project> - <extend>${basedir}/../../default-project.xml</extend> <id>cactus-maven</id> <!-- Note: Although we inherit from default-project.xml, we still cannot @@ -30,12 +29,12 @@ <dependency> <groupId>cactus</groupId> <artifactId>cactus</artifactId> - <version>13-${pom.currentVersion}</version> + <version>13-1.7.2</version> </dependency> <dependency> <groupId>cactus</groupId> <artifactId>cactus-ant</artifactId> - <version>13-${pom.currentVersion}</version> + <version>13-1.7.2</version> </dependency> <dependency> <groupId>commons-httpclient</groupId> @@ -59,9 +58,9 @@ </dependency> <!-- Cactus now depends on Cargo --> <dependency> - <groupId>cargo</groupId> + <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-core-uberjar</artifactId> - <version>0.8</version> + <version>0.9</version> <url>###GO TO ../.. (or ..\..) and run 'ant -f downloads.xml'###</url> </dependency> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]