You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2013/05/02 16:18:34 UTC
[1/3] git commit: explicitly set java source and target to 1.6 for
the ant tasks patch by dbrosius reviewed by slebresne for CASSANDRA-5533
Updated Branches:
refs/heads/cassandra-1.1 de212e59a -> b4b4f6a95
explicitly set java source and target to 1.6 for the ant tasks
patch by dbrosius reviewed by slebresne for CASSANDRA-5533
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f8567d15
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f8567d15
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f8567d15
Branch: refs/heads/cassandra-1.1
Commit: f8567d15fee3bf4251e3324f1809edb29cd75645
Parents: 08eebcd
Author: Dave Brosius <db...@apache.org>
Authored: Thu May 2 10:08:44 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Thu May 2 10:08:44 2013 -0400
----------------------------------------------------------------------
build.xml | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f8567d15/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 57e3ab2..43172c9 100644
--- a/build.xml
+++ b/build.xml
@@ -60,6 +60,10 @@
<property name="test.unit.src" value="${test.dir}/unit"/>
<property name="test.long.src" value="${test.dir}/long"/>
<property name="dist.dir" value="${build.dir}/dist"/>
+
+ <property name="source.version" value="1.6"/>
+ <property name="target.version" value="1.6"/>
+
<condition property="version" value="${base.version}">
<isset property="release"/>
</condition>
@@ -650,12 +654,12 @@
<echo message="${ant.project.name}: ${ant.file}"/>
<!-- Order matters! -->
<javac debug="true" debuglevel="${debuglevel}"
- destdir="${build.classes.thrift}" includeantruntime="false">
+ destdir="${build.classes.thrift}" includeantruntime="false" source="${source.version}" target="${target.version}">
<src path="${interface.thrift.dir}/gen-java"/>
<classpath refid="cassandra.classpath"/>
</javac>
<javac debug="true" debuglevel="${debuglevel}"
- destdir="${build.classes.main}" includeantruntime="false">
+ destdir="${build.classes.main}" includeantruntime="false" source="${source.version}" target="${target.version}">
<src path="${build.src.java}"/>
<src path="${build.src.gen-java}"/>
<classpath refid="cassandra.classpath"/>
@@ -941,7 +945,9 @@
<javac
debug="true"
debuglevel="${debuglevel}"
- destdir="${test.classes}">
+ destdir="${test.classes}"
+ source="${source.version}"
+ target="${target.version}">
<classpath>
<path refid="cassandra.classpath"/>
<pathelement location="${build.classes.cql}"/>
[2/3] git commit: Merge branch 'cassandra-1.0' into cassandra-1.1
Posted by db...@apache.org.
Merge branch 'cassandra-1.0' into cassandra-1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d5754ab2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d5754ab2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d5754ab2
Branch: refs/heads/cassandra-1.1
Commit: d5754ab223116f26749d0df0c942d43c819ff63b
Parents: de212e5 f8567d1
Author: Dave Brosius <db...@apache.org>
Authored: Thu May 2 10:12:19 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Thu May 2 10:12:19 2013 -0400
----------------------------------------------------------------------
build.xml | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d5754ab2/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index ab4dd71,43172c9..3d76d14
--- a/build.xml
+++ b/build.xml
@@@ -1010,9 -945,12 +1014,11 @@@
<javac
debug="true"
debuglevel="${debuglevel}"
- destdir="${test.classes}">
+ destdir="${test.classes}"
+ source="${source.version}"
+ target="${target.version}">
<classpath>
<path refid="cassandra.classpath"/>
- <pathelement location="${build.classes.cql}"/>
</classpath>
<src path="${test.unit.src}"/>
<src path="${test.long.src}"/>
[3/3] git commit: explicitly set java source and target to 1.6 for
the ant tasks
Posted by db...@apache.org.
explicitly set java source and target to 1.6 for the ant tasks
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b4b4f6a9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b4b4f6a9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b4b4f6a9
Branch: refs/heads/cassandra-1.1
Commit: b4b4f6a95c1c80f34c287db675d5a23d705e11dc
Parents: d5754ab
Author: Dave Brosius <db...@apache.org>
Authored: Thu May 2 10:18:03 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Thu May 2 10:18:03 2013 -0400
----------------------------------------------------------------------
build.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b4b4f6a9/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 3d76d14..b77c417 100644
--- a/build.xml
+++ b/build.xml
@@ -708,7 +708,7 @@
</path>
<target name="stress-build" depends="build">
<mkdir dir="${stress.build.classes}" />
- <javac destdir="${stress.build.classes}" includeantruntime="true">
+ <javac destdir="${stress.build.classes}" includeantruntime="true" source="${source.version}" target="${target.version}">
<src path="${stress.build.src}" />
<classpath>
<path refid="cassandra.classes" />