From 46f27a85fede15cfef2b7a2cf2c52a7a053d20b7 Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
Date: Sun, 29 Sep 2013 19:46:26 +0000
Subject: QPID-5193: update the source and target values used for javac to 1.6

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1527389 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/java/broker-core/build-generate-sources.xml | 2 +-
 qpid/java/common.xml                             | 4 ++--
 qpid/java/common/build-generate-sources.xml      | 2 +-
 qpid/java/pom.xml                                | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'qpid/java')

diff --git a/qpid/java/broker-core/build-generate-sources.xml b/qpid/java/broker-core/build-generate-sources.xml
index 738d3b0b96..56637c2bce 100644
--- a/qpid/java/broker-core/build-generate-sources.xml
+++ b/qpid/java/broker-core/build-generate-sources.xml
@@ -48,7 +48,7 @@
     <target name="compile-logmessages-generator" >
         <mkdir dir="${velocity.classes}" />
         <!-- Compile LogMessages Velocity Generator -->
-        <javac source="1.5" target="1.5"
+        <javac source="${java.source}" target="${java.target}"
                destdir="${velocity.classes}" debug="on" includeantruntime="false"
                srcdir="${velocity.src.dir}" >
           <classpath>
diff --git a/qpid/java/common.xml b/qpid/java/common.xml
index c47cab2ac7..46c41a7a1f 100644
--- a/qpid/java/common.xml
+++ b/qpid/java/common.xml
@@ -50,8 +50,8 @@
   <property name="build.coverage.src"    location="${build}/coverage/src"/>
   <property name="build.findbugs"        location="${build}/findbugs"/>
 
-  <property name="java.target"           value="1.5"/>
-  <property name="java.source"           value="1.5"/>
+  <property name="java.target"           value="1.6"/>
+  <property name="java.source"           value="1.6"/>
 
   <property name="release"               location="${project.root}/release"/>
 
diff --git a/qpid/java/common/build-generate-sources.xml b/qpid/java/common/build-generate-sources.xml
index 141d48eeee..2040d8e14a 100644
--- a/qpid/java/common/build-generate-sources.xml
+++ b/qpid/java/common/build-generate-sources.xml
@@ -92,7 +92,7 @@ qpid.name=qpid
 
   <target name="compile-gentools">
     <mkdir dir="${gentools.classes}"/>
-    <javac srcdir="${gentools.src}" destdir="${gentools.classes}" source="1.5" target="1.5" fork="true" includeantruntime="false">
+    <javac srcdir="${gentools.src}" destdir="${gentools.classes}" source="${java.source}" target="${java.target}" fork="true" includeantruntime="false">
       <classpath>
         <path refid="source.generation.classpathref"/>
       </classpath>
diff --git a/qpid/java/pom.xml b/qpid/java/pom.xml
index d3328804ba..c71def7d40 100644
--- a/qpid/java/pom.xml
+++ b/qpid/java/pom.xml
@@ -65,9 +65,9 @@
     <junit-version>3.8.1</junit-version>
     <mockito-version>1.9.0</mockito-version>
 
-    <!-- Should be 1.6 but set to 1.5 for binary comparison with the Ant build output -->
-    <java.source>1.5</java.source>
-    <java.target>1.5</java.target>
+    <!-- javac source/target properties -->
+    <java.source>1.6</java.source>
+    <java.target>1.6</java.target>
 
     <!-- test properties -->
     <qpid.home>${basedir}</qpid.home> <!-- override for broker tests -->
-- 
cgit v1.2.1