Ensure that we use the same Java version everywhere. This avoids clas…

…s 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
apache · Nov 23, 2013 · 883f8e6 · 883f8e6
1 parent 697a9bb
commit 883f8e6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git 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
@@ -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>