Merged #115 "Milestone names with hypens are trouble"

James Moger

2014-06-27 a1bf199ad6a9ebde4c0617ff1fc29ee0fc11c3a2

 build.xml

@@ -8,7 +8,7 @@
      documentation @ http://gitblit.github.io/moxie

      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

   -->

   <property name="moxie.version" value="0.9.2" />

   <property name="moxie.version" value="0.9.3" />

   <property name="moxie.url" value="http://gitblit.github.io/moxie/maven" />

   <property name="moxie.jar" value="moxie-toolkit-${moxie.version}.jar" />

   <property name="moxie.dir" value="${user.home}/.moxie" />

@@ -251,13 +251,10 @@
      <!-- Prepare the data directory -->

      <prepareDataDirectory toDir="${webinf}/data" />



      <!-- Copy the web.xml from the prototype web.xml -->

      <copy todir="${webinf}" overwrite="true">

         <fileset file="${project.src.dir}/WEB-INF/web.xml" />

         <filterset>

            <filter token="gb.version" value="${project.version}" />

         </filterset>

      </copy>

      <!-- Build the WAR web.xml from the prototype web.xml -->

      <mx:webxml sourcefile="${project.src.dir}/WEB-INF/web.xml" destfile="${webinf}/web.xml">

         <replace token="@gb.version@" value="${project.version}" />

      </mx:webxml>



      <!-- Gitblit jar -->

      <mx:jar destfile="${webinf}/lib/gitblit.jar" includeresources="false" />

@@ -560,6 +557,8 @@
               <divider />

               <link name="Gitblit GO (Docker)" src="https://registry.hub.docker.com/u/jmoger/gitblit/" />

               <divider />

               <link name="Plugins Registry" src="http://plugins.gitblit.com" />

               <divider />

               <link name="Gitblit Manager" src="${gc.url}manager-${project.releaseVersion}.zip" />

               <link name="Federation Client" src="${gc.url}fedclient-${project.releaseVersion}.zip" />

               <divider />

@@ -574,7 +573,7 @@
            <menu name="links">

               <link name="dev.gitblit.com (self-hosted)" src="https://dev.gitblit.com" />

               <divider />

               <link name="Plugin Registry" src="http://plugins.gitblit.com" />

               <link name="Plugins Registry" src="http://plugins.gitblit.com" />

               <divider />

               <link name="Github" src="${project.scmUrl}" />

               <link name="Issues" src="${project.issuesUrl}" />

@@ -778,16 +777,38 @@
         </filterset>

      </copy>

      <chmod file="${recipe}" perm="ugo+rx" />

   </target>



 
   <!--

      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
      Prepare for the next point release development cycle.

      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
   -->

   <target name="nextPointReleaseCycle" depends="prepare" description="prepare for the next point release development cycle">

      <!-- next cycle -->

      <mx:version stage="snapshot" incrementNumber="incremental" dryrun="${dryrun}" />

      <mx:commit showtitle="no">

          <message>Reset build identifiers for next development cycle</message>

          <message>Reset build identifiers for next point release cycle</message>

      </mx:commit>      

   </target>



      

   <!--

      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
      Prepare for the next minor release development cycle.

      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
   -->

   <target name="nextMinorReleaseCycle" depends="prepare" description="prepare for the next minor release development cycle">

      <!-- next cycle -->

      <mx:version stage="snapshot" incrementNumber="minor" dryrun="${dryrun}" />

      <mx:commit showtitle="no">

          <message>Reset build identifiers for next minor release cycle</message>

      </mx:commit>		
   </target>



	
  <!--

      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

      Build Gitblit Docs

      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

@@ -860,7 +881,7 @@
               <menu name="links">

                  <link name="dev.gitblit.com (self-hosted)" src="https://dev.gitblit.com" />

                  <divider />

                  <link name="Plugin Registry" src="http://plugins.gitblit.com" />

                  <link name="Plugins Registry" src="http://plugins.gitblit.com" />

                  <divider />

                  <link name="Github" src="${project.scmUrl}" />

                  <link name="Issues" src="${project.issuesUrl}" />