Parcourir la source

Allow for updated SLF4J, hard code the version we want to stop "-bundle-slf4j" failing and producing useless jars

Update jgit-describe so that we can, well, describe

Change-Id: I0d440c63e55fd9922f89483d452887eebf9cb1d8
Reviewed-on: http://gerrit.dmdirc.com/2515
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager
tags/0.7rc1
Shane Mc Cormack il y a 12 ans
Parent
révision
acb2c203fb
2 fichiers modifiés avec 3 ajouts et 3 suppressions
  1. 1
    1
      build.xml
  2. 2
    2
      ivy.xml

+ 1
- 1
build.xml Voir le fichier

49
 
49
 
50
     <target name="-bundle-slf4j">
50
     <target name="-bundle-slf4j">
51
         <jar destfile="${dist.jar}" update="true">
51
         <jar destfile="${dist.jar}" update="true">
52
-            <zipfileset src="lib/slf4j-api-1.6.4.jar" includes="org/slf4j/**/*"/>
52
+            <zipfileset src="lib/slf4j-api-1.6.6.jar" includes="org/slf4j/**/*"/>
53
         </jar>
53
         </jar>
54
     </target>
54
     </target>
55
 
55
 

+ 2
- 2
ivy.xml Voir le fichier

11
     <dependencies>
11
     <dependencies>
12
         <dependency org="ant-contrib" name="ant-contrib" rev="1.0b3" conf="build->default" />
12
         <dependency org="ant-contrib" name="ant-contrib" rev="1.0b3" conf="build->default" />
13
         <dependency org="org.sourceforce.ant-nsis" name="ant-nsis" rev="1.3" conf="build->default" />
13
         <dependency org="org.sourceforce.ant-nsis" name="ant-nsis" rev="1.3" conf="build->default" />
14
-        <dependency org="com.github.shanemcc" name="jgit-describe" rev="0.2" conf="build->default" />
14
+        <dependency org="com.github.shanemcc" name="jgit-describe" rev="0.3.1" conf="build->default" />
15
         <dependency org="net.sourceforge.fikin-ant-tasks" name="ant-fikin" rev="1.7.3" conf="build->default" />
15
         <dependency org="net.sourceforge.fikin-ant-tasks" name="ant-fikin" rev="1.7.3" conf="build->default" />
16
 
16
 
17
-        <dependency org="org.slf4j" name="slf4j-api" rev="1.6.+" conf="compile->default" />
17
+        <dependency org="org.slf4j" name="slf4j-api" rev="1.6.6" conf="compile->default" />
18
         <dependency org="ch.qos.logback" name="logback-classic" rev="1.+" conf="test->default" />
18
         <dependency org="ch.qos.logback" name="logback-classic" rev="1.+" conf="test->default" />
19
 
19
 
20
         <dependency org="com.github.peichhorn" name="lombok-pg" rev="latest.release" conf="compile->default" />
20
         <dependency org="com.github.peichhorn" name="lombok-pg" rev="latest.release" conf="compile->default" />

Chargement…
Annuler
Enregistrer