Changed version to 1.2 M1

zentuit · Jun 29, 2009 · 9c0f34c · 9c0f34c
1 parent 0b33481
commit 9c0f34c
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 8 deletions.
diff --git a/Grails.iml b/Grails.iml
@@ -146,5 +146,6 @@
       <root url="file://$MODULE_DIR$/../spring-framework-2.0/docs/api" />
     </javadoc-paths>
   </component>
+  <component name="libraryTable" />
 </module>
 
diff --git a/README b/README
@@ -1,4 +1,4 @@
-Grails, release 1.1.1 (May, 2009)
+Grails, release 1.2-M1 (June, 2009)
 -----------------------------------
 http://grails.org/
 

diff --git a/bin/startGrails.bat b/bin/startGrails.bat
@@ -106,7 +106,7 @@ set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line
-set STARTER_CLASSPATH=%GRAILS_HOME%\lib\groovy-all-1.6.3.jar;%GRAILS_HOME%\dist\grails-bootstrap-1.2-SNAPSHOT.jar
+set STARTER_CLASSPATH=%GRAILS_HOME%\lib\groovy-all-1.6.3.jar;%GRAILS_HOME%\dist\grails-bootstrap-1.2-M1.jar
 
 if exist "%USERPROFILE%/.groovy/init.bat" call "%USERPROFILE%/.groovy/init.bat"
 
@@ -127,7 +127,7 @@ set TOOLS_JAR=%JAVA_HOME%\lib\tools.jar
 if "%JAVA_OPTS%" == "" set JAVA_OPTS="-Xmx512m -XX:MaxPermSize=96m"
 set JAVA_OPTS=%JAVA_OPTS% -Dprogram.name="%PROGNAME%"
 set JAVA_OPTS=%JAVA_OPTS% -Dgrails.home="%GRAILS_HOME%"
-set JAVA_OPTS=%JAVA_OPTS% -Dgrails.version="1.2-SNAPSHOT"
+set JAVA_OPTS=%JAVA_OPTS% -Dgrails.version="1.2-M1"
 set JAVA_OPTS=%JAVA_OPTS% -Dbase.dir="."
 set JAVA_OPTS=%JAVA_OPTS% -Dtools.jar="%TOOLS_JAR%"
 set JAVA_OPTS=%JAVA_OPTS% -Dgroovy.starter.conf="%STARTER_CONF%"

diff --git a/build.properties b/build.properties
@@ -1,4 +1,4 @@
-grails.version=1.2-SNAPSHOT
+grails.version=1.2-M1
 grails.src.commons=src/commons
 grails.src.groovy=src/groovy
 

diff --git a/gradle.properties b/gradle.properties
@@ -1 +1 @@
-version = 1.2-SNAPSHOT
+version = 1.2-M1
diff --git a/grails.ipr b/grails.ipr
@@ -259,6 +259,7 @@
     <option name="FILTER_INFO" value="true" />
     <option name="CUSTOM_FILTER" />
   </component>
+  <component name="NewModuleRootManager" />
   <component name="Palette2">
     <group name="Swing">
       <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
@@ -570,7 +571,7 @@
     </library>
   </component>
   <UsedPathMacros>
-    <macro name="SPRING_DIR" description="" />
+    <macro name="SPRING_DIR" />
   </UsedPathMacros>
 </project>
 
diff --git a/src/grails/grails-macros.xml b/src/grails/grails-macros.xml
@@ -69,7 +69,7 @@
         <classpath>
           <pathelement location="@{cwd}"/>
           <pathelement location="${grails.home}/lib/groovy-all-1.6.0.jar"/>
-          <pathelement location="${grails.home}/dist/grails-bootstrap-1.2-SNAPSHOT.jar"/>
+          <pathelement location="${grails.home}/dist/grails-bootstrap-1.2-M1.jar"/>
           <extend-classpath/>
         </classpath>
         <arg line="--main org.codehaus.groovy.grails.cli.GrailsScriptRunner"/>

diff --git a/test/commons/grails/util/GrailsUtilTests.java b/test/commons/grails/util/GrailsUtilTests.java
@@ -53,7 +53,7 @@ public void testEnvironment() {
     }
 
     public void testGrailsVersion() {
-        assertEquals("1.2-SNAPSHOT", GrailsUtil.getGrailsVersion());
+        assertEquals("1.2-M1", GrailsUtil.getGrailsVersion());
     }
 
     protected void tearDown() throws Exception {