Release 2.2.0

dariol · May 29, 2013 · 5eaad5c · 5eaad5c
1 parent f362d59
commit 5eaad5c
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 8 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -2,6 +2,7 @@
 
 ## 2.2.0 / ???
 
+* Support setting custom welcome message when repl connects. (Colin Jones)
 * Fix a bug where old template versions were always fetched. (Nelson Morris)
 * Support `:java-agents` for tooling and instrumenting. (Phil Hagelberg)
 * Allow checkout dependencies to operate recursively. (Phil Hagelberg)

diff --git 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.2.0-SNAPSHOT"
+export LEIN_VERSION="2.2.0"
 
 case $LEIN_VERSION in
     *SNAPSHOT) SNAPSHOT="YES" ;;

diff --git 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.2.0-SNAPSHOT"
+export LEIN_VERSION="2.2.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
@@ -2,7 +2,7 @@
 
 setLocal EnableExtensions EnableDelayedExpansion
 
-set LEIN_VERSION=2.2.0-SNAPSHOT
+set LEIN_VERSION=2.2.0
 
 if "%LEIN_VERSION:~-9%" == "-SNAPSHOT" (
     set SNAPSHOT=YES

diff --git a/bin/release b/bin/release
@@ -19,7 +19,7 @@ sed -i s/:aot/\;\;:aot/ project.clj
 cd ..
 
 bin/lein with-profile release uberjar
-cp target/leiningen-$RELEASE_VERSION-standalone.jar $HOME/.lein/self-installs
+cp target/release+uberjar/leiningen-$RELEASE_VERSION-standalone.jar $HOME/.lein/self-installs
 
 cp bin/lein /tmp/lein-$RELEASE_VERSION
 cd /tmp
@@ -36,7 +36,7 @@ time ../lein-$RELEASE_VERSION run -m clojure.main/main -e nil
 
 echo "If these are under 3 seconds then you should be set to upload"
 echo "target/leiningen-$RELEASE_VERSION-standalone.jar to S3."
-echo "s3c me put -P target/leiningen-$RELEASE_VERSION-standalone.jar s3://leiningen/downloads/"
+echo "s3c me put -P target/release+uberjar/leiningen-$RELEASE_VERSION-standalone.jar s3://leiningen/downloads/"
 echo "Also deploy this release of leiningen-core to Clojars."
 
 cd -

diff --git a/leiningen-core/pom.xml b/leiningen-core/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>leiningen-core</groupId>
   <artifactId>leiningen-core</artifactId>
-  <version>2.1.3</version>
+  <version>2.2.0</version>
   <name>leiningen-core</name>
   <description>Library for core functionality of Leiningen.</description>
   <url>https://github.com/technomancy/leiningen</url>

diff --git a/leiningen-core/project.clj b/leiningen-core/project.clj
@@ -1,4 +1,4 @@
-(defproject leiningen-core "2.2.0-SNAPSHOT"
+(defproject leiningen-core "2.2.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
@@ -1,7 +1,7 @@
 ;; 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.2.0-SNAPSHOT"
+(defproject leiningen "2.2.0"
   :description "Automate Clojure projects without setting your hair on fire."
   :url "https://github.com/technomancy/leiningen"
   :license {:name "Eclipse Public License"