Author: veithen
Date: Sat Nov 23 22:46:20 2013
New Revision: 1544887
URL: http://svn.apache.org/r1544887
Log:
Ensure that we use the same Java version everywhere. This avoids class version
incompatibilites when executing the integration tests in an IDE with the AAR
files built on the command line with a different JDK.
Modified:
synapse/trunk/java/modules/integration/pom.xml
synapse/trunk/java/pom.xml
Modified: synapse/trunk/java/modules/integration/pom.xml
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration/pom.xml?rev=1544887&r1=1544886&r2=1544887&view=diff
==============================================================================
--- synapse/trunk/java/modules/integration/pom.xml (original)
+++ synapse/trunk/java/modules/integration/pom.xml Sat Nov 23 22:46:20 2013
@@ -100,7 +100,7 @@
<mkdir dir="${temp.dir}"/>
<mkdir dir="${classes}"/>
- <javac debug="on" destdir="${classes}"
fork="true" includeantruntime="false">
+ <javac source="${java.version}"
target="${java.version}" debug="on" destdir="${classes}" fork="true"
includeantruntime="false">
<src path="${src}"/>
<classpath
refid="maven.compile.classpath"/>
</javac>
@@ -126,7 +126,7 @@
<delete dir="${temp.dir}"/>
<mkdir dir="${temp.dir}"/>
<mkdir dir="${classes}"/>
- <javac debug="on" destdir="${classes}"
fork="true" includeantruntime="false">
+ <javac source="${java.version}"
target="${java.version}" debug="on" destdir="${classes}" fork="true"
includeantruntime="false">
<src path="${src2}"/>
<classpath
refid="maven.compile.classpath"/>
</javac>
@@ -150,7 +150,7 @@
<delete dir="${temp.dir}"/>
<mkdir dir="${temp.dir}"/>
<mkdir dir="${classes}"/>
- <javac debug="on" destdir="${classes}"
fork="true" includeantruntime="false">
+ <javac source="${java.version}"
target="${java.version}" debug="on" destdir="${classes}" fork="true"
includeantruntime="false">
<src path="${src3}"/>
<classpath
refid="maven.compile.classpath"/>
</javac>
@@ -171,7 +171,7 @@
<delete dir="${temp.dir}"/>
<mkdir dir="${temp.dir}"/>
<mkdir dir="${classes}"/>
- <javac debug="on" destdir="${classes}"
fork="true" includeantruntime="false">
+ <javac source="${java.version}"
target="${java.version}" debug="on" destdir="${classes}" fork="true"
includeantruntime="false">
<src path="${src5}"/>
<classpath
refid="maven.compile.classpath"/>
</javac>
Modified: synapse/trunk/java/pom.xml
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/pom.xml?rev=1544887&r1=1544886&r2=1544887&view=diff
==============================================================================
--- synapse/trunk/java/pom.xml (original)
+++ synapse/trunk/java/pom.xml Sat Nov 23 22:46:20 2013
@@ -198,8 +198,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>${java.version}</source>
+ <target>${java.version}</target>
</configuration>
</plugin>
<plugin>
@@ -1049,6 +1049,11 @@
<properties>
<!-- Sets the source encoding to UTF-8 -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+ <!-- The Java version used to build Synapse. This property is used in
the configuration
+ of the maven-compiler-plugin as well as certain ant tasks
executed using
+ maven-antrun-plugin. -->
+ <java.version>1.6</java.version>
<synapse.version>2.2.0-SNAPSHOT</synapse.version>
