You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2013/09/29 21:46:27 UTC
svn commit: r1527389 - in /qpid/trunk/qpid/java:
broker-core/build-generate-sources.xml common.xml
common/build-generate-sources.xml pom.xml
Author: robbie
Date: Sun Sep 29 19:46:26 2013
New Revision: 1527389
URL: http://svn.apache.org/r1527389
Log:
QPID-5193: update the source and target values used for javac to 1.6
Modified:
qpid/trunk/qpid/java/broker-core/build-generate-sources.xml
qpid/trunk/qpid/java/common.xml
qpid/trunk/qpid/java/common/build-generate-sources.xml
qpid/trunk/qpid/java/pom.xml
Modified: qpid/trunk/qpid/java/broker-core/build-generate-sources.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/build-generate-sources.xml?rev=1527389&r1=1527388&r2=1527389&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/build-generate-sources.xml (original)
+++ qpid/trunk/qpid/java/broker-core/build-generate-sources.xml Sun Sep 29 19:46:26 2013
@@ -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>
Modified: qpid/trunk/qpid/java/common.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common.xml?rev=1527389&r1=1527388&r2=1527389&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common.xml (original)
+++ qpid/trunk/qpid/java/common.xml Sun Sep 29 19:46:26 2013
@@ -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"/>
Modified: qpid/trunk/qpid/java/common/build-generate-sources.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/build-generate-sources.xml?rev=1527389&r1=1527388&r2=1527389&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/build-generate-sources.xml (original)
+++ qpid/trunk/qpid/java/common/build-generate-sources.xml Sun Sep 29 19:46:26 2013
@@ -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>
Modified: qpid/trunk/qpid/java/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/pom.xml?rev=1527389&r1=1527388&r2=1527389&view=diff
==============================================================================
--- qpid/trunk/qpid/java/pom.xml (original)
+++ qpid/trunk/qpid/java/pom.xml Sun Sep 29 19:46:26 2013
@@ -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 -->
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org