Author: antelder
Date: Sat Jul 24 06:38:17 2010
New Revision: 978811
URL: http://svn.apache.org/viewvc?rev=978811&view=rev
Log:
Merge r966568,966629 from trunk to branch to fix the tomcat war legal checks
test
Modified:
tuscany/sca-java-2.x/branches/2.0-Beta1/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/distribution/tomcat/testing/legal-checks/pom.xml
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/
------------------------------------------------------------------------------
svn:mergeinfo = /tuscany/sca-java-2.x/trunk:966568,966629
Modified:
tuscany/sca-java-2.x/branches/2.0-Beta1/distribution/tomcat/testing/legal-checks/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta1/distribution/tomcat/testing/legal-checks/pom.xml?rev=978811&r1=978810&r2=978811&view=diff
==============================================================================
---
tuscany/sca-java-2.x/branches/2.0-Beta1/distribution/tomcat/testing/legal-checks/pom.xml
(original)
+++
tuscany/sca-java-2.x/branches/2.0-Beta1/distribution/tomcat/testing/legal-checks/pom.xml
Sat Jul 24 06:38:17 2010
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>itest-distribution</artifactId>
+ <artifactId>tuscany-distribution-tomcat-testing</artifactId>
<version>2.0-Beta1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -29,6 +29,12 @@
<name>Apache Tuscany SCA WAR Distribution Legal Checks</name>
<dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
<build>
