Browse Source

Use jgit-describe from nexus.

Change-Id: I6f4d1aba1cd9499caa3f865ed912f7780422e230
Reviewed-on: http://gerrit.dmdirc.com/3907
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager
pull/1/head
Chris Smith 9 years ago
parent
commit
1444b52edd
3 changed files with 3 additions and 13 deletions
  1. 1
    6
      etc/ivy/ivysettings.xml
  2. 0
    6
      etc/ivy/jgit-describe/ivy.xml
  3. 2
    1
      ivy.xml

+ 1
- 6
etc/ivy/ivysettings.xml View File

@@ -15,11 +15,6 @@
15 15
             <artifact pattern="https://cloud.github.com/downloads/dreese/nsis-ant/nsisant-[revision].jar"/>
16 16
         </url>
17 17
 
18
-        <url name="jgit-describe">
19
-            <ivy pattern="file:///${basedir}/etc/ivy/[module]/ivy.xml"/>
20
-            <artifact pattern="http://shanemcc.github.com/jgit-describe/releases/jgit-describe-[revision].jar"/>
21
-        </url>
22
-
23 18
         <packager name="packager" buildRoot="${user.home}/.ivy2/packager/build" resourceCache="${user.home}/.ivy2/packager/cache" preserveBuildDirectories="true">
24 19
             <ivy pattern="file:///${basedir}/etc/ivy/[module]/ivy.xml"/>
25 20
             <artifact pattern="file:///${basedir}/etc/ivy/[module]/packager.xml"/>
@@ -27,7 +22,7 @@
27 22
     </resolvers>
28 23
     <modules>
29 24
         <module organisation="org.sourceforce.ant-nsis" name="ant-nsis" resolver="ant-nsis"/>
30
-        <module organisation="com.github.shanemcc" name="jgit-describe" resolver="jgit-describe"/>
25
+        <module organisation="com.github.shanemcc" name="jgit-describe" resolver="dmdirc-thirdparty"/>
31 26
         <module organisation="net.sourceforge.fikin-ant-tasks" name="ant-fikin" resolver="packager"/>
32 27
         <module organisation="org.eclipse.jgit" name="*" resolver="jgit"/>
33 28
         <module organisation="net.miginfocom" name="*" resolver="dmdirc-thirdparty"/>

+ 0
- 6
etc/ivy/jgit-describe/ivy.xml View File

@@ -1,6 +0,0 @@
1
-<ivy-module version="2.0">
2
-    <info organisation="com.github.shanemcc" module="jgit-describe"/>
3
-    <dependencies>
4
-        <dependency org="org.eclipse.jgit" name="org.eclipse.jgit" rev="latest.integration" conf="default" />
5
-    </dependencies>
6
-</ivy-module>

+ 2
- 1
ivy.xml View File

@@ -17,7 +17,8 @@
17 17
     <dependencies>
18 18
         <dependency org="ant-contrib" name="ant-contrib" rev="1.0b3" conf="build->default" />
19 19
         <dependency org="org.sourceforce.ant-nsis" name="ant-nsis" rev="1.3" conf="build->default" />
20
-        <dependency org="com.github.shanemcc" name="jgit-describe" rev="0.4" conf="build->default" />
20
+        <dependency org="com.github.shanemcc" name="jgit-describe" rev="0.5" conf="build->default" />
21
+        <dependency org="org.eclipse.jgit" name="org.eclipse.jgit" rev="2.3.1.+" conf="build->default" />
21 22
         <dependency org="net.sourceforge.fikin-ant-tasks" name="ant-fikin" rev="1.7.3" conf="build->default" />
22 23
 
23 24
         <dependency org="org.slf4j" name="slf4j-api" rev="1.+" conf="main->default" />

Loading…
Cancel
Save