You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dk...@apache.org on 2011/08/31 17:02:06 UTC
svn commit: r1163656 - in /camel/trunk: components/camel-jpa/pom.xml
components/camel-spring/pom.xml components/camel-web/pom.xml etc/pom.xml
parent/pom.xml pom.xml
Author: dkulp
Date: Wed Aug 31 15:02:05 2011
New Revision: 1163656
URL: http://svn.apache.org/viewvc?rev=1163656&view=rev
Log:
[CAMEL-4398] Move the tools.jar dep to a dependency of the antrun
plugin, but only on the non-mac platforms. This also allows removal of
the special IBM and HP profiles as schemagen now works on those
platformas as well.
Modified:
camel/trunk/components/camel-jpa/pom.xml
camel/trunk/components/camel-spring/pom.xml
camel/trunk/components/camel-web/pom.xml
camel/trunk/etc/pom.xml
camel/trunk/parent/pom.xml
camel/trunk/pom.xml
Modified: camel/trunk/components/camel-jpa/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jpa/pom.xml?rev=1163656&r1=1163655&r2=1163656&view=diff
==============================================================================
--- camel/trunk/components/camel-jpa/pom.xml (original)
+++ camel/trunk/components/camel-jpa/pom.xml Wed Aug 31 15:02:05 2011
@@ -110,14 +110,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-persistence-jdbc</artifactId>
- <version>${openjpa-version}</version>
- </dependency>
- </dependencies>
-
<executions>
<execution>
<phase>process-test-classes</phase>
Modified: camel/trunk/components/camel-spring/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/pom.xml?rev=1163656&r1=1163655&r2=1163656&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/pom.xml (original)
+++ camel/trunk/components/camel-spring/pom.xml Wed Aug 31 15:02:05 2011
@@ -339,22 +339,6 @@
<source>1.6</source>
</configuration>
</plugin>
- </plugins>
- </build>
- </profile>
- <!-- The next three profiles are used to bypass the schemagen plugin on HP and IBM JDKs.
-
- TODO: Whenever Maven supports profile activations based on multiple properties, we
- should combine the on-ibmjdk and on-hpjdk profiles as they do exactly the same thing. -->
-
- <profile>
- <id>enable-schemagen</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
-
- <build>
- <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
@@ -372,9 +356,9 @@
<copy todir="${project.build.directory}/schema-src">
<fileset dir="${basedir}/src/main/java">
<include name="org/apache/camel/spring/Camel*.java" />
- <include name="org/apache/camel/spring/ErrorHandler*.java" />
- <include name="org/apache/camel/spring/package-info.java" />
- <include name="org/apache/camel/util/spring/**/*.java" />
+ <include name="org/apache/camel/spring/ErrorHandler*.java" />
+ <include name="org/apache/camel/spring/package-info.java" />
+ <include name="org/apache/camel/util/spring/**/*.java" />
</fileset>
<fileset dir="${basedir}/../camel-core-xml/src/main/java">
<include name="org/apache/camel/core/xml/*.java" />
@@ -401,7 +385,7 @@
</schemagen>
<copy file="${project.build.directory}/schema/camel-spring.xsd" tofile="${project.build.directory}/schema/camel-spring-v${camel.schema.version}.xsd" />
<replace file="${project.build.directory}/schema/camel-spring-v${camel.schema.version}.xsd" token="http://camel.apache.org/schema/spring" value="http://camel.apache.org/schema/spring/v${camel.schema.version}" />
-
+
</tasks>
</configuration>
<goals>
@@ -413,60 +397,6 @@
</plugins>
</build>
</profile>
-
- <profile>
- <id>on-ibmjdk</id>
- <activation>
- <property>
- <name>java.vendor</name>
- <value>IBM Corporation</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>unpack</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>on-hpjdk</id>
- <activation>
- <property>
- <name>java.vendor</name>
- <value>Hewlett-Packard Co.</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>unpack</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
<reporting>
Modified: camel/trunk/components/camel-web/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/pom.xml?rev=1163656&r1=1163655&r2=1163656&view=diff
==============================================================================
--- camel/trunk/components/camel-web/pom.xml (original)
+++ camel/trunk/components/camel-web/pom.xml Wed Aug 31 15:02:05 2011
@@ -478,6 +478,46 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <inherited>true</inherited>
+ <executions>
+ <execution>
+ <id>process-sources</id>
+ <phase>process-sources</phase>
+ <configuration>
+ <tasks>
+ <taskdef name="schemagen" classname="com.sun.tools.jxc.SchemaGenTask" classpathref="maven.plugin.classpath" />
+
+ <echo>Copying to code together for the XSD generation</echo>
+ <mkdir dir="${project.build.directory}/schema-src" />
+ <mkdir dir="${project.build.directory}/schema" />
+ <copy todir="${project.build.directory}/schema-src">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="org/apache/camel/web/model/Camel.java" />
+ <include name="org/apache/camel/web/model/EndpointLink.java" />
+ <include name="org/apache/camel/web/model/Endpoints.java" />
+ <include name="org/apache/camel/web/model/Route.java" />
+ <include name="org/apache/camel/web/model/package-info.java" />
+ </fileset>
+ </copy>
+
+ <echo>Generating XSD schema</echo>
+ <schemagen srcdir="${project.build.directory}/schema-src" destdir="${project.build.directory}/schema">
+ <schema namespace="http://camel.apache.org/schema/web" file="camel-web.xsd" />
+ <classpath refid="maven.compile.classpath" />
+ </schemagen>
+
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
<pluginManagement>
@@ -504,117 +544,6 @@
</build>
<profiles>
- <!--
- The next three profiles are used to bypass the schemagen plugin on HP
- and IBM JDKs. TODO: Whenever Maven supports profile activations based
- on multiple properties, we should combine the on-ibmjdk and on-hpjdk
- profiles as they do exactly the same thing.
- -->
- <profile>
- <id>enable-schemagen</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <inherited>true</inherited>
- <executions>
- <execution>
- <id>process-sources</id>
- <phase>process-sources</phase>
- <configuration>
- <tasks>
- <taskdef name="schemagen" classname="com.sun.tools.jxc.SchemaGenTask" classpathref="maven.plugin.classpath" />
-
- <echo>Copying to code together for the XSD generation</echo>
- <mkdir dir="${project.build.directory}/schema-src" />
- <mkdir dir="${project.build.directory}/schema" />
- <copy todir="${project.build.directory}/schema-src">
- <fileset dir="${basedir}/src/main/java">
- <include name="org/apache/camel/web/model/Camel.java" />
- <include name="org/apache/camel/web/model/EndpointLink.java" />
- <include name="org/apache/camel/web/model/Endpoints.java" />
- <include name="org/apache/camel/web/model/Route.java" />
- <include name="org/apache/camel/web/model/package-info.java" />
- </fileset>
- </copy>
-
- <echo>Generating XSD schema</echo>
- <schemagen srcdir="${project.build.directory}/schema-src" destdir="${project.build.directory}/schema">
- <schema namespace="http://camel.apache.org/schema/web" file="camel-web.xsd" />
- <classpath refid="maven.compile.classpath" />
- </schemagen>
-
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>on-ibmjdk</id>
- <activation>
- <property>
- <name>java.vendor</name>
- <value>IBM Corporation</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>unpack</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- </profile>
- <profile>
- <id>on-hpjdk</id>
- <activation>
- <property>
- <name>java.vendor</name>
- <value>Hewlett-Packard Co.</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>unpack</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
-
<profile>
<id>osgi</id>
<properties>
Modified: camel/trunk/etc/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/etc/pom.xml?rev=1163656&r1=1163655&r2=1163656&view=diff
==============================================================================
--- camel/trunk/etc/pom.xml (original)
+++ camel/trunk/etc/pom.xml Wed Aug 31 15:02:05 2011
@@ -61,18 +61,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<inherited>false</inherited>
- <dependencies>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-nodeps</artifactId>
- <version>1.6.5</version>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-trax</artifactId>
- <version>1.6.5</version>
- </dependency>
- </dependencies>
<executions>
<execution>
<id>setup.workspace</id>
Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1163656&r1=1163655&r2=1163656&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Wed Aug 31 15:02:05 2011
@@ -1497,33 +1497,6 @@
</goals>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>${jaxb-api-version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>${jaxb-version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-xjc</artifactId>
- <version>${jaxb-version}</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>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -1694,34 +1667,6 @@
</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>setup.eclipse</id>
<build>
<defaultGoal>process-test-sources</defaultGoal>
Modified: camel/trunk/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/pom.xml?rev=1163656&r1=1163655&r2=1163656&view=diff
==============================================================================
--- camel/trunk/pom.xml (original)
+++ camel/trunk/pom.xml Wed Aug 31 15:02:05 2011
@@ -283,7 +283,56 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.2</version>
+ <version>1.6</version>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-api-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-xjc</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>ant-contrib</groupId>
+ <artifactId>ant-contrib</artifactId>
+ <version>1.0b3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-trax</artifactId>
+ <version>1.8.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.8.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-persistence-jdbc</artifactId>
+ <version>${openjpa-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -732,22 +781,80 @@
</build>
</profile>
<profile>
- <id>default-tools.jar</id>
+ <!-- When not on the Mac, we need to add tools.jar to the antrun plugin for schemagen to work -->
+ <id>not-mac</id>
<activation>
- <property>
- <name>java.vendor</name>
- <value>Sun Microsystems Inc.</value>
- </property>
+ <os>
+ <family>!mac</family>
+ </os>
</activation>
- <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>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.6</version>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-api-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-xjc</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>ant-contrib</groupId>
+ <artifactId>ant-contrib</artifactId>
+ <version>1.0b3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-trax</artifactId>
+ <version>1.8.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.8.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-persistence-jdbc</artifactId>
+ <version>${openjpa-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <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>
+ </pluginManagement>
+ </build>
</profile>
<profile>
<id>rat</id>