Author: hadrian
Date: Fri Oct 15 02:20:16 2010
New Revision: 1022811
URL: http://svn.apache.org/viewvc?rev=1022811&view=rev
Log:
CAMEL-3234. Patch applied with thanks to Dan Kulp
Modified:
camel/trunk/components/camel-spring-integration/pom.xml
camel/trunk/parent/pom.xml
camel/trunk/pom.xml
Modified: camel/trunk/components/camel-spring-integration/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/pom.xml?rev=1022811&r1=1022810&r2=1022811&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-integration/pom.xml (original)
+++ camel/trunk/components/camel-spring-integration/pom.xml Fri Oct 15 02:20:16
2010
@@ -70,13 +70,6 @@
</resources>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1022811&r1=1022810&r2=1022811&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Fri Oct 15 02:20:16 2010
@@ -1574,6 +1574,28 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>setup.eclipse</id>
+ <build>
+ <defaultGoal>process-test-sources</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <inherited>true</inherited>
+ <executions>
+ <execution>
+ <id>setup.eclipse.project</id>
+ <phase>process-test-sources</phase>
+ <goals>
+ <goal>eclipse</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
Modified: camel/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/pom.xml?rev=1022811&r1=1022810&r2=1022811&view=diff
==============================================================================
--- camel/trunk/pom.xml (original)
+++ camel/trunk/pom.xml Fri Oct 15 02:20:16 2010
@@ -46,6 +46,8 @@
<jetty-version>7.0.1.v20091125</jetty-version>
<jaxb-version>2.1.12</jaxb-version>
<jaxb-api-version>2.1</jaxb-api-version>
+
+ <jdk.version>1.6</jdk.version>
</properties>
<mailingLists>
@@ -506,6 +508,18 @@
<profiles>
<profile>
+ <!-- really just used for the eclispe setup as eclipse will stick JSE-15
as the compliance
+ level if we don't reconfigure the compiler plugin with 1.6. When it
does that, things
+ like JAXB and other built in JDK things won't be found -->
+ <id>jdk15</id>
+ <activation>
+ <jdk>1.5</jdk>
+ </activation>
+ <properties>
+ <jdk.version>1.5</jdk.version>
+ </properties>
+ </profile>
+ <profile>
<id>setup.eclipse</id>
<!--
set up the eclipse workspace and generate the .classpath and .project
files for modules
@@ -515,6 +529,18 @@
</properties>
<build>
<defaultGoal>process-test-sources</defaultGoal>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>${jdk.version}</source>
+ <target>${jdk.version}</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
