Prepare for 2.8.0-RC1.

technomancy · Sep 18, 2017 · 267e16a · 267e16a
1 parent 1cebb9a
commit 267e16a
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 17 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,6 +1,6 @@
 # Leiningen News -- history of user-visible changes
 
-## 2.8.0 / ???
+## 2.8.0-RC1 / 2017-09-18
 
 * Project middleware, hooks, and the `:test` profile are considered deprecated. (Phil Hagelberg)
 * JVMs on 8u131 and newer will default to using cgroups settings for memory limits. (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.7.2-SNAPSHOT"
+export LEIN_VERSION="2.8.0-SNAPSHOT"
 
 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.7.2-SNAPSHOT"
+export LEIN_VERSION="2.8.0-SNAPSHOT"
 
 # cd to the project root, if applicable
 NOT_FOUND=1

diff --git a/bin/lein.bat b/bin/lein.bat
@@ -2,7 +2,7 @@
 
 setLocal EnableExtensions EnableDelayedExpansion
 
-set LEIN_VERSION=2.7.2-SNAPSHOT
+set LEIN_VERSION=2.8.0-SNAPSHOT
 
 if "%LEIN_VERSION:~-9%" == "-SNAPSHOT" (
     set SNAPSHOT=YES

diff --git a/bin/lein.ps1 b/bin/lein.ps1
@@ -34,7 +34,7 @@ function Set-ParentLocation([string]$file)
 
 function Initialize-Environment
 {
-    $env:LEIN_VERSION = '2.7.2-SNAPSHOT'
+    $env:LEIN_VERSION = '2.8.0-SNAPSHOT'
     $env:SNAPSHOT = if($env:LEIN_VERSION -like '*-SNAPSHOT'){'YES'}else{'NO'} #TODO: Still needed?
     $env:ORIGINAL_PWD = $PWD -replace '\\$','\\'
     Set-ParentLocation project.clj

diff --git a/bin/release b/bin/release
@@ -2,8 +2,8 @@
 
 set -e -u
 
-RELEASE_VERSION=$1
-CURRENT_VERSION="$RELEASE_VERSION-SNAPSHOT"
+RELEASE_VERSION=2.8.0-RC1
+CURRENT_VERSION=2.8.0-SNAPSHOT
 
 # Would like to use `lein release` here, but we don't have a way to
 # update the bash scripts or watch for boot slowdowns that way. Maybe
@@ -14,8 +14,6 @@ if [ ! -x `which lein-stable` ]; then
     exit 1
 fi
 
-(java -version 2>&1 | head -n1 | grep -F '1.6') || (echo "Use java 1.6 to build Leiningen release" && exit 1)
-
 grep $RELEASE_VERSION NEWS.md || (echo "Add $RELEASE_VERSION to NEWS.md" && exit 1)
 
 lein vcs assert-committed
@@ -54,6 +52,7 @@ time ../lein-$RELEASE_VERSION run -m clojure.main/main -e nil
 
 echo "Check that these are about the same boot times as with the last version."
 echo "Run this in a project: time lein-stable run -m clojure.main/main -e nil"
+echo "Proceeding here will publish the new version to the git repo."
 echo "Are these acceptable times? (~3s) [Y\n]"
 read CONTINUE
 case "$CONTINUE" in
@@ -68,7 +67,7 @@ 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
+git push && git push --tags # && git push origin master:stable
 
 echo "Upload $RELEASE_JAR and $RELEASE_JAR.asc to GitHub releases for $RELEASE_VERSION."
 echo "Copy this version's section of NEWS.md to the GitHub release description."

diff --git a/leiningen-core/pom.xml b/leiningen-core/pom.xml
@@ -3,7 +3,7 @@
   <groupId>leiningen-core</groupId>
   <artifactId>leiningen-core</artifactId>
   <packaging>jar</packaging>
-  <version>2.7.2-SNAPSHOT</version>
+  <version>2.8.0-SNAPSHOT</version>
   <name>leiningen-core</name>
   <description>Library for core functionality of Leiningen.</description>
   <url>https://github.com/technomancy/leiningen</url>
@@ -14,7 +14,7 @@
     </license>
   </licenses>
   <scm>
-    <tag>a441ba12ca9723d99e34da2d4aa3483cdf00331b
+    <tag>776090390c7c2ae4811e5a1996d7a581a7e7c8ea
 </tag>
     <url/>
   </scm>
@@ -48,7 +48,7 @@
     </repository>
     <repository>
       <id>clojars</id>
-      <url>https://repo.clojars.org/</url>
+      <url>https://clojars.org/repo/</url>
       <snapshots>
         <enabled>true</enabled>
       </snapshots>
@@ -72,8 +72,8 @@
       <version>0.2.8</version>
       <exclusions>
         <exclusion>
-          <artifactId>dynapath</artifactId>
           <groupId>org.tcrawley</groupId>
+          <artifactId>dynapath</artifactId>
         </exclusion>
       </exclusions>
     </dependency>

diff --git a/leiningen-core/project.clj b/leiningen-core/project.clj
@@ -1,4 +1,4 @@
-(defproject leiningen-core "2.7.2-SNAPSHOT"
+(defproject leiningen-core "2.8.0-SNAPSHOT"
   :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,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.7.2-SNAPSHOT"
+(defproject leiningen "2.8.0-SNAPSHOT"
   :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.7.2-SNAPSHOT"]
+  :dependencies [[leiningen-core "2.8.0-SNAPSHOT"]
                  ;; needed for pom
                  [org.clojure/data.xml "0.0.8"]
                  ;; needed for test