Repository: camel Updated Branches: refs/heads/master 4b45630f6 -> aad1837a7
CAMEL-8111: Upgrade to Pax Exam 4.3 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/aad1837a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/aad1837a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/aad1837a Branch: refs/heads/master Commit: aad1837a719bfa1b61ffc3af3283dc5d08589efe Parents: 4b45630 Author: Babak Vahdat <bvah...@apache.org> Authored: Wed Dec 3 01:25:10 2014 +0100 Committer: Babak Vahdat <bvah...@apache.org> Committed: Wed Dec 3 01:25:10 2014 +0100 ---------------------------------------------------------------------- parent/pom.xml | 11 +- tests/camel-itest-karaf/pom.xml | 5 + tests/camel-itest-osgi/pom.xml | 648 ++++++++++++++++++----------------- 3 files changed, 335 insertions(+), 329 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/aad1837a/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 8d68457..d4c7dae 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -141,8 +141,7 @@ <ezmorph-bundle-version>1.0.6_1</ezmorph-bundle-version> <facebook4j-core-version>1.1.12</facebook4j-core-version> <fastinfoset-version>1.2.13_1</fastinfoset-version> - <felix-configadmin-version>1.4.0</felix-configadmin-version> - <felix-fileinstall-version>3.2.6</felix-fileinstall-version> + <felix-configadmin-version>1.8.0</felix-configadmin-version> <!-- need to keep using the older 3.2.8 that do not cause NPE issues when using pojosr - see pojosr bug #13 --> <felix-fileinstall-pojosr-version>3.2.8</felix-fileinstall-pojosr-version> <felix-framework-version>3.2.2</felix-framework-version> @@ -356,11 +355,9 @@ <oscache-bundle-version>2.4_5</oscache-bundle-version> <osgi-version>4.3.1</osgi-version> <paranamer-bundle-version>2.4_1</paranamer-bundle-version> - <pax-exam-version>3.4.0</pax-exam-version> - <paxexam-karaf-container-version>3.4.0</paxexam-karaf-container-version> - <pax-runner-version>1.7.6</pax-runner-version> + <pax-exam-version>4.3.0</pax-exam-version> <pax-tiny-bundle-version>1.3.1</pax-tiny-bundle-version> - <pax-logging-version>1.7.1</pax-logging-version> + <pax-logging-version>1.8.1</pax-logging-version> <pdfbox-version>1.6.0</pdfbox-version> <plexus-container-default-version>1.0-alpha-48</plexus-container-default-version> <plexus-utils-version>1.5.6</plexus-utils-version> @@ -2307,7 +2304,7 @@ <artifactId>commons-httpclient</artifactId> <version>${httpclient-version}</version> </dependency> - <dependency> + <dependency> <groupId>xalan</groupId> <artifactId>xalan</artifactId> <version>${xalan-version}</version> http://git-wip-us.apache.org/repos/asf/camel/blob/aad1837a/tests/camel-itest-karaf/pom.xml ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/pom.xml b/tests/camel-itest-karaf/pom.xml index d7921f1..a43d29c 100644 --- a/tests/camel-itest-karaf/pom.xml +++ b/tests/camel-itest-karaf/pom.xml @@ -83,6 +83,11 @@ </dependency> <dependency> <groupId>org.apache.servicemix.bundles</groupId> + <artifactId>org.apache.servicemix.bundles.javax-inject</artifactId> + <version>${javax-inject-bundle-version}</version> + </dependency> + <dependency> + <groupId>org.apache.servicemix.bundles</groupId> <artifactId>org.apache.servicemix.bundles.junit</artifactId> <version>${junit-bundle-version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/aad1837a/tests/camel-itest-osgi/pom.xml ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/pom.xml b/tests/camel-itest-osgi/pom.xml index 8a00c0c..66fa057 100644 --- a/tests/camel-itest-osgi/pom.xml +++ b/tests/camel-itest-osgi/pom.xml @@ -29,124 +29,87 @@ <name>Camel :: Integration Tests :: OSGi</name> <description>Performs OSGi compliance integration tests</description> + <!-- let's list the dependencies in a sorted order --> <dependencies> + + <!-- activemq --> <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.compendium</artifactId> - <scope>compile</scope> - <optional>true</optional> - </dependency> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-all</artifactId> + <version>${activemq-version}</version> <scope>test</scope> </dependency> + + <!-- blueprint --> <dependency> - <groupId>org.ops4j.pax.exam</groupId> - <artifactId>pax-exam-junit4</artifactId> + <groupId>org.apache.aries.blueprint</groupId> + <artifactId>org.apache.aries.blueprint</artifactId> <scope>test</scope> </dependency> + + <!-- camel --> <dependency> - <groupId>org.ops4j.pax.exam</groupId> - <artifactId>pax-exam-invoker-junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.ops4j.pax.exam</groupId> - <artifactId>pax-exam</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.ops4j.pax.exam</groupId> - <artifactId>pax-exam-container-karaf</artifactId> - <scope>test</scope> + <groupId>org.apache.camel</groupId> + <artifactId>camel-aws</artifactId> + <scope>test</scope> </dependency> <dependency> - <groupId>org.ops4j.pax.exam</groupId> - <artifactId>pax-exam-link-mvn</artifactId> - <scope>test</scope> + <groupId>org.apache.camel</groupId> + <artifactId>camel-base64</artifactId> + <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.karaf</groupId> - <artifactId>apache-karaf</artifactId> - <version>${karaf-version}</version> - <type>tar.gz</type> + <groupId>org.apache.camel</groupId> + <artifactId>camel-beanio</artifactId> <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.apache.karaf.shell</groupId> - <artifactId>org.apache.karaf.shell.dev</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse</groupId> - <artifactId>osgi</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.karaf</groupId> - <artifactId>org.apache.karaf.client</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.framework</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-broker</artifactId> + <groupId>org.apache.camel</groupId> + <artifactId>camel-bean-validator</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-spring</artifactId> + <groupId>org.apache.camel</groupId> + <artifactId>camel-bindy</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-kahadb-store</artifactId> + <groupId>org.apache.camel</groupId> + <artifactId>camel-blueprint</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-client</artifactId> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-cache</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-pool</artifactId> - <scope>test</scope> - </dependency> <dependency> - <groupId>org.apache.camel.karaf</groupId> - <artifactId>apache-camel</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>test</scope> + <groupId>org.apache.camel</groupId> + <artifactId>camel-cxf</artifactId> </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-beanio</artifactId> + <artifactId>camel-disruptor</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-bindy</artifactId> + <artifactId>camel-hawtdb</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-blueprint</artifactId> + <artifactId>camel-hazelcast</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-cache</artifactId> + <artifactId>camel-hdfs2</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-servlet</artifactId> + <artifactId>camel-hl7</artifactId> <scope>test</scope> </dependency> <dependency> @@ -176,68 +139,62 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-protobuf</artifactId> + <artifactId>camel-krati</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-hawtdb</artifactId> + <artifactId>camel-leveldb</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-mvel</artifactId> + <artifactId>camel-mail</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-netty</artifactId> + <artifactId>camel-mvel</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-hazelcast</artifactId> + <artifactId>camel-mybatis</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-hdfs2</artifactId> + <artifactId>camel-netty</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-hl7</artifactId> + <artifactId>camel-protobuf</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-krati</artifactId> + <artifactId>camel-quartz2</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-leveldb</artifactId> + <artifactId>camel-rss</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-zookeeper</artifactId> + <artifactId>camel-ruby</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-mybatis</artifactId> + <artifactId>camel-script</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-quartz2</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>ca.uhn.hapi</groupId> - <artifactId>hapi-structures-v24</artifactId> - <version>${hapi-version}</version> + <artifactId>camel-servlet</artifactId> <scope>test</scope> </dependency> <dependency> @@ -257,7 +214,7 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-rss</artifactId> + <artifactId>camel-test</artifactId> <scope>test</scope> </dependency> <dependency> @@ -266,16 +223,135 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-zookeeper</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.camel.karaf</groupId> + <artifactId>apache-camel</artifactId> + <version>${project.version}</version> + <type>pom</type> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.camel.tests</groupId> <artifactId>org.apache.camel.tests.mock-javamail_1.7</artifactId> <scope>test</scope> </dependency> + + <!-- cxf --> <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-base64</artifactId> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-rs-extension-providers</artifactId> + <version>${cxf-version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-transports-http-jetty</artifactId> + <version>${cxf-version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-ws-security</artifactId> + <version>${cxf-version}</version> + <scope>test</scope> + </dependency> + + <!-- felix --> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.configadmin</artifactId> + <exclusions> + <exclusion> + <groupId>org.apache.felix</groupId> + <artifactId>javax.servlet</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.felix</groupId> + <artifactId>org.osgi.foundation</artifactId> + </exclusion> + </exclusions> + <scope>test</scope> + </dependency> + + <!-- karaf --> + <dependency> + <groupId>org.apache.karaf</groupId> + <artifactId>apache-karaf</artifactId> + <version>${karaf-version}</version> + <type>tar.gz</type> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.framework</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.karaf</groupId> + <artifactId>org.apache.karaf.client</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.karaf.shell</groupId> + <artifactId>org.apache.karaf.shell.dev</artifactId> + </exclusion> + + <!-- required for karaf 2.x --> + <exclusion> + <groupId>org.eclipse</groupId> + <artifactId>osgi</artifactId> + </exclusion> + + <!-- required for karaf 3.x --> + <exclusion> + <groupId>org.eclipse</groupId> + <artifactId>org.eclipse.osgi</artifactId> + </exclusion> + </exclusions> + </dependency> + + <!-- osgi --> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.compendium</artifactId> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + <scope>test</scope> + </dependency> + + <!-- pax-exam --> + <dependency> + <groupId>org.ops4j.pax.exam</groupId> + <artifactId>pax-exam</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.ops4j.pax.exam</groupId> + <artifactId>pax-exam-container-karaf</artifactId> <scope>test</scope> </dependency> <dependency> + <groupId>org.ops4j.pax.exam</groupId> + <artifactId>pax-exam-invoker-junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.ops4j.pax.exam</groupId> + <artifactId>pax-exam-junit4</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.ops4j.pax.exam</groupId> + <artifactId>pax-exam-link-mvn</artifactId> + <scope>test</scope> + </dependency> + + <!-- spring --> + <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context-support</artifactId> <scope>test</scope> @@ -284,22 +360,22 @@ <groupId>org.springframework.osgi</groupId> <artifactId>spring-osgi-core</artifactId> <exclusions> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>org.springframework.aop</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>org.springframework.core</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>org.springframework.beans</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>org.springframework.context</artifactId> - </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>org.springframework.aop</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>org.springframework.beans</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>org.springframework.context</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>org.springframework.core</artifactId> + </exclusion> </exclusions> <scope>test</scope> </dependency> @@ -308,14 +384,38 @@ <artifactId>spring-osgi-mock</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-mail</artifactId> + + <!-- logging --> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </dependency> + + <!-- others --> + <dependency> + <groupId>ca.uhn.hapi</groupId> + <artifactId>hapi-structures-v24</artifactId> + <version>${hapi-version}</version> <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-test</artifactId> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.derby</groupId> + <artifactId>derby</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.ftpserver</groupId> + <artifactId>ftplet-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.ftpserver</groupId> + <artifactId>ftpserver-core</artifactId> <scope>test</scope> </dependency> <dependency> @@ -330,110 +430,16 @@ <scope>test</scope> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>test</scope> + <groupId>org.apache.servicemix.bundles</groupId> + <artifactId>org.apache.servicemix.bundles.junit</artifactId> + <version>${junit-bundle-version}</version> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.codehaus.jettison</groupId> + <artifactId>jettison</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.servicemix.bundles</groupId> - <artifactId>org.apache.servicemix.bundles.junit</artifactId> - <version>${junit-bundle-version}</version> - </dependency> - <dependency> - <groupId>org.apache.aries.blueprint</groupId> - <artifactId>org.apache.aries.blueprint</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.configadmin</artifactId> - <exclusions> - <exclusion> - <groupId>org.apache.felix</groupId> - <artifactId>javax.servlet</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.felix</groupId> - <artifactId>org.osgi.foundation</artifactId> - </exclusion> - </exclusions> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-bean-validator</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-script</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-ruby</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-cxf</artifactId> - </dependency> - - <!-- cxf --> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-rs-extension-providers</artifactId> - <version>${cxf-version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-transports-http-jetty</artifactId> - <version>${cxf-version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-ws-security</artifactId> - <version>${cxf-version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.codehaus.jettison</groupId> - <artifactId>jettison</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.ftpserver</groupId> - <artifactId>ftpserver-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.ftpserver</groupId> - <artifactId>ftplet-api</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-aws</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-disruptor</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>derby</artifactId> - <scope>test</scope> - </dependency> </dependencies> <build> @@ -495,123 +501,121 @@ </plugin> <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkCount>1</forkCount> - <reuseForks>false</reuseForks> - <excludes> - <exclude>**/FIXMETest.*</exclude> - <exclude>**/FtpConsumeTest.*</exclude> - <exclude>**/BlobStoreRouteTest.*</exclude> <!-- CAMEL-6134 --> - <exclude>**/BlobStoreBlueprintRouteTest.*</exclude> <!-- CAMEL-6134 --> - </excludes> - <systemPropertyVariables> - <karafVersion>${karaf-version}</karafVersion> - </systemPropertyVariables> - </configuration> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <forkCount>1</forkCount> + <reuseForks>false</reuseForks> + <excludes> + <exclude>**/FIXMETest.*</exclude> + <exclude>**/FtpConsumeTest.*</exclude> + <exclude>**/BlobStoreRouteTest.*</exclude> <!-- CAMEL-6134 --> + <exclude>**/BlobStoreBlueprintRouteTest.*</exclude> <!-- CAMEL-6134 --> + </excludes> + <systemPropertyVariables> + <karafVersion>${karaf-version}</karafVersion> + </systemPropertyVariables> + </configuration> </plugin> - <!-- CXF wsdl2java generator, will plugin to the compile goal --> - <plugin> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-codegen-plugin</artifactId> - <executions> - <execution> - <id>generate-sources</id> - <phase>generate-sources</phase> - <configuration> - <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot> - <wsdlOptions> - <wsdlOption> - <frontEnd>jaxws21</frontEnd> - <wsdl>${basedir}/src/test/resources/report_incident.wsdl</wsdl> - </wsdlOption> - </wsdlOptions> - </configuration> - <goals> - <goal>wsdl2java</goal> - </goals> - </execution> - </executions> - </plugin> + <!-- CXF wsdl2java generator, will plugin to the compile goal --> + <plugin> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-codegen-plugin</artifactId> + <executions> + <execution> + <id>generate-sources</id> + <phase>generate-sources</phase> + <configuration> + <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot> + <wsdlOptions> + <wsdlOption> + <frontEnd>jaxws21</frontEnd> + <wsdl>${basedir}/src/test/resources/report_incident.wsdl</wsdl> + </wsdlOption> + </wsdlOptions> + </configuration> + <goals> + <goal>wsdl2java</goal> + </goals> + </execution> + </executions> + </plugin> - <plugin> - <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa-maven-plugin</artifactId> - <version>${openjpa-version}</version> - <configuration> - <persistenceXmlFile>${project.basedir}/src/test/resources/META-INF/persistence.xml</persistenceXmlFile> - <includes>org/apache/camel/itest/osgi/jpa/SendEmail.class</includes> - <addDefaultConstructor>true</addDefaultConstructor> - <enforcePropertyRestrictions>true</enforcePropertyRestrictions> - </configuration> - <executions> - <execution> - <id>test enhancer</id> - <phase>process-test-classes</phase> - <goals> - <goal>test-enhance</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa</artifactId> - <version>${openjpa-version}</version> - </dependency> - </dependencies> - </plugin> + <plugin> + <groupId>org.apache.openjpa</groupId> + <artifactId>openjpa-maven-plugin</artifactId> + <version>${openjpa-version}</version> + <configuration> + <persistenceXmlFile>${project.basedir}/src/test/resources/META-INF/persistence.xml</persistenceXmlFile> + <includes>org/apache/camel/itest/osgi/jpa/SendEmail.class</includes> + <addDefaultConstructor>true</addDefaultConstructor> + <enforcePropertyRestrictions>true</enforcePropertyRestrictions> + </configuration> + <executions> + <execution> + <id>test enhancer</id> + <phase>process-test-classes</phase> + <goals> + <goal>test-enhance</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>org.apache.openjpa</groupId> + <artifactId>openjpa</artifactId> + <version>${openjpa-version}</version> + </dependency> + </dependencies> + </plugin> </plugins> </build> <profiles> - <profile> - <id>ci-build-profile</id> - <activation> - <property> - <name>maven.repo.local</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds> - <!-- - when the local repo location has been specified, we need to pass - on this information to PAX mvn url - --> - <argLine>-Dorg.ops4j.pax.url.mvn.localRepository=${maven.repo.local}</argLine> - <includes> - <include>**/*Test.*</include> - </includes> - <excludes> - <!--There are some conflicts of the JAXB OSGi bundle and Hudson System jar - so I comment out these JAXB related tests --> - <exclude>**/OSGiIntegrationSpringTest.*</exclude> - <exclude>**/JaxbFallbackConverterTest.*</exclude> - <exclude>**/FtpConsumeTest.*</exclude> - <exclude>**/CxfRsBlueprintRouterTest.*</exclude> - <exclude>**/BlobStoreRouteTest.*</exclude> <!-- CAMEL-6134 --> - <exclude>**/BlobStoreBlueprintRouteTest.*</exclude> <!-- CAMEL-6134 --> - </excludes> - <systemPropertyVariables> - <karafVersion>${karaf-version}</karafVersion> - </systemPropertyVariables> - </configuration> - </plugin> - </plugins> - </build> + <profile> + <id>ci-build-profile</id> + <activation> + <property> + <name>maven.repo.local</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds> + <!-- when the local repo location has been specified, we need to pass + on this information to PAX mvn url --> + <argLine>-Dorg.ops4j.pax.url.mvn.localRepository=${maven.repo.local}</argLine> + <includes> + <include>**/*Test.*</include> + </includes> + <excludes> + <!--There are some conflicts of the JAXB OSGi bundle and Hudson System + jar so I comment out these JAXB related tests --> + <exclude>**/OSGiIntegrationSpringTest.*</exclude> + <exclude>**/JaxbFallbackConverterTest.*</exclude> + <exclude>**/FtpConsumeTest.*</exclude> + <exclude>**/CxfRsBlueprintRouterTest.*</exclude> + <exclude>**/BlobStoreRouteTest.*</exclude> <!-- CAMEL-6134 --> + <exclude>**/BlobStoreBlueprintRouteTest.*</exclude> <!-- CAMEL-6134 --> + </excludes> + <systemPropertyVariables> + <karafVersion>${karaf-version}</karafVersion> + </systemPropertyVariables> + </configuration> + </plugin> + </plugins> + </build> </profile> <profile> - <id>karaf3</id> - <properties> - <karaf-version>${karaf3-version}</karaf-version> - </properties> + <id>karaf3</id> + <properties> + <karaf-version>${karaf3-version}</karaf-version> + </properties> </profile> -</profiles> + </profiles> </project>
