Remove GitBlit static singleton reference from localclone.groovy

James Moger

2014-05-23 11eb4b51accebf8a163e8f46f99b067eda80f7b9

 build.xml

@@ -52,7 +52,7 @@
      <property name="maven.directory" value="${basedir}/../gitblit-maven" />



      <!-- Download links -->

      <property name="gc.url" value="http://dl.bintray.com/jamesmoger/generic/" />

      <property name="gc.url" value="http://dl.bintray.com/gitblit/releases/" />

   </target>



   

@@ -611,17 +611,14 @@
               <divider />

               <link name="API Library" src="${gc.url}gbapi-${project.releaseVersion}.zip" />

               <divider />

               <link name="Bintray (1.4.0+)" src="https://bintray.com/jamesmoger/generic/Gitblit" />

               <link name="Bintray (1.4.0+)" src="https://bintray.com/gitblit/releases/gitblit" />

               <link name="GoogleCode (pre-1.4.0)" src="https://code.google.com/p/gitblit/downloads/list?can=1" />

               <divider />

               <link name="Maven Repository" src="${project.mavenUrl}" />

            </menu>

            

            <menu name="links">

               <link name="Gitblit Demo (RELEASE)" src="https://demo-gitblit.rhcloud.com" />

               <link name="Gitblit Next (SNAPSHOT)" src="https://next-gitblit.rhcloud.com" />

               <divider />

               <link name="Gitblit (Self-Hosted)" src="https://dev.gitblit.com" />

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

               <divider />

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

               <divider />

@@ -917,8 +914,7 @@
                  <page name="older releases" src="releasehistory.mkd" />

               </menu>

               <menu name="links">

                  <link name="Gitblit Demo (RELEASE)" src="https://demo-gitblit.rhcloud.com" />

                  <link name="Gitbilt Next (SNAPSHOT)" src="https://next-gitblit.rhcloud.com" />

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

                  <divider />

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

                  <divider />

@@ -1009,7 +1005,7 @@
      <sequential>

         <echo>uploading @{source} to Bintray</echo>

         <exec executable="curl">

            <arg line="--silent --show-error -T @{source} -u${bintray.username}:${bintray.apikey} https://api.bintray.com/content/${bintray.username}/generic/${project.name}/${project.version}/@{target}"></arg>

            <arg line="--silent --show-error -T @{source} -u${bintray.username}:${bintray.apikey} https://api.bintray.com/content/gitblit/releases/gitblit/${project.version}/@{target}"></arg>

         </exec>

      </sequential>

   </macrodef>

@@ -1021,13 +1017,23 @@
   -->

   <target name="installMaven" depends="compile" description="Install Gitblit JAR as Maven module">

      <local name="project.jar" />

      <property name="project.jar" value="${project.outputDirectory}/gitblit.jar" />

      <property name="project.jar" value="${project.outputDirectory}/${project.artifactId}.jar" />

      <property name="resourceFolderPrefix" value="" />

      <mx:jar destfile="${project.jar}" includeresources="true" resourceFolderPrefix="${resourceFolderPrefix}" />

      <mx:jar destfile="${project.jar}" packageSources="true" includeresources="true" resourceFolderPrefix="${resourceFolderPrefix}" />



      <!-- Install Binary jar -->

      <exec executable="mvn">

         <arg value="install:install-file" />

         <arg value="-Dfile=${project.jar}" />

         <arg value="-DpomFile=${basedir}/pom.xml" />

         <arg value="-DcreateChecksum=true" />

      </exec>

		
      <!-- Install Sources  jar -->

      <exec executable="mvn">

         <arg value="install:install-file" />

         <arg value="-Dfile=${project.outputDirectory}/${project.artifactId}-sources.jar" />

         <arg value="-Dclassifier=sources" />

         <arg value="-DpomFile=${basedir}/pom.xml" />

         <arg value="-DcreateChecksum=true" />

      </exec>

@@ -1045,7 +1051,7 @@
   <target name="uploadMaven" depends="compile" description="Upload Gitblit JAR to remote Maven repository">

      <local name="project.jar" />

      <property name="project.jar" value="${project.outputDirectory}/gitblit.jar" />

      <mx:jar destfile="${project.jar}" includeresources="true" />

      <mx:jar destfile="${project.jar}" packageSources="true" includeresources="true" />



      <exec executable="mvn">

         <arg value="deploy:deploy-file" />

@@ -1066,7 +1072,7 @@
      <local name="project.jar" />

      <property name="project.jar" value="${project.targetDirectory}/${project.artifactId}-${project.version}.jar" />

      <property name="resourceFolderPrefix" value="" />

      <mx:jar destfile="${project.jar}" includeresources="true" resourceFolderPrefix="${resourceFolderPrefix}" />

      <mx:jar destfile="${project.jar}" packageSources="true" includeresources="true" resourceFolderPrefix="${resourceFolderPrefix}" />



      <mx:install />

   </target>