Project: AppFuse

Revision: 3161

Author: mraible

Date: 10 Aug 2008 22:53:41

• /trunk/plugins/appfuse-maven-plugin/pom.xml

  ......	@@ -205,20 +205,20 @@
  205	205	<version>${hibernate3.plugin.version}</version>
  206	206	</dependency>
  207	207	<dependency>
  208		<groupId>log4j</groupId>
  209		<artifactId>log4j</artifactId>
  210		<version>1.2.13</version>
  211		</dependency>
  	208	<groupId>log4j</groupId>
  	209	<artifactId>log4j</artifactId>
  	210	<version>1.2.13</version>
  	211	</dependency>
  212	212	<!-- This is to support the ant calls within the mojos -->
  213	213	<dependency>
  214	214	<groupId>org.apache.ant</groupId>
  215	215	<artifactId>ant</artifactId>
  216		<version>1.7.0</version>
  	216	<version>1.7.1</version>
  217	217	</dependency>
  218	218	<dependency>
  219	219	<groupId>org.apache.ant</groupId>
  220	220	<artifactId>ant-nodeps</artifactId>
  221		<version>1.7.0</version>
  	221	<version>1.7.1</version>
  222	222	</dependency>
  223	223	<dependency>
  224	224	<groupId>hsqldb</groupId>

• /trunk/plugins/appfuse-maven-plugin/build.xml

  ......	@@ -259,7 +259,7 @@
  259	259	<arg line="@{command}"/>
  260	260	</exec>
  261	261	<exec dir="@{dir}" executable="mvn" os="Mac OS X" failonerror="true" errorproperty="command.failed">
  262		<arg line="@{command}"/>
  	262	<arg line="@{command} -e"/>
  263	263	</exec>
  264	264	<exec dir="@{dir}" executable="mvn" os="Linux" failonerror="true" errorproperty="command.failed">
  265	265	<arg line="@{command}"/>

• /trunk/plugins/appfuse-maven-plugin/src/main/java/org/appfuse/mojo/installer/InstallSourceMojo.java

  ......	@@ -349,11 +349,6 @@
  349	349	continue;
  350	350	}
  351	351
  352		// hack for Tapestry depending on commons-pool (a.k.a. commons-dbcp 1.2.2)
  353		if ("tapestry".equals(project.getProperties().getProperty("web.framework")) && key.equals("commons.dbcp.version")) {
  354		value = "1.2.2";
  355		}
  356
  357	352	if (value.contains("&")) {
  358	353	value = "<![CDATA[" + value + "]]>";
  359	354	}
  ......	@@ -488,7 +483,7 @@
  488	483	if (value.contains("&amp;")) {
  489	484	value = "<![CDATA[" + value + "]]>";
  490	485	}
  491
  	486
  492	487	calculatedProperties.append(" <");
  493	488	calculatedProperties.append(key);
  494	489	calculatedProperties.append(">");
  ......	@@ -680,7 +675,7 @@
  680	675	&& "jsf".equals(project.getProperties().getProperty("web.framework"))) {
  681	676	// skip adding dependency for old group id of jsp-api
  682	677	continue;
  683		}
  	678	}
  684	679
  685	680	if (!artifactIds.contains(dep.getArtifactId()) &&
  686	681	!dep.getArtifactId().contains("appfuse")) {