Merge pull request #881 from hyPiRion/alias-java-opts-to-jvm-opts

Add :java-opts as an alias for :jvm-opts
technomancy · Dec 10, 2012 · 2b00468 · 2b00468
2 parents 5c59d28 + 493adef
commit 2b00468
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/leiningen-core/src/leiningen/core/project.clj b/leiningen-core/src/leiningen/core/project.clj
@@ -161,7 +161,9 @@
          :resource-paths empty-paths
          :test-paths empty-paths}
         (-> (merge defaults project)
-            (dissoc :eval-in-leiningen :omit-default-repositories)
+            (assoc :jvm-opts (or (:jvm-opts project) (:java-opts project)
+                                 (:jvm-opts defaults)))
+            (dissoc :eval-in-leiningen :omit-default-repositories :java-opts)
             (assoc :eval-in (or (:eval-in project)
                                 (if (:eval-in-leiningen project)
                                   :leiningen, :subprocess))

diff --git a/sample.project.clj b/sample.project.clj
@@ -248,6 +248,7 @@
              ;; symbol values will be resolved to find a function to call.
              "Grunge-level" my.plugin/calculate-grunginess}
   ;; You can set JVM-level options here.
+  ;; It is also possible to use :java-opts, which is an alias for :jvm-opts.
   :jvm-opts ["-Xmx1g"]
   ;; Control the context in which your project code is evaluated.
   ;; Defaults to :subprocess, but can also be :leiningen (for plugins)