Prepare 1.2.1 release

diff --git a/build.xml b/build.xml
index 5fe08df14b824f8da57d0d03dc04c52c49d169ef..f60dcef45ff8789376bc9600213363fa0a48d962 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -1171,7 +1171,7 @@
                <java classpath="${project.build.dir}" classname="com.gitblit.build.BuildGhPages">\r
                        <classpath refid="master-classpath" />\r
                        <arg value="--sourceFolder" />\r
-                       <arg value="${basedir}/site" />\r
+                       <arg value="${basedir}/target/site" />\r
 \r
                        <arg value="--repository" />\r
                        <arg value="${basedir}" />\r
@@ -1195,7 +1195,7 @@
                         username="${googlecode.user}" \r
                         password="${googlecode.password}" \r
                         projectname="gitblit" \r
-                        filename="${distribution.zipfile}" \r
+                        filename="${project.target.dir}/${distribution.zipfile}" \r
                         targetfilename="gitblit-${gb.version}.zip"\r
                         summary="Gitblit GO v${gb.version} (standalone, integrated Gitblit server)"\r
                         labels="Featured, Type-Package, OpSys-All" />\r
@@ -1205,7 +1205,7 @@
                     username="${googlecode.user}" \r
                     password="${googlecode.password}" \r
                     projectname="gitblit" \r
-                    filename="${distribution.warfile}" \r
+                    filename="${project.target.dir}/${distribution.warfile}" \r
                     targetfilename="gitblit-${gb.version}.war"\r
                     summary="Gitblit WAR v${gb.version} (standard WAR webapp for servlet containers)"\r
                     labels="Featured, Type-Package, OpSys-All" />\r
@@ -1215,7 +1215,7 @@
                        username="${googlecode.user}" \r
                        password="${googlecode.password}" \r
                        projectname="gitblit" \r
-                       filename="${fedclient.zipfile}" \r
+                       filename="${project.target.dir}/${fedclient.zipfile}" \r
                        targetfilename="fedclient-${gb.version}.zip"\r
                        summary="Gitblit Federation Client v${gb.version} (command-line tool to clone data from federated Gitblit instances)"\r
                        labels="Featured, Type-Package, OpSys-All" />\r
@@ -1225,7 +1225,7 @@
                        username="${googlecode.user}" \r
                        password="${googlecode.password}" \r
                        projectname="gitblit" \r
-                       filename="${manager.zipfile}" \r
+                       filename="${project.target.dir}/${manager.zipfile}" \r
                        targetfilename="manager-${gb.version}.zip"\r
                        summary="Gitblit Manager v${gb.version} (Swing tool to remotely administer a Gitblit server)"\r
                        labels="Featured, Type-Package, OpSys-All" />\r
@@ -1235,7 +1235,7 @@
                        username="${googlecode.user}" \r
                        password="${googlecode.password}" \r
                        projectname="gitblit" \r
-                       filename="${gbapi.zipfile}" \r
+                       filename="${project.target.dir}/${gbapi.zipfile}" \r
                        targetfilename="gbapi-${gb.version}.zip"\r
                        summary="Gitblit API Library v${gb.version} (JSON RPC library to integrate with your software)"\r
                        labels="Featured, Type-Package, OpSys-All" />\r
@@ -1245,7 +1245,7 @@
                        username="${googlecode.user}" \r
                        password="${googlecode.password}" \r
                        projectname="gitblit" \r
-                       filename="${express.zipfile}" \r
+                       filename="${project.target.dir}/${express.zipfile}" \r
                        targetfilename="express-${gb.version}.zip"\r
                        summary="Gitblit Express v${gb.version} (run Gitblit on RedHat's OpenShift cloud)"\r
                        labels="Featured, Type-Package, OpSys-All" />\r

diff --git a/src/com/gitblit/Constants.java b/src/com/gitblit/Constants.java
index ca55118442a0e03e557326d6fcb9a923a55ef1d7..9063aabdd32b953f6ae4b80912e9468db276b8f9 100644 (file)
--- a/src/com/gitblit/Constants.java
+++ b/src/com/gitblit/Constants.java
@@ -34,11 +34,11 @@ public class Constants {
 \r
        // The build script extracts this exact line so be careful editing it\r
        // and only use A-Z a-z 0-9 .-_ in the string.\r
-       public static final String VERSION = "1.2.1-SNAPSHOT";\r
+       public static final String VERSION = "1.2.1";\r
 \r
        // The build script extracts this exact line so be careful editing it\r
        // and only use A-Z a-z 0-9 .-_ in the string.\r
-       public static final String VERSION_DATE = "PENDING";\r
+       public static final String VERSION_DATE = "2012-01-15";\r
 \r
        // The build script extracts this exact line so be careful editing it\r
        // and only use A-Z a-z 0-9 .-_ in the string.\r