Author: ningjiang
Date: Tue Dec  1 09:49:37 2009
New Revision: 885704

URL: http://svn.apache.org/viewvc?rev=885704&view=rev
Log:
CAMEL-2243 fix the -Psetup.eclipse issue

Modified:
    camel/trunk/parent/pom.xml
    camel/trunk/pom.xml

Modified: camel/trunk/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=885704&r1=885703&r2=885704&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Tue Dec  1 09:49:37 2009
@@ -1263,34 +1263,6 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>on-sunjdk</id>
-      <activation>
-        <property>
-          <name>java.vendor</name>
-          <value>Sun Microsystems Inc.</value>
-        </property>
-      </activation>
-
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <inherited>true</inherited>
-            <dependencies>
-              <dependency>
-                <groupId>com.sun</groupId>
-                <artifactId>tools</artifactId>
-                <version>1.5.0</version>
-                <scope>system</scope>
-                <systemPath>${java.home}/../lib/tools.jar</systemPath>
-              </dependency>
-            </dependencies>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
 
   </profiles>
 

Modified: camel/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/pom.xml?rev=885704&r1=885703&r2=885704&view=diff
==============================================================================
--- camel/trunk/pom.xml (original)
+++ camel/trunk/pom.xml Tue Dec  1 09:49:37 2009
@@ -511,6 +511,36 @@
                 <artifactId>camel-buildtools</artifactId>
                 <version>${project.version}</version>
               </dependency>
+              <dependency>
+                <groupId>ant-contrib</groupId>
+                <artifactId>ant-contrib</artifactId>
+                <version>1.0b3</version>
+              </dependency>
+              <dependency>
+                <groupId>javax.xml.bind</groupId>
+                <artifactId>jaxb-api</artifactId>
+                <version>2.1</version>
+              </dependency>
+              <dependency>
+                <groupId>com.sun.xml.bind</groupId>
+                <artifactId>jaxb-impl</artifactId>
+                <version>2.1.5-dev</version>
+              </dependency>
+              <dependency>
+                <groupId>com.sun.xml.bind</groupId>
+                <artifactId>jaxb-xjc</artifactId>
+                <version>2.1.5-dev</version>
+              </dependency>
+              <dependency>
+                <groupId>ant-contrib</groupId>
+                <artifactId>ant-contrib</artifactId>
+                <version>1.0b3</version>
+              </dependency>
+              <dependency>
+                <groupId>ant</groupId>
+                <artifactId>ant-optional</artifactId>
+                <version>1.5.3-1</version>
+              </dependency>
             </dependencies>
             <executions>
               <execution>
@@ -593,6 +623,35 @@
         </plugins>
       </build>
     </profile>
+
+    <profile>
+      <id>on-sunjdk</id>
+      <activation>
+        <property>
+          <name>java.vendor</name>
+          <value>Sun Microsystems Inc.</value>
+        </property>
+      </activation>
+
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <inherited>true</inherited>
+            <dependencies>
+              <dependency>
+                <groupId>com.sun</groupId>
+                <artifactId>tools</artifactId>
+                <version>1.5.0</version>
+                <scope>system</scope>
+                <systemPath>${java.home}/../lib/tools.jar</systemPath>
+              </dependency>
+            </dependencies>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
     
     <profile>
       <id>rat</id>


Reply via email to