From 883f8e69b2e4864469fc9ed123540b3eff7b4eb8 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Sat, 23 Nov 2013 22:46:20 +0000
Subject: [PATCH] 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.

git-svn-id: https://svn.apache.org/repos/asf/synapse/trunk@1544887 13f79535-47bb-0310-9956-ffa450edef68
---
 java/modules/integration/pom.xml | 8 ++++----
 java/pom.xml                     | 9 +++++++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/java/modules/integration/pom.xml b/java/modules/integration/pom.xml
index a5fdceb70..d924ec0a6 100644
--- a/java/modules/integration/pom.xml
+++ b/java/modules/integration/pom.xml
@@ -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>
diff --git a/java/pom.xml b/java/pom.xml
index b0604e538..27a333c40 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -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>