Author: davsclaus
Date: Sat Apr 2 11:37:14 2011
New Revision: 1088002
URL: http://svn.apache.org/viewvc?rev=1088002&view=rev
Log:
CAMEL-3699: Added camel-testng component. Thanks to Michael Shorter for the
patch.
Modified:
camel/trunk/apache-camel/pom.xml
camel/trunk/apache-camel/src/main/descriptors/common-bin.xml
camel/trunk/parent/pom.xml
Modified: camel/trunk/apache-camel/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/apache-camel/pom.xml?rev=1088002&r1=1088001&r2=1088002&view=diff
==============================================================================
--- camel/trunk/apache-camel/pom.xml (original)
+++ camel/trunk/apache-camel/pom.xml Sat Apr 2 11:37:14 2011
@@ -414,6 +414,10 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-testng</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-velocity</artifactId>
</dependency>
<dependency>
Modified: camel/trunk/apache-camel/src/main/descriptors/common-bin.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/apache-camel/src/main/descriptors/common-bin.xml?rev=1088002&r1=1088001&r2=1088002&view=diff
==============================================================================
--- camel/trunk/apache-camel/src/main/descriptors/common-bin.xml (original)
+++ camel/trunk/apache-camel/src/main/descriptors/common-bin.xml Sat Apr 2
11:37:14 2011
@@ -123,6 +123,7 @@
<include>org.apache.camel:camel-stringtemplate</include>
<include>org.apache.camel:camel-syslog</include>
<include>org.apache.camel:camel-test</include>
+ <include>org.apache.camel:camel-testng</include>
<include>org.apache.camel:camel-tagsoup</include>
<include>org.apache.camel:camel-velocity</include>
<include>org.apache.camel:camel-xmlbeans</include>
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1088002&r1=1088001&r2=1088002&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Sat Apr 2 11:37:14 2011
@@ -142,7 +142,7 @@
<stax-api-version>1.0.1</stax-api-version>
<stringtemplate-version>3.0</stringtemplate-version>
<tagsoup-version>1.2</tagsoup-version>
- <testng-version>5.8</testng-version>
+ <testng-version>6.0.1</testng-version>
<velocity-version>1.7</velocity-version>
<woodstox-version>4.0.7</woodstox-version>
<xbean-spring-version>3.5</xbean-spring-version>
@@ -672,6 +672,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-testng</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-velocity</artifactId>
<version>${project.version}</version>
</dependency>
@@ -1242,7 +1247,6 @@
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>${testng-version}</version>
- <classifier>jdk15</classifier>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
