camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ricke...@apache.org
Subject svn commit: r1138600 - /camel/trunk/components/camel-jibx/pom.xml
Date Wed, 22 Jun 2011 19:54:41 GMT
Author: rickette
Date: Wed Jun 22 19:54:41 2011
New Revision: 1138600

URL: http://svn.apache.org/viewvc?rev=1138600&view=rev
Log:
CAMEL-4140: Switched from Jibx Ant task to native Maven plugin. Thanks to Chris Love for providing
a patch.

Modified:
    camel/trunk/components/camel-jibx/pom.xml

Modified: camel/trunk/components/camel-jibx/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jibx/pom.xml?rev=1138600&r1=1138599&r2=1138600&view=diff
==============================================================================
--- camel/trunk/components/camel-jibx/pom.xml (original)
+++ camel/trunk/components/camel-jibx/pom.xml Wed Jun 22 19:54:41 2011
@@ -67,55 +67,42 @@
             <artifactId>log4j</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.jibx</groupId>
-            <artifactId>jibx-bind</artifactId>
-            <version>${jibx-version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <!-- Use Maven Antrun plugin + JiBX Ant task to perform the binding
-             of the test classes. We will use Maven plugin when following issue
-             will be fixed - http://jira.codehaus.org/browse/JIBX-355 -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.5</version>
-                <executions>
-                    <execution>
-                        <phase>process-test-classes</phase>
+    <!-- Use JiBX plugin to perform the binding of the test classes. -->
+    <!-- A profile is used to allow for skipping of the unit tests   -->
+    <profiles>
+        <profile>
+            <id>jibx-for-unit-tests</id>
+            <activation>
+                <property>
+                    <name>!maven.test.skip</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.jibx</groupId>
+                        <artifactId>maven-jibx-plugin</artifactId>
+                        <version>1.2.3</version>
                         <configuration>
-                            <target>
-                                <taskdef name="bind" classname="org.jibx.binding.ant.CompileTask">
-                                    <classpath refid="maven.test.classpath" />
-                                </taskdef>
-                                <bind>
-                                    <classpath>
-                                        <pathelement path="target/test-classes" />
-                                    </classpath>
-                                    <bindingfileset dir="src/test/resources">
-                                        <include name="**/*-jibx.xml" />
-                                    </bindingfileset>
-                                </bind>
-                            </target>
+                            <bindingDirectory>src/test/resources</bindingDirectory>
+                            <includeSchemaBindings>
+                                <includeSchemaBinding>**/*-jibx.xml</includeSchemaBinding>
+                            </includeSchemaBindings>
                         </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.ant</groupId>
-                        <artifactId>ant</artifactId>
-                        <version>1.8.1</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-        </plugins>
-    </build>
+                        <executions>
+                            <execution>
+                                <phase>process-test-classes</phase>
+                                <goals>
+                                    <goal>test-bind</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 
 </project>



Mime
View raw message