Update to slf4j 1.6.6 and log4j 1.2.17

James Moger

2012-07-11 d00a0ca46fcde3e3e580afea6a548b9c12aeac25

 build.xml

@@ -117,7 +117,7 @@


      <delete dir="${project.build.dir}" />

      <mkdir dir="${project.build.dir}" />

      <javac debug="true" srcdir="${basedir}/src" destdir="${project.build.dir}">

      <javac debug="true" srcdir="${basedir}/src" destdir="${project.build.dir}" includeantruntime="false">

         <include name="com/gitblit/build/Build.java" />         

         <include name="com/gitblit/Constants.java" />

         <include name="com/gitblit/utils/StringUtils.java" />         

@@ -131,7 +131,7 @@
         </fileset>

         <pathelement path="${project.build.dir}" />            

      </path>

      <javac debug="true" destdir="${project.build.dir}" failonerror="false">

      <javac debug="true" destdir="${project.build.dir}" failonerror="false" includeantruntime="false">

         <src path="${basedir}/src" />

         <classpath refid="master-classpath" />

      </javac>

@@ -203,6 +203,8 @@
         <fileset dir="${basedir}/groovy">

            <include name="sendmail.groovy" />

            <include name="jenkins.groovy" />

            <include name="protect-refs.groovy" />

            <include name="localclone.groovy" />

         </fileset>

      </copy>

   

@@ -227,9 +229,8 @@
         <copy todir="${docs.output.dir}">

            <!-- Copy selected Gitblit resources -->

            <fileset dir="${project.resources.dir}">

               <include name="bootstrap.140.css" />

               <include name="bootstrap.gb.css" />

               <include name="markdown.css" />

               <include name="bootstrap/**/*" />

               <include name="gitblit.css" />

               <include name="gitblt_25_white.png" />

               <include name="gitblt-favicon.png" />

               <include name="lock_go_16x16.png" />

@@ -371,6 +372,8 @@
         <fileset dir="${basedir}/groovy">

            <include name="sendmail.groovy" />

            <include name="jenkins.groovy" />

            <include name="protect-refs.groovy" />

            <include name="localclone.groovy" />

         </fileset>

      </copy>



@@ -405,6 +408,7 @@
            <exclude name="jetty*.jar" />

            <exclude name="junit*.jar" />

            <exclude name="servlet*.jar" />

            <exclude name="javax.servlet*.jar" />

         </fileset>

      </copy>



@@ -416,6 +420,7 @@
            <exclude name="com/gitblit/tests/" />

            <exclude name="com/gitblit/build/**" />

            <exclude name="com/gitblit/client/**" />

            <exclude name="com/gitblit/AddIndexedBranch*.class" />

            <exclude name="com/gitblit/GitBlitServer*.class" />

            <exclude name="com/gitblit/Launcher*.class" />

            <exclude name="com/gitblit/MakeCertificate*.class" />

@@ -505,6 +510,7 @@
         <fileset dir="${basedir}/groovy">

            <include name="sendmail.groovy" />

            <include name="jenkins.groovy" />

            <include name="protect-refs.groovy" />

         </fileset>

      </copy>

               

@@ -540,12 +546,12 @@
            <exclude name="jetty*.jar" />

            <exclude name="junit*.jar" />

            <exclude name="servlet*.jar" />

            <exclude name="javax.servlet*.jar" />

         </fileset>

      </copy>



      <!-- Gitblit classes -->

      <mkdir dir="${deployments.root}/WEB-INF/classes"/>

      <copy todir="${deployments.root}/WEB-INF/classes">

      <jar destfile="${deployments.root}/WEB-INF/lib/gitblit-${gb.version}.jar">

         <fileset dir="${project.build.dir}">

            <exclude name="WEB-INF/" />

            <exclude name="com/gitblit/tests/" />

@@ -555,7 +561,7 @@
            <exclude name="com/gitblit/Launcher*.class" />

            <exclude name="com/gitblit/MakeCertificate*.class" />

         </fileset>

      </copy>

      </jar>



      <!-- Build Express Zip file -->

      <zip destfile="${express.zipfile}">

@@ -577,7 +583,9 @@
         <resource file="${basedir}/src/com/gitblit/client/splash.png" />

         <resource file="${basedir}/resources/gitblt-favicon.png" />

         <resource file="${basedir}/resources/gitweb-favicon.png" />

         <resource file="${basedir}/resources/git-orange-16x16.png" />

         <resource file="${basedir}/resources/user_16x16.png" />

         <resource file="${basedir}/resources/users_16x16.png" />

         <resource file="${basedir}/resources/settings_16x16.png" />

         <resource file="${basedir}/resources/lock_go_16x16.png" />

         <resource file="${basedir}/resources/lock_pull_16x16.png" />

@@ -594,6 +602,7 @@
         <resource file="${basedir}/resources/commit_merge_16x16.png" />

         <resource file="${basedir}/resources/blank.png" />

         <resource file="${basedir}/src/com/gitblit/wicket/GitBlitWebApp.properties" />

         <resource file="${basedir}/src/com/gitblit/wicket/GitBlitWebApp_ja.properties" />



         <class name="com.gitblit.client.GitblitManagerLauncher" />

         <classfilter>

@@ -709,9 +718,8 @@
      <copy todir="${project.site.dir}">

         <!-- Copy selected Gitblit resources -->

         <fileset dir="${project.resources.dir}">

            <include name="bootstrap.140.css" />

            <include name="bootstrap.gb.css" />

            <include name="markdown.css" />

            <include name="bootstrap/**/*" />

            <include name="gitblit.css" />

            <include name="gitblt_25_white.png" />

            <include name="gitblt-favicon.png" />

            <include name="lock_go_16x16.png" />

@@ -883,7 +891,7 @@
      Publish binaries to Google Code

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

   -->

   <target name="publishBinaries" depends="buildGO,buildWAR,buildExpress,buildFederationClient,buildManager" description="Publish the Gitblit binaries to Google Code">

   <target name="publishBinaries" depends="buildGO,buildWAR,buildExpress,buildFederationClient,buildManager,buildApiLibrary" description="Publish the Gitblit binaries to Google Code">



      <echo>Uploading Gitblit ${gb.version} binaries</echo>



@@ -982,4 +990,4 @@
      <delete dir="${project.war.dir}" />

      <delete dir="${project.deploy.dir}" />

   </target>

</project>
</project>