Merge branch 'master' into v1.28

stoicflame · Dec 4, 2013 · adc00bb · adc00bb
2 parents 73cc436 + 8d45bd5
commit adc00bb
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 0 deletions.
diff --git a/core/src/main/java/org/codehaus/enunciate/main/EnunciateTask.java b/core/src/main/java/org/codehaus/enunciate/main/EnunciateTask.java
@@ -57,6 +57,8 @@ public class EnunciateTask extends MatchingTask {
   private File scratchDir;
   private File gwtHome;
   private File flexHome;
+  private String javacSourceVersion = null;
+  private String javacTargetVersion = null;
   private Enunciate.Target target;
   private final ArrayList<Export> exports = new ArrayList<Export>();
   private final ArrayList<JavacArgument> javacArguments = new ArrayList<JavacArgument>();
@@ -147,6 +149,14 @@ public void execute() throws BuildException {
         proxy.setTarget(this.target);
       }
 
+      if (this.javacSourceVersion != null) {
+        proxy.setJavacSourceVersion(this.javacSourceVersion);
+      }
+
+      if (this.javacTargetVersion != null) {
+        proxy.setJavacTargetVersion(this.javacTargetVersion);
+      }
+
       for (Export export : exports) {
         proxy.addExport(export.getArtifactId(), export.getDestination());
       }
@@ -305,6 +315,24 @@ public void setCompileDebugInfo(boolean compileDebugInfo) {
     this.compileDebugInfo = compileDebugInfo;
   }
 
+  /**
+   * javac -source version parameter
+   * 
+   * @param javacSourceVersion javac -source version parameter
+   */
+  public void setJavacSourceVersion(String javacSourceVersion) {
+    this.javacSourceVersion = javacSourceVersion;
+  }
+
+  /**
+   * javac -target version parameter
+   * 
+   * @param javacTargetVersion javac -target version parameter
+   */
+  public void setJavacTargetVersion(String javacTargetVersion) {
+    this.javacTargetVersion = javacTargetVersion;
+  }
+
   /**
    * The classpath to use to enunciate.
    *

diff --git a/documentation/executables.html b/documentation/executables.html
@@ -413,6 +413,16 @@ <h2>Enunciate Task Attributes</h2>
           <td>The reference to the classpath to use to Enunciate (used to find modules, invoke APT, and copy jars for building the war).</td>
           <td class="last">No; Defaults to the system classpath</td>
         </tr>
+        <tr>
+          <td>javacSourceVersion</td>
+          <td>String</td>
+          <td class="last">javac -source version parameter</td>
+        </tr>
+        <tr>
+          <td>javacTargetVersion</td>
+          <td>String</td>
+          <td class="last">javac -target version parameter</td>
+        </tr>
         <tr>
           <td>compileDebugInfo</td>
           <td>Whether to compile with debug info.</td>