diff --git a/bin/lein b/bin/lein index 42823171a..b91a4acb1 100755 --- a/bin/lein +++ b/bin/lein @@ -4,7 +4,7 @@ # somewhere on your $PATH, like ~/bin. The rest of Leiningen will be # installed upon first run into the ~/.lein/self-installs directory. -export LEIN_VERSION="2.4.0-SNAPSHOT" +export LEIN_VERSION="2.4.0" case $LEIN_VERSION in *SNAPSHOT) SNAPSHOT="YES" ;; diff --git a/bin/lein-pkg b/bin/lein-pkg index 8a59a2a5d..a8a97d914 100644 --- a/bin/lein-pkg +++ b/bin/lein-pkg @@ -4,7 +4,7 @@ # It has all the cross-platform stuff stripped out as well as the # logic for running from a source checkout and self-install/upgrading. -export LEIN_VERSION="2.4.0-SNAPSHOT" +export LEIN_VERSION="2.4.0" if [ `whoami` = "root" ] && [ "$LEIN_ROOT" = "" ]; then echo "WARNING: You're currently running as root; probably by accident." diff --git a/bin/lein.bat b/bin/lein.bat index b8003915a..2044231e7 100755 --- a/bin/lein.bat +++ b/bin/lein.bat @@ -2,7 +2,7 @@ setLocal EnableExtensions EnableDelayedExpansion -set LEIN_VERSION=2.4.0-SNAPSHOT +set LEIN_VERSION=2.4.0 if "%LEIN_VERSION:~-9%" == "-SNAPSHOT" ( set SNAPSHOT=YES diff --git a/bin/release b/bin/release index 61b99be4e..12889b5ea 100755 --- a/bin/release +++ b/bin/release @@ -39,8 +39,7 @@ echo "Are these acceptable times? (~3s) [Y\n]" read CONTINUE case "$CONTINUE" in y|Y|"") - gpg -ab $RELEASE_JAR - echo "Upload $RELEASE_JAR and $RELEASE_JAR.asc to GitHub releases for $RELEASE_VERSION.";; + gpg -ab $RELEASE_JAR;; *) echo "Aborted." exit 1;; @@ -49,11 +48,12 @@ esac cd $LEIN_ROOT git commit -a -m "Release $RELEASE_VERSION" +git tag -s $RELEASE_VERSION -m "Release $RELEASE_VERSION" +git push && git push --tags && git push origin master:stable + +echo "Upload $RELEASE_JAR and $RELEASE_JAR.asc to GitHub releases for $RELEASE_VERSION." rm -rf target leiningen-core/target -echo "Test self-install." -echo "If things are good, run this:" -echo "$ git tag -s $RELEASE_VERSION -m \"Release $RELEASE_VERSION\"" -echo "$ git push && git push --tags && git push origin master:stable" -echo "$ lein deploy clojars" -echo "$ cd leiningen-core && lein deploy clojars" +echo "Test self-install. If things are good, run this:" +echo "$ lein deploy clojars && cd leiningen-core && lein deploy clojars" +echo "And announce it on the mailing list." diff --git a/leiningen-core/pom.xml b/leiningen-core/pom.xml index be0b3aa39..7922591c1 100644 --- a/leiningen-core/pom.xml +++ b/leiningen-core/pom.xml @@ -1,10 +1,9 @@ - - + 4.0.0 leiningen-core leiningen-core jar - 2.3.4 + 2.4.0 leiningen-core Library for core functionality of Leiningen. https://github.com/technomancy/leiningen @@ -17,7 +16,7 @@ scm:git:git://github.com/technomancy/leiningen.git scm:git:ssh://git@github.com/technomancy/leiningen.git - 77d659e6eec73d1d46b890838d62590751c94844 + 52f6ec9b4c0a9af8255b3bf69d23cca82ecca900 https://github.com/technomancy/leiningen @@ -67,12 +66,12 @@ org.clojure clojure - 1.5.1 + 1.6.0 bultitude bultitude - 0.2.2 + 0.2.6 classlojure @@ -87,7 +86,7 @@ com.cemerick pomegranate - 0.2.0 + 0.3.0 org.apache.maven.wagon diff --git a/leiningen-core/project.clj b/leiningen-core/project.clj index 747b08341..da98bd860 100644 --- a/leiningen-core/project.clj +++ b/leiningen-core/project.clj @@ -1,4 +1,4 @@ -(defproject leiningen-core "2.4.0-SNAPSHOT" +(defproject leiningen-core "2.4.0" :url "https://github.com/technomancy/leiningen" :license {:name "Eclipse Public License" :url "http://www.eclipse.org/legal/epl-v10.html"} diff --git a/project.clj b/project.clj index 7ea8626e0..3db324c5f 100644 --- a/project.clj +++ b/project.clj @@ -1,12 +1,12 @@ ;; This is Leiningen's own project configuration. See doc/TUTORIAL.md ;; file as well as sample.project.clj for help writing your own. -(defproject leiningen "2.4.0-SNAPSHOT" +(defproject leiningen "2.4.0" :description "Automate Clojure projects without setting your hair on fire." :url "https://github.com/technomancy/leiningen" :license {:name "Eclipse Public License" :url "http://www.eclipse.org/legal/epl-v10.html"} - :dependencies [[leiningen-core "2.4.0-SNAPSHOT"] + :dependencies [[leiningen-core "2.4.0"] [org.clojure/data.xml "0.0.3"] [commons-io "2.4"] [bultitude "0.2.6"]