FAQ
Repository: ant
Updated Branches:
   refs/heads/master db2254973 -> e0f845f8c


whitespace


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/1be3f9cc
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/1be3f9cc
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/1be3f9cc

Branch: refs/heads/master
Commit: 1be3f9cc5208e2d6c41dce9aed20d0afb51124e9
Parents: db22549
Author: Stefan Bodewig <bodewig@apache.org>
Authored: Fri Feb 13 06:32:37 2015 +0100
Committer: Stefan Bodewig <bodewig@apache.org>
Committed: Fri Feb 13 06:32:37 2015 +0100

----------------------------------------------------------------------
  src/tests/antunit/taskdefs/javac-test.xml | 14 +++++++-------
  1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant/blob/1be3f9cc/src/tests/antunit/taskdefs/javac-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/taskdefs/javac-test.xml b/src/tests/antunit/taskdefs/javac-test.xml
index 1ad4a49..2827fa0 100644
--- a/src/tests/antunit/taskdefs/javac-test.xml
+++ b/src/tests/antunit/taskdefs/javac-test.xml
@@ -213,31 +213,31 @@ public class Adapter implements CompilerAdapter {
        <testJavac source="notValid"/>
      </au:expectfailure>

- <echo>JDK 1.4+</echo>
+ <echo>JDK 1.4+</echo>
      <testJavac source="1.4"/>
      <delete dir="${javac-dir}/classes"/>
      <mkdir dir="${javac-dir}/classes"/>

- <sequential if:set="jdk1.5+">
+ <sequential if:set="jdk1.5+">
        <echo>JDK 1.5+</echo>
        <testJavac source="1.5"/>
        <delete dir="${javac-dir}/classes"/>
        <mkdir dir="${javac-dir}/classes"/>
- </sequential>
+ </sequential>

- <sequential if:set="jdk1.6+">
+ <sequential if:set="jdk1.6+">
        <echo>JDK 1.6+</echo>
        <testJavac source="1.6"/>
        <delete dir="${javac-dir}/classes"/>
        <mkdir dir="${javac-dir}/classes"/>
- </sequential>
+ </sequential>

- <sequential if:set="jdk1.7+">
+ <sequential if:set="jdk1.7+">
        <echo>JDK 1.7+</echo>
        <testJavac source="1.7"/>
        <delete dir="${javac-dir}/classes"/>
        <mkdir dir="${javac-dir}/classes"/>
- </sequential>
+ </sequential>

      <sequential if:set="jdk1.8+">
        <echo>JDK 1.8+</echo>

Search Discussions

  • Bodewig at Feb 13, 2015 at 5:45 am
    Java9's javac doesn't support -source 1.5 anymore


    Project: http://git-wip-us.apache.org/repos/asf/ant/repo
    Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/7b88a658
    Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/7b88a658
    Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/7b88a658

    Branch: refs/heads/master
    Commit: 7b88a65814ea2aed5ac555587844fa8a12c2f95c
    Parents: 1be3f9c
    Author: Stefan Bodewig <bodewig@apache.org>
    Authored: Fri Feb 13 06:41:42 2015 +0100
    Committer: Stefan Bodewig <bodewig@apache.org>
    Committed: Fri Feb 13 06:41:42 2015 +0100

    ----------------------------------------------------------------------
      src/tests/antunit/taskdefs/javac-test.xml | 34 +++++++++++---------
      .../taskdefs/optional/junit/junit-test.xml | 6 +++-
      2 files changed, 24 insertions(+), 16 deletions(-)
    ----------------------------------------------------------------------


    http://git-wip-us.apache.org/repos/asf/ant/blob/7b88a658/src/tests/antunit/taskdefs/javac-test.xml
    ----------------------------------------------------------------------
    diff --git a/src/tests/antunit/taskdefs/javac-test.xml b/src/tests/antunit/taskdefs/javac-test.xml
    index 2827fa0..4e845c6 100644
    --- a/src/tests/antunit/taskdefs/javac-test.xml
    +++ b/src/tests/antunit/taskdefs/javac-test.xml
    @@ -198,7 +198,7 @@ public class Adapter implements CompilerAdapter {
          <au:assertLogContains text="adapter called" />
        </target>

    - <target name="testSourceAttributes" xmlns:if="ant:if">
    + <target name="testSourceAttributes" xmlns:if="ant:if" xmlns:unless="ant:unless">
          <delete dir="${javac-dir}/src" />
          <mkdir dir="${javac-dir}/src" />
          <mkdir dir="${javac-dir}/classes" />
    @@ -212,13 +212,15 @@ public class Adapter implements CompilerAdapter {
          <au:expectfailure>
            <testJavac source="notValid"/>
          </au:expectfailure>
    -
    - <echo>JDK 1.4+</echo>
    - <testJavac source="1.4"/>
    - <delete dir="${javac-dir}/classes"/>
    - <mkdir dir="${javac-dir}/classes"/>
    -
    - <sequential if:set="jdk1.5+">
    +
    + <sequential unless:set="jdk1.9+">
    + <echo>JDK 1.4+</echo>
    + <testJavac source="1.4"/>
    + <delete dir="${javac-dir}/classes"/>
    + <mkdir dir="${javac-dir}/classes"/>
    + </sequential>
    +
    + <sequential if:set="jdk1.5+" unless:set="jdk1.9+">
            <echo>JDK 1.5+</echo>
            <testJavac source="1.5"/>
            <delete dir="${javac-dir}/classes"/>
    @@ -254,7 +256,7 @@ public class Adapter implements CompilerAdapter {
          </sequential>
        </target>

    - <target name="testTargetAttributes" xmlns:if="ant:if">
    + <target name="testTargetAttributes" xmlns:if="ant:if" xmlns:unless="ant:unless">
          <delete dir="${javac-dir}/src" />
          <mkdir dir="${javac-dir}/src" />
          <mkdir dir="${javac-dir}/classes" />
    @@ -269,12 +271,14 @@ public class Adapter implements CompilerAdapter {
            <testJavac target="notValid"/>
          </au:expectfailure>

    - <echo>JDK 1.4+</echo>
    - <testJavac source="1.4" target="1.4"/>
    - <delete dir="${javac-dir}/classes"/>
    - <mkdir dir="${javac-dir}/classes"/>
    -
    - <sequential if:set="jdk1.5+">
    + <sequential unless:set="jdk1.9+">
    + <echo>JDK 1.4+</echo>
    + <testJavac source="1.4" target="1.4"/>
    + <delete dir="${javac-dir}/classes"/>
    + <mkdir dir="${javac-dir}/classes"/>
    + </sequential>
    +
    + <sequential if:set="jdk1.5+" unless:set="jdk1.9+">
            <echo>JDK 1.5+</echo>
            <testJavac source="1.5" target="1.5"/>
            <delete dir="${javac-dir}/classes"/>

    http://git-wip-us.apache.org/repos/asf/ant/blob/7b88a658/src/tests/antunit/taskdefs/optional/junit/junit-test.xml
    ----------------------------------------------------------------------
    diff --git a/src/tests/antunit/taskdefs/optional/junit/junit-test.xml b/src/tests/antunit/taskdefs/optional/junit/junit-test.xml
    index 873ce0e..2043d8f 100644
    --- a/src/tests/antunit/taskdefs/optional/junit/junit-test.xml
    +++ b/src/tests/antunit/taskdefs/optional/junit/junit-test.xml
    @@ -317,6 +317,10 @@ public class BTest extends TestCase {
        </target>

        <target name="testTestMethods" if="jdk1.5+">
    + <condition property="source" value="6">
    + <isset property="jdk1.6+"/>
    + </condition>
    + <property name="source" value="5"/>
          <echo file="${input}/T1.java">public class T1 extends
         junit.framework.TestCase {
         public void testOK() {}
    @@ -331,7 +335,7 @@ public class BTest extends TestCase {
         public void bad() {
         throw new RuntimeException("failed");}
         }</echo>
    - <javac srcdir="${input}" destdir="${output}" includes="T1.java,T2.java" source="5" includeantruntime="false">
    + <javac srcdir="${input}" destdir="${output}" includes="T1.java,T2.java" source="${source}" includeantruntime="false">
            <classpath>
              <path refid="junit" />
            </classpath>
  • Bodewig at Feb 13, 2015 at 5:45 am
    adaot to default -source values in Java8/Java9


    Project: http://git-wip-us.apache.org/repos/asf/ant/repo
    Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/744c8f04
    Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/744c8f04
    Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/744c8f04

    Branch: refs/heads/master
    Commit: 744c8f04ff86a8735bb2ffb2d7cc457448ea187e
    Parents: 7b88a65
    Author: Stefan Bodewig <bodewig@apache.org>
    Authored: Fri Feb 13 06:44:43 2015 +0100
    Committer: Stefan Bodewig <bodewig@apache.org>
    Committed: Fri Feb 13 06:44:43 2015 +0100

    ----------------------------------------------------------------------
      .../tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java | 4 +++-
      1 file changed, 3 insertions(+), 1 deletion(-)
    ----------------------------------------------------------------------


    http://git-wip-us.apache.org/repos/asf/ant/blob/744c8f04/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
    ----------------------------------------------------------------------
    diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java b/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
    index 7a3ab69..519163c 100644
    --- a/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
    +++ b/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
    @@ -716,7 +716,9 @@ public abstract class DefaultCompilerAdapter
              return t.equals("1") || t.equals("2") || t.equals("3") || t.equals("4")
    ((t.equals("5") || t.equals("6"))
                      && !assumeJava15() && !assumeJava16())
    - || (t.equals("7") && !assumeJava17());
    + || (t.equals("7") && !assumeJava17())
    + || (t.equals("8") && !assumeJava18())
    + || (t.equals("9") && !assumeJava19());
          }
  • Bodewig at Feb 13, 2015 at 5:45 am
    no need to check for Java5 anymore


    Project: http://git-wip-us.apache.org/repos/asf/ant/repo
    Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/e0f845f8
    Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/e0f845f8
    Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/e0f845f8

    Branch: refs/heads/master
    Commit: e0f845f8cf73dbcacc42a879fcee7aa96764829e
    Parents: 744c8f0
    Author: Stefan Bodewig <bodewig@apache.org>
    Authored: Fri Feb 13 06:45:19 2015 +0100
    Committer: Stefan Bodewig <bodewig@apache.org>
    Committed: Fri Feb 13 06:45:19 2015 +0100

    ----------------------------------------------------------------------
      src/tests/antunit/taskdefs/javac-test.xml | 4 ++--
      src/tests/antunit/taskdefs/optional/junit/junit-test.xml | 2 +-
      2 files changed, 3 insertions(+), 3 deletions(-)
    ----------------------------------------------------------------------


    http://git-wip-us.apache.org/repos/asf/ant/blob/e0f845f8/src/tests/antunit/taskdefs/javac-test.xml
    ----------------------------------------------------------------------
    diff --git a/src/tests/antunit/taskdefs/javac-test.xml b/src/tests/antunit/taskdefs/javac-test.xml
    index 4e845c6..3c4d848 100644
    --- a/src/tests/antunit/taskdefs/javac-test.xml
    +++ b/src/tests/antunit/taskdefs/javac-test.xml
    @@ -220,7 +220,7 @@ public class Adapter implements CompilerAdapter {
            <mkdir dir="${javac-dir}/classes"/>
          </sequential>

    - <sequential if:set="jdk1.5+" unless:set="jdk1.9+">
    + <sequential unless:set="jdk1.9+">
            <echo>JDK 1.5+</echo>
            <testJavac source="1.5"/>
            <delete dir="${javac-dir}/classes"/>
    @@ -278,7 +278,7 @@ public class Adapter implements CompilerAdapter {
            <mkdir dir="${javac-dir}/classes"/>
          </sequential>

    - <sequential if:set="jdk1.5+" unless:set="jdk1.9+">
    + <sequential unless:set="jdk1.9+">
            <echo>JDK 1.5+</echo>
            <testJavac source="1.5" target="1.5"/>
            <delete dir="${javac-dir}/classes"/>

    http://git-wip-us.apache.org/repos/asf/ant/blob/e0f845f8/src/tests/antunit/taskdefs/optional/junit/junit-test.xml
    ----------------------------------------------------------------------
    diff --git a/src/tests/antunit/taskdefs/optional/junit/junit-test.xml b/src/tests/antunit/taskdefs/optional/junit/junit-test.xml
    index 2043d8f..e6aa794 100644
    --- a/src/tests/antunit/taskdefs/optional/junit/junit-test.xml
    +++ b/src/tests/antunit/taskdefs/optional/junit/junit-test.xml
    @@ -316,7 +316,7 @@ public class BTest extends TestCase {
          </au:expectfailure>
        </target>

    - <target name="testTestMethods" if="jdk1.5+">
    + <target name="testTestMethods">
          <condition property="source" value="6">
            <isset property="jdk1.6+"/>
          </condition>

Related Discussions

Discussion Navigation
viewthread | post
Discussion Overview
groupnotifications @
categoriesant
postedFeb 13, '15 at 5:45a
activeFeb 13, '15 at 5:45a
posts4
users1
websiteant.apache.org

1 user in discussion

Bodewig: 4 posts

People

Translate

site design / logo © 2018 Grokbase