Author: cmueller Date: Fri Sep 7 19:05:46 2012 New Revision: 1382130 URL: http://svn.apache.org/viewvc?rev=1382130&view=rev Log: CAMEL-5578: Polish our pom's to be as DRY as possible
Modified: camel/trunk/camel-core/pom.xml camel/trunk/components/camel-amqp/pom.xml camel/trunk/components/camel-apns/pom.xml camel/trunk/components/camel-bam/pom.xml camel/trunk/components/camel-bindy/pom.xml camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/CommonBindyTest.java camel/trunk/components/camel-core-xml/pom.xml camel/trunk/components/camel-couchdb/pom.xml camel/trunk/components/camel-cxf-transport/pom.xml camel/trunk/components/camel-cxf/pom.xml camel/trunk/components/camel-gae/pom.xml camel/trunk/components/camel-guice/pom.xml camel/trunk/components/camel-hawtdb/pom.xml camel/trunk/components/camel-hl7/pom.xml camel/trunk/components/camel-http4/pom.xml camel/trunk/components/camel-ibatis/pom.xml camel/trunk/components/camel-javaspace/pom.xml camel/trunk/components/camel-jaxb/pom.xml camel/trunk/components/camel-jcr/pom.xml camel/trunk/components/camel-jdbc/pom.xml camel/trunk/components/camel-jetty/pom.xml camel/trunk/components/camel-jms/pom.xml camel/trunk/components/camel-jpa/pom.xml camel/trunk/components/camel-mina/pom.xml camel/trunk/components/camel-mina2/pom.xml camel/trunk/components/camel-mqtt/pom.xml camel/trunk/components/camel-mybatis/pom.xml camel/trunk/components/camel-neo4j/pom.xml camel/trunk/components/camel-quartz/pom.xml camel/trunk/components/camel-restlet/pom.xml camel/trunk/components/camel-script/pom.xml camel/trunk/components/camel-servlet/pom.xml camel/trunk/components/camel-sjms/pom.xml camel/trunk/components/camel-soap/pom.xml camel/trunk/components/camel-spring/pom.xml camel/trunk/components/camel-sql/pom.xml camel/trunk/components/camel-stream/pom.xml camel/trunk/components/camel-tagsoup/pom.xml camel/trunk/components/camel-web/pom.xml camel/trunk/components/camel-xmpp/pom.xml camel/trunk/examples/camel-example-bam/pom.xml camel/trunk/examples/camel-example-cxf/pom.xml camel/trunk/examples/camel-example-etl/pom.xml camel/trunk/examples/camel-example-loan-broker/pom.xml camel/trunk/examples/camel-example-route-throttling/pom.xml camel/trunk/examples/pom.xml camel/trunk/parent/pom.xml camel/trunk/pom.xml camel/trunk/tests/camel-itest-karaf/pom.xml camel/trunk/tests/camel-itest-osgi/pom.xml camel/trunk/tests/camel-itest-performance/pom.xml camel/trunk/tests/camel-itest/pom.xml Modified: camel/trunk/camel-core/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/pom.xml?rev=1382130&r1=1382129&r2=1382130&view=diff ============================================================================== --- camel/trunk/camel-core/pom.xml (original) +++ camel/trunk/camel-core/pom.xml Fri Sep 7 19:05:46 2012 @@ -156,19 +156,12 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <forkMode>once</forkMode> <forkedProcessTimeoutInSeconds>3000</forkedProcessTimeoutInSeconds> - <excludes> - <!-- TODO FIXME ASAP --> - <exclude>**/XXXTest.*</exclude> - </excludes> </configuration> </plugin> - </plugins> </build> - <reporting> <plugins> <plugin> Modified: camel/trunk/components/camel-amqp/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-amqp/pom.xml?rev=1382130&r1=1382129&r2=1382130&view=diff ============================================================================== --- camel/trunk/components/camel-amqp/pom.xml (original) +++ camel/trunk/components/camel-amqp/pom.xml Fri Sep 7 19:05:46 2012 @@ -79,18 +79,4 @@ <scope>test</scope> </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds> - <childDelegation>false</childDelegation> - <useFile>true</useFile> - </configuration> - </plugin> - </plugins> - </build> - </project> Modified: camel/trunk/components/camel-apns/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-apns/pom.xml?rev=1382130&r1=1382129&r2=1382130&view=diff ============================================================================== --- camel/trunk/components/camel-apns/pom.xml (original) +++ camel/trunk/components/camel-apns/pom.xml Fri Sep 7 19:05:46 2012 @@ -137,8 +137,6 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <forkMode>once</forkMode> - <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds> <excludes> <!-- tests may fail on CI servers --> <exclude>**/*Test.*</exclude> Modified: camel/trunk/components/camel-bam/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bam/pom.xml?rev=1382130&r1=1382129&r2=1382130&view=diff ============================================================================== --- camel/trunk/components/camel-bam/pom.xml (original) +++ camel/trunk/components/camel-bam/pom.xml Fri Sep 7 19:05:46 2012 @@ -90,13 +90,6 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <forkMode>always</forkMode> - <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds> - <systemProperties> - <property> - <name>derby.stream.error.file</name> - <value>target/derby.log</value> - </property> - </systemProperties> </configuration> </plugin> </plugins> Modified: camel/trunk/components/camel-bindy/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/pom.xml?rev=1382130&r1=1382129&r2=1382130&view=diff ============================================================================== --- camel/trunk/components/camel-bindy/pom.xml (original) +++ camel/trunk/components/camel-bindy/pom.xml Fri Sep 7 19:05:46 2012 @@ -71,22 +71,4 @@ </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <childDelegation>false</childDelegation> - <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds> - <useFile>true</useFile> - <forkMode>once</forkMode> - <excludes> - <exclude>**/CommonBindyTest.*</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> - </project> Modified: camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/CommonBindyTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/CommonBindyTest.java?rev=1382130&r1=1382129&r2=1382130&view=diff ============================================================================== --- camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/CommonBindyTest.java (original) +++ camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/CommonBindyTest.java Fri Sep 7 19:05:46 2012 @@ -24,7 +24,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; -public class CommonBindyTest extends AbstractJUnit4SpringContextTests { +public abstract class CommonBindyTest extends AbstractJUnit4SpringContextTests { public static final String URI_MOCK_RESULT = "mock:result"; public static final String URI_MOCK_ERROR = "mock:error"; Modified: camel/trunk/components/camel-core-xml/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-core-xml/pom.xml?rev=1382130&r1=1382129&r2=1382130&view=diff ============================================================================== --- camel/trunk/components/camel-core-xml/pom.xml (original) +++ camel/trunk/components/camel-core-xml/pom.xml Fri Sep 7 19:05:46 2012 @@ -31,33 +31,9 @@ <description>Camel Core XML support</description> <dependencies> - <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-core</artifactId> </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <childDelegation>false</childDelegation> - <useFile>true</useFile> - <forkMode>pertest</forkMode> - <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds> - <includes> - <include>**/*Test.java</include> - </includes> - <excludes> - <!-- TODO FIXME ASAP --> - <exclude>**/XXXTest.*</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> - </project> Modified: camel/trunk/components/camel-couchdb/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-couchdb/pom.xml?rev=1382130&r1=1382129&r2=1382130&view=diff ============================================================================== --- camel/trunk/components/camel-couchdb/pom.xml (original) +++ camel/trunk/components/camel-couchdb/pom.xml Fri Sep 7 19:05:46 2012 @@ -71,20 +71,4 @@ <scope>test</scope> </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <excludes> - <exclude>**/*IntegrationTest.java</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - - </build> - </project> \ No newline at end of file Modified: camel/trunk/components/camel-cxf-transport/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf-transport/pom.xml?rev=1382130&r1=1382129&r2=1382130&view=diff ============================================================================== --- camel/trunk/components/camel-cxf-transport/pom.xml (original) +++ camel/trunk/components/camel-cxf-transport/pom.xml Fri Sep 7 19:05:46 2012 @@ -155,12 +155,6 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <forkMode>pertest</forkMode> - <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds> - <childDelegation>false</childDelegation> - <useFile>true</useFile> - <systemPropertyVariables> - <java.util.logging.config.file>${basedir}/target/test-classes/logging.properties</java.util.logging.config.file> - </systemPropertyVariables> </configuration> </plugin> <plugin> Modified: camel/trunk/components/camel-cxf/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/pom.xml?rev=1382130&r1=1382129&r2=1382130&view=diff ============================================================================== --- camel/trunk/components/camel-cxf/pom.xml (original) +++ camel/trunk/components/camel-cxf/pom.xml Fri Sep 7 19:05:46 2012 @@ -246,9 +246,6 @@ <!--parallel>classes</parallel> <perCoreThreadCount>true</perCoreThreadCount> <threadCount>2</threadCount--> - <systemPropertyVariables> - <java.util.logging.config.file>${basedir}/target/test-classes/logging.properties</java.util.logging.config.file> - </systemPropertyVariables> </configuration> </plugin> <plugin> Modified: camel/trunk/components/camel-gae/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/pom.xml?rev=1382130&r1=1382129&r2=1382130&view=diff ============================================================================== --- camel/trunk/components/camel-gae/pom.xml (original) +++ camel/trunk/components/camel-gae/pom.xml Fri Sep 7 19:05:46 2012 @@ -132,14 +132,8 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <forkMode>pertest</forkMode> - <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds> - <excludes> - <!-- TODO FIXME ASAP --> - <exclude>**/XXXTest.*</exclude> - </excludes> </configuration> </plugin> </plugins> </build> - </project> Modified: camel/trunk/components/camel-guice/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-guice/pom.xml?rev=1382130&r1=1382129&r2=1382130&view=diff ============================================================================== --- camel/trunk/components/camel-guice/pom.xml (original) +++ camel/trunk/components/camel-guice/pom.xml Fri Sep 7 19:05:46 2012 @@ -102,24 +102,4 @@ </repository> --> </repositories> - - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkMode>once</forkMode> - <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds> - <includes> - <include>**/*Test.*</include> - </includes> - <excludes> - <!-- TODO FIXME ASAP --> - <exclude>**/FilterTest.*</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> - </project> Modified: camel/trunk/components/camel-hawtdb/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hawtdb/pom.xml?rev=1382130&r1=1382129&r2=1382130&view=diff ============================================================================== --- camel/trunk/components/camel-hawtdb/pom.xml (original) +++ camel/trunk/components/camel-hawtdb/pom.xml Fri Sep 7 19:05:46 2012 @@ -77,7 +77,6 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <forkMode>pertest</forkMode> - <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds> </configuration> </plugin> </plugins> Modified: camel/trunk/components/camel-hl7/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hl7/pom.xml?rev=1382130&r1=1382129&r2=1382130&view=diff ============================================================================== --- camel/trunk/components/camel-hl7/pom.xml (original) +++ camel/trunk/components/camel-hl7/pom.xml Fri Sep 7 19:05:46 2012 @@ -108,25 +108,4 @@ <scope>test</scope> </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <childDelegation>false</childDelegation> - <useFile>true</useFile> - <forkMode>once</forkMode> - <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds> - <includes> - <include>**/*Test.*</include> - </includes> - <excludes> - <!-- <exclude>**/XXXTest.*</exclude> --> - </excludes> - </configuration> - </plugin> - </plugins> - </build> - </project> Modified: camel/trunk/components/camel-http4/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http4/pom.xml?rev=1382130&r1=1382129&r2=1382130&view=diff ============================================================================== --- camel/trunk/components/camel-http4/pom.xml (original) +++ camel/trunk/components/camel-http4/pom.xml Fri Sep 7 19:05:46 2012 @@ -87,7 +87,6 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <forkMode>pertest</forkMode> - <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds> </configuration> </plugin> </plugins> Modified: camel/trunk/components/camel-ibatis/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ibatis/pom.xml?rev=1382130&r1=1382129&r2=1382130&view=diff ============================================================================== --- camel/trunk/components/camel-ibatis/pom.xml (original) +++ camel/trunk/components/camel-ibatis/pom.xml Fri Sep 7 19:05:46 2012 @@ -75,22 +75,4 @@ </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds> - <systemProperties> - <property> - <name>derby.stream.error.file</name> - <value>target/derby.log</value> - </property> - </systemProperties> - </configuration> - </plugin> - </plugins> - </build> - </project> Modified: camel/trunk/components/camel-javaspace/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-javaspace/pom.xml?rev=1382130&r1=1382129&r2=1382130&view=diff ============================================================================== --- camel/trunk/components/camel-javaspace/pom.xml (original) +++ camel/trunk/components/camel-javaspace/pom.xml Fri Sep 7 19:05:46 2012 @@ -117,10 +117,8 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <skipTests>true</skipTests> - <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds> </configuration> </plugin> </plugins> </build> - </project> Modified: camel/trunk/components/camel-jaxb/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jaxb/pom.xml?rev=1382130&r1=1382129&r2=1382130&view=diff ============================================================================== --- camel/trunk/components/camel-jaxb/pom.xml (original) +++ camel/trunk/components/camel-jaxb/pom.xml Fri Sep 7 19:05:46 2012 @@ -91,10 +91,6 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <forkMode>pertest</forkMode> - <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds> - <excludes> - <!-- TODO FIXME ASAP --> - </excludes> </configuration> </plugin> </plugins> Modified: camel/trunk/components/camel-jcr/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jcr/pom.xml?rev=1382130&r1=1382129&r2=1382130&view=diff ============================================================================== --- camel/trunk/components/camel-jcr/pom.xml (original) +++ camel/trunk/components/camel-jcr/pom.xml Fri Sep 7 19:05:46 2012 @@ -67,22 +67,4 @@ <scope>test</scope> </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds> - <systemProperties> - <property> - <name>derby.stream.error.file</name> - <value>target/derby.log</value> - </property> - </systemProperties> - </configuration> - </plugin> - </plugins> - </build> - </project> Modified: camel/trunk/components/camel-jdbc/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jdbc/pom.xml?rev=1382130&r1=1382129&r2=1382130&view=diff ============================================================================== --- camel/trunk/components/camel-jdbc/pom.xml (original) +++ camel/trunk/components/camel-jdbc/pom.xml Fri Sep 7 19:05:46 2012 @@ -68,22 +68,4 @@ <scope>test</scope> </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds> - <systemProperties> - <property> - <name>derby.stream.error.file</name> - <value>target/derby.log</value> - </property> - </systemProperties> - </configuration> - </plugin> - </plugins> - </build> - </project> Modified: camel/trunk/components/camel-jetty/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/pom.xml?rev=1382130&r1=1382129&r2=1382130&view=diff ============================================================================== --- camel/trunk/components/camel-jetty/pom.xml (original) +++ camel/trunk/components/camel-jetty/pom.xml Fri Sep 7 19:05:46 2012 @@ -119,11 +119,6 @@ <configuration> <forkMode>pertest</forkMode> <forkedProcessTimeoutInSeconds>1800</forkedProcessTimeoutInSeconds> - <excludes> - <!-- TODO FIXME ASAP --> - <!-- need to fix this issue when we rewrite the stream cache--> - <exclude>**/*XXXTest.*</exclude> - </excludes> </configuration> </plugin> </plugins> Modified: camel/trunk/components/camel-jms/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/pom.xml?rev=1382130&r1=1382129&r2=1382130&view=diff ============================================================================== --- camel/trunk/components/camel-jms/pom.xml (original) +++ camel/trunk/components/camel-jms/pom.xml Fri Sep 7 19:05:46 2012 @@ -144,8 +144,6 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <childDelegation>false</childDelegation> - <useFile>true</useFile> <forkMode>pertest</forkMode> <forkedProcessTimeoutInSeconds>6000</forkedProcessTimeoutInSeconds> </configuration> Modified: camel/trunk/components/camel-jpa/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jpa/pom.xml?rev=1382130&r1=1382129&r2=1382130&view=diff ============================================================================== --- camel/trunk/components/camel-jpa/pom.xml (original) +++ camel/trunk/components/camel-jpa/pom.xml Fri Sep 7 19:05:46 2012 @@ -106,19 +106,6 @@ <build> <plugins> <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds> - <systemProperties> - <property> - <name>derby.stream.error.file</name> - <value>target/derby.log</value> - </property> - </systemProperties> - </configuration> - </plugin> - - <plugin> <groupId>org.apache.openjpa</groupId> <artifactId>openjpa-maven-plugin</artifactId> <version>${openjpa-version}</version> Modified: camel/trunk/components/camel-mina/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mina/pom.xml?rev=1382130&r1=1382129&r2=1382130&view=diff ============================================================================== --- camel/trunk/components/camel-mina/pom.xml (original) +++ camel/trunk/components/camel-mina/pom.xml Fri Sep 7 19:05:46 2012 @@ -85,13 +85,7 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <childDelegation>false</childDelegation> - <useFile>true</useFile> <forkMode>pertest</forkMode> - <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds> - <includes> - <include>**/*Test.java</include> - </includes> <excludes> <!-- This test just show the shutdown error --> <exclude>**/MinaProducerShutdownTest.*</exclude> Modified: camel/trunk/components/camel-mina2/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mina2/pom.xml?rev=1382130&r1=1382129&r2=1382130&view=diff ============================================================================== --- camel/trunk/components/camel-mina2/pom.xml (original) +++ camel/trunk/components/camel-mina2/pom.xml Fri Sep 7 19:05:46 2012 @@ -83,13 +83,7 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <childDelegation>false</childDelegation> - <useFile>true</useFile> <forkMode>pertest</forkMode> - <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds> - <includes> - <include>**/*Test.java</include> - </includes> <excludes> <!-- This test just show the shutdown error --> <exclude>**/Mina2ProducerShutdownTest.*</exclude> Modified: camel/trunk/components/camel-mqtt/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mqtt/pom.xml?rev=1382130&r1=1382129&r2=1382130&view=diff ============================================================================== --- camel/trunk/components/camel-mqtt/pom.xml (original) +++ camel/trunk/components/camel-mqtt/pom.xml Fri Sep 7 19:05:46 2012 @@ -73,10 +73,7 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <childDelegation>false</childDelegation> - <useFile>true</useFile> <forkMode>perTest</forkMode> - <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds> <excludes> <exclude>**/MQTTProducerTest.*</exclude> </excludes> Modified: camel/trunk/components/camel-mybatis/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mybatis/pom.xml?rev=1382130&r1=1382129&r2=1382130&view=diff ============================================================================== --- camel/trunk/components/camel-mybatis/pom.xml (original) +++ camel/trunk/components/camel-mybatis/pom.xml Fri Sep 7 19:05:46 2012 @@ -71,22 +71,4 @@ <scope>test</scope> </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds> - <systemProperties> - <property> - <name>derby.stream.error.file</name> - <value>target/derby.log</value> - </property> - </systemProperties> - </configuration> - </plugin> - </plugins> - </build> - </project> Modified: camel/trunk/components/camel-neo4j/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-neo4j/pom.xml?rev=1382130&r1=1382129&r2=1382130&view=diff ============================================================================== --- camel/trunk/components/camel-neo4j/pom.xml (original) +++ camel/trunk/components/camel-neo4j/pom.xml Fri Sep 7 19:05:46 2012 @@ -91,13 +91,7 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <childDelegation>false</childDelegation> - <useFile>true</useFile> <forkMode>pertest</forkMode> - <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds> - <includes> - <include>**/*Test.java</include> - </includes> </configuration> </plugin> </plugins> Modified: camel/trunk/components/camel-quartz/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/pom.xml?rev=1382130&r1=1382129&r2=1382130&view=diff ============================================================================== --- camel/trunk/components/camel-quartz/pom.xml (original) +++ camel/trunk/components/camel-quartz/pom.xml Fri Sep 7 19:05:46 2012 @@ -112,18 +112,6 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <forkMode>pertest</forkMode> - <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds> - <childDelegation>false</childDelegation> - <useFile>true</useFile> - <systemProperties> - <property> - <name>derby.stream.error.file</name> - <value>target/derby.log</value> - </property> - </systemProperties> - <excludes> - <exclude>**/XXXTest.*</exclude> - </excludes> </configuration> </plugin> </plugins> Modified: camel/trunk/components/camel-restlet/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/pom.xml?rev=1382130&r1=1382129&r2=1382130&view=diff ============================================================================== --- camel/trunk/components/camel-restlet/pom.xml (original) +++ camel/trunk/components/camel-restlet/pom.xml Fri Sep 7 19:05:46 2012 @@ -102,15 +102,8 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <childDelegation>false</childDelegation> - <forkMode>once</forkMode> - <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds> <reportFormat>brief</reportFormat> <useFile>false</useFile> - <runOrder>alphabetical</runOrder> - <systemPropertyVariables> - <java.util.logging.config.file>${basedir}/target/test-classes/logging.properties</java.util.logging.config.file> - </systemPropertyVariables> </configuration> </plugin> </plugins> Modified: camel/trunk/components/camel-script/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-script/pom.xml?rev=1382130&r1=1382129&r2=1382130&view=diff ============================================================================== --- camel/trunk/components/camel-script/pom.xml (original) +++ camel/trunk/components/camel-script/pom.xml Fri Sep 7 19:05:46 2012 @@ -135,12 +135,6 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <forkMode>pertest</forkMode> - <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds> - <childDelegation>false</childDelegation> - <useFile>true</useFile> - <includes> - <include>**/*Test.*</include> - </includes> </configuration> </plugin> </plugins> Modified: camel/trunk/components/camel-servlet/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-servlet/pom.xml?rev=1382130&r1=1382129&r2=1382130&view=diff ============================================================================== --- camel/trunk/components/camel-servlet/pom.xml (original) +++ camel/trunk/components/camel-servlet/pom.xml Fri Sep 7 19:05:46 2012 @@ -128,12 +128,6 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <forkMode>pertest</forkMode> - <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds> - <childDelegation>false</childDelegation> - <useFile>true</useFile> - <includes> - <include>**/*Test.*</include> - </includes> </configuration> </plugin> </plugins> Modified: camel/trunk/components/camel-sjms/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sjms/pom.xml?rev=1382130&r1=1382129&r2=1382130&view=diff ============================================================================== --- camel/trunk/components/camel-sjms/pom.xml (original) +++ camel/trunk/components/camel-sjms/pom.xml Fri Sep 7 19:05:46 2012 @@ -136,15 +136,7 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <forkMode>pertest</forkMode> - <childDelegation>false</childDelegation> - <useFile>true</useFile> <argLine>-Xmx512M</argLine> - <systemProperties> - <property> - <name>org.apache.activemq.default.directory.prefix</name> - <value>target/activemq/</value> - </property> - </systemProperties> </configuration> </plugin> <plugin> Modified: camel/trunk/components/camel-soap/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-soap/pom.xml?rev=1382130&r1=1382129&r2=1382130&view=diff ============================================================================== --- camel/trunk/components/camel-soap/pom.xml (original) +++ camel/trunk/components/camel-soap/pom.xml Fri Sep 7 19:05:46 2012 @@ -117,7 +117,6 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <forkMode>pertest</forkMode> - <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds> </configuration> </plugin> <plugin> Modified: camel/trunk/components/camel-spring/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/pom.xml?rev=1382130&r1=1382129&r2=1382130&view=diff ============================================================================== --- camel/trunk/components/camel-spring/pom.xml (original) +++ camel/trunk/components/camel-spring/pom.xml Fri Sep 7 19:05:46 2012 @@ -221,23 +221,7 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <childDelegation>false</childDelegation> - <useFile>true</useFile> - <forkMode>once</forkMode> <forkedProcessTimeoutInSeconds>1800</forkedProcessTimeoutInSeconds> - <systemProperties> - <property> - <name>derby.stream.error.file</name> - <value>target/derby.log</value> - </property> - </systemProperties> - <includes> - <include>**/*Test.java</include> - </includes> - <excludes> - <!-- TODO FIXME ASAP --> - <exclude>**/XXXTest.*</exclude> - </excludes> </configuration> </plugin> Modified: camel/trunk/components/camel-sql/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/pom.xml?rev=1382130&r1=1382129&r2=1382130&view=diff ============================================================================== --- camel/trunk/components/camel-sql/pom.xml (original) +++ camel/trunk/components/camel-sql/pom.xml Fri Sep 7 19:05:46 2012 @@ -90,13 +90,6 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <forkMode>pertest</forkMode> - <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds> - <systemProperties> - <property> - <name>derby.stream.error.file</name> - <value>target/derby.log</value> - </property> - </systemProperties> </configuration> </plugin> </plugins> Modified: camel/trunk/components/camel-stream/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-stream/pom.xml?rev=1382130&r1=1382129&r2=1382130&view=diff ============================================================================== --- camel/trunk/components/camel-stream/pom.xml (original) +++ camel/trunk/components/camel-stream/pom.xml Fri Sep 7 19:05:46 2012 @@ -69,12 +69,6 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <forkMode>pertest</forkMode> - <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds> - <excludes> - <!-- TODO FIXME ASAP --> - <!-- need to fix this issue when we rewrite the stream cache--> - <exclude>**/*XXXTest.*</exclude> - </excludes> </configuration> </plugin> </plugins> Modified: camel/trunk/components/camel-tagsoup/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-tagsoup/pom.xml?rev=1382130&r1=1382129&r2=1382130&view=diff ============================================================================== --- camel/trunk/components/camel-tagsoup/pom.xml (original) +++ camel/trunk/components/camel-tagsoup/pom.xml Fri Sep 7 19:05:46 2012 @@ -88,9 +88,6 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds> - <childDelegation>false</childDelegation> - <useFile>true</useFile> <failIfNoTests>false</failIfNoTests> <systemPropertyVariables> <javax.xml.transform.TransformerFactory>org.apache.xalan.xsltc.trax.TransformerFactoryImpl</javax.xml.transform.TransformerFactory> Modified: camel/trunk/components/camel-web/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/pom.xml?rev=1382130&r1=1382129&r2=1382130&view=diff ============================================================================== --- camel/trunk/components/camel-web/pom.xml (original) +++ camel/trunk/components/camel-web/pom.xml Fri Sep 7 19:05:46 2012 @@ -220,8 +220,6 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <forkMode>once</forkMode> - <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds> <!-- these settings are mandatory to avoid SureFire giving a bogus system property to the web container Modified: camel/trunk/components/camel-xmpp/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmpp/pom.xml?rev=1382130&r1=1382129&r2=1382130&view=diff ============================================================================== --- camel/trunk/components/camel-xmpp/pom.xml (original) +++ camel/trunk/components/camel-xmpp/pom.xml Fri Sep 7 19:05:46 2012 @@ -84,15 +84,4 @@ <scope>test</scope> </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds> - </configuration> - </plugin> - </plugins> - </build> </project> Modified: camel/trunk/examples/camel-example-bam/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-bam/pom.xml?rev=1382130&r1=1382129&r2=1382130&view=diff ============================================================================== --- camel/trunk/examples/camel-example-bam/pom.xml (original) +++ camel/trunk/examples/camel-example-bam/pom.xml Fri Sep 7 19:05:46 2012 @@ -106,13 +106,6 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <forkMode>always</forkMode> - <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds> - <systemProperties> - <property> - <name>derby.stream.error.file</name> - <value>target/derby.log</value> - </property> - </systemProperties> </configuration> </plugin> Modified: camel/trunk/examples/camel-example-cxf/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf/pom.xml?rev=1382130&r1=1382129&r2=1382130&view=diff ============================================================================== --- camel/trunk/examples/camel-example-cxf/pom.xml (original) +++ camel/trunk/examples/camel-example-cxf/pom.xml Fri Sep 7 19:05:46 2012 @@ -241,26 +241,6 @@ </executions> </plugin> - - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkMode>once</forkMode> - <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds> - <childDelegation>false</childDelegation> - <useFile>true</useFile> - <includes> - <include>**/*Test.*</include> - </includes> - <systemProperties> - <property> - <name>java.util.logging.config.file</name> - <value>${basedir}/target/test-classes/logging.properties</value> - </property> - </systemProperties> - </configuration> - </plugin> - <!-- Allows the example to be run via 'mvn compile exec:java' --> <plugin> <groupId>org.codehaus.mojo</groupId> Modified: camel/trunk/examples/camel-example-etl/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-etl/pom.xml?rev=1382130&r1=1382129&r2=1382130&view=diff ============================================================================== --- camel/trunk/examples/camel-example-etl/pom.xml (original) +++ camel/trunk/examples/camel-example-etl/pom.xml Fri Sep 7 19:05:46 2012 @@ -134,18 +134,6 @@ <includePluginDependencies>false</includePluginDependencies> </configuration> </plugin> - - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds> - <childDelegation>false</childDelegation> - <useFile>true</useFile> - <excludes> - <exclude>**/RunTest.*</exclude> - </excludes> - </configuration> - </plugin> </plugins> </build> Modified: camel/trunk/examples/camel-example-loan-broker/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-loan-broker/pom.xml?rev=1382130&r1=1382129&r2=1382130&view=diff ============================================================================== --- camel/trunk/examples/camel-example-loan-broker/pom.xml (original) +++ camel/trunk/examples/camel-example-loan-broker/pom.xml Fri Sep 7 19:05:46 2012 @@ -138,20 +138,9 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <forkMode>pertest</forkMode> - <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds> - <childDelegation>false</childDelegation> - <useFile>true</useFile> - <includes> - <include>**/*Test.*</include> - </includes> - <systemProperties> - <property> - <name>java.util.logging.config.file</name> - <value>${basedir}/target/test-classes/logging.properties</value> - </property> - </systemProperties> </configuration> </plugin> + <!-- Allows the example to be run via 'mvn compile exec:java' --> <plugin> <groupId>org.codehaus.mojo</groupId> Modified: camel/trunk/examples/camel-example-route-throttling/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-route-throttling/pom.xml?rev=1382130&r1=1382129&r2=1382130&view=diff ============================================================================== --- camel/trunk/examples/camel-example-route-throttling/pom.xml (original) +++ camel/trunk/examples/camel-example-route-throttling/pom.xml Fri Sep 7 19:05:46 2012 @@ -143,18 +143,6 @@ <commandlineArgs>${target.cmd.args}</commandlineArgs> </configuration> </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkMode>once</forkMode> - <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds> - <childDelegation>false</childDelegation> - <useFile>true</useFile> - <includes> - <include>**/*Test.*</include> - </includes> - </configuration> - </plugin> </plugins> </build> Modified: camel/trunk/examples/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/examples/pom.xml?rev=1382130&r1=1382129&r2=1382130&view=diff ============================================================================== --- camel/trunk/examples/pom.xml (original) +++ camel/trunk/examples/pom.xml Fri Sep 7 19:05:46 2012 @@ -100,10 +100,6 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <forkMode>pertest</forkMode> - <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds> - <includes> - <include>**/*Test.*</include> - </includes> <systemPropertyVariables> <skipStartingCamelContext>${skip.starting.camel.context}</skipStartingCamelContext> </systemPropertyVariables> Modified: camel/trunk/parent/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1382130&r1=1382129&r2=1382130&view=diff ============================================================================== --- camel/trunk/parent/pom.xml (original) +++ camel/trunk/parent/pom.xml Fri Sep 7 19:05:46 2012 @@ -2032,11 +2032,6 @@ </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.8</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> <version>2.1</version> <configuration> @@ -2203,6 +2198,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> + <version>2.8</version> <configuration> <!--forkMode>pertest</forkMode --> <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds> @@ -2211,11 +2207,18 @@ <failIfNoTests>false</failIfNoTests> <runOrder>alphabetical</runOrder> <systemPropertyVariables> + <derby.stream.error.file>target/derby.log</derby.stream.error.file> <java.awt.headless>${java.awt.headless}</java.awt.headless> + <java.util.logging.config.file>${basedir}/target/test-classes/logging.properties</java.util.logging.config.file> + <org.apache.activemq.default.directory.prefix>target/</org.apache.activemq.default.directory.prefix> </systemPropertyVariables> <includes> <include>**/*Test.java</include> </includes> + <excludes> + <exclude>**/*IntegrationTest.java</exclude> + <exclude>**/*XXXTest.*</exclude> + </excludes> </configuration> </plugin> <plugin> Modified: camel/trunk/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/pom.xml?rev=1382130&r1=1382129&r2=1382130&view=diff ============================================================================== --- camel/trunk/pom.xml (original) +++ camel/trunk/pom.xml Fri Sep 7 19:05:46 2012 @@ -395,9 +395,15 @@ <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds> <childDelegation>false</childDelegation> <useFile>true</useFile> + <failIfNoTests>false</failIfNoTests> + <runOrder>alphabetical</runOrder> + <systemPropertyVariables> + <derby.stream.error.file>target/derby.log</derby.stream.error.file> + <java.awt.headless>${java.awt.headless}</java.awt.headless> + </systemPropertyVariables> <includes> <include>**/*Test.*</include> - <include>**/*Integration.*</include> + <include>**/*IntegrationTest.*</include> </includes> </configuration> </plugin> Modified: camel/trunk/tests/camel-itest-karaf/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/pom.xml?rev=1382130&r1=1382129&r2=1382130&view=diff ============================================================================== --- camel/trunk/tests/camel-itest-karaf/pom.xml (original) +++ camel/trunk/tests/camel-itest-karaf/pom.xml Fri Sep 7 19:05:46 2012 @@ -141,12 +141,8 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <forkMode>pertest</forkMode> - <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds> <redirectTestOutputToFile>true</redirectTestOutputToFile> <argLine>-Xmx256m</argLine> - <includes> - <include>**/*Test.*</include> - </includes> <excludes> <!-- CXF test will hang with the Spring3, need to check Cxf feature with karaf later --> <exclude>**/*Cxf*.*</exclude> Modified: camel/trunk/tests/camel-itest-osgi/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/pom.xml?rev=1382130&r1=1382129&r2=1382130&view=diff ============================================================================== --- camel/trunk/tests/camel-itest-osgi/pom.xml (original) +++ camel/trunk/tests/camel-itest-osgi/pom.xml Fri Sep 7 19:05:46 2012 @@ -408,10 +408,6 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <forkMode>pertest</forkMode> - <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds> - <includes> - <include>**/*Test.class</include> - </includes> <excludes> <exclude>**/FIXMETest.*</exclude> <exclude>**/FtpConsumeTest.*</exclude> Modified: camel/trunk/tests/camel-itest-performance/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-performance/pom.xml?rev=1382130&r1=1382129&r2=1382130&view=diff ============================================================================== --- camel/trunk/tests/camel-itest-performance/pom.xml (original) +++ camel/trunk/tests/camel-itest-performance/pom.xml Fri Sep 7 19:05:46 2012 @@ -67,9 +67,6 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <childDelegation>false</childDelegation> - <forkMode>once</forkMode> - <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds> <includes> <include>**/NoTest.*</include> </includes> Modified: camel/trunk/tests/camel-itest/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/pom.xml?rev=1382130&r1=1382129&r2=1382130&view=diff ============================================================================== --- camel/trunk/tests/camel-itest/pom.xml (original) +++ camel/trunk/tests/camel-itest/pom.xml Fri Sep 7 19:05:46 2012 @@ -352,24 +352,9 @@ <forkedProcessTimeoutInSeconds>3000</forkedProcessTimeoutInSeconds> <excludes> <!-- TODO FIXME ASAP --> - <exclude>**/XXXTest.*</exclude> <exclude>**/FromJmsToJdbcIdempotentConsumerToJmsTest.*</exclude> <exclude>**/FromJmsToJdbcIdempotentConsumerToJmsXaTest.*</exclude> </excludes> - <systemProperties> - <property> - <name>java.util.logging.config.file</name> - <value>${basedir}/target/test-classes/logging.properties</value> - </property> - <property> - <name>org.apache.activemq.default.directory.prefix</name> - <value>target/</value> - </property> - <property> - <name>derby.stream.error.file</name> - <value>target/derby.log</value> - </property> - </systemProperties> </configuration> </plugin> <plugin>