gnu: ant/java8: Rename to ant.

* gnu/packages/java.scm (ant): Rename to...
(ant/java7): ...this.
(ant/java8): Rename to...
(ant): ...this.
(java-qdox-1.12, java-jarjar, java-hamcrest-core, java-hamcrest-parent-pom)
(java-junit, java-org-ow2-parent-pom-1.3, java-asm-bootstrap): Rename
inputs accordingly.
* gnu/packages/axoloti.scm: Rename accordingly.
* gnu/packages/bioinformatics.scm: idem.
* gnu/packages/groovy.scm: idem.
* gnu/packages/java-maths.scm: idem.
* guix/build-system/ant.scm: idem.

Change-Id: I9d79ce8e351862747420fc2a58301b7f61212293

gnu/packages/axoloti.scm

@@ -341,7 +341,7 @@ runtime.")
        ("java-jgit" ,java-jgit-4.2)
        ("axoloti-runtime" ,axoloti-runtime)))
     (native-inputs
-     (list ant zip ; for repacking the jar
+     (list ant/java7 zip ; for repacking the jar
            unzip))
     (description
      "The Axoloti patcher offers a “patcher” environment similar to Pure Data
@@ -647,7 +647,7 @@ This package provides the runtime.")
        ("java-slf4j-api" ,java-slf4j-api)
        ("ksoloti-runtime" ,ksoloti-runtime)))
     (native-inputs
-     (list ant zip                      ;for repacking the jar
+     (list ant/java7 zip                      ;for repacking the jar
            unzip))
     (description
      "Ksoloti is an environment for generating and processing digital audio.

gnu/packages/bioinformatics.scm

@@ -9283,7 +9283,7 @@ VCF.")
        ;; [testng] Exception in thread "main" java.lang.NoClassDefFoundError: com/beust/jcommander/ParameterException
        #:tests? #f
        #:jdk ,icedtea-8
-       #:ant ,ant/java8
+       #:ant ,ant
        ;; This is only used for tests.
        #:make-flags
        (list "-Dsamjdk.intel_deflater_so_path=lib/jni/libIntelDeflater.so")
@@ -9353,7 +9353,7 @@ VCF.")
      (list java-snappy-1
            java-commons-jexl-2
            java-cofoja
-           ant/java8                    ;for bzip2 support at runtime
+           ant                          ;for bzip2 support at runtime
            zlib))
     (native-inputs
      `(("ant-apache-bcel" ,ant-apache-bcel)

gnu/packages/groovy.scm

@@ -412,7 +412,7 @@ similar to javadoc."))))
       (inherit base)
       (arguments
        `(;#:tests? #f;Requires spock-framework which is a circular dependency
-         #:ant ,ant/java8; ant is actually a dependency of this package, and we need 1.10
+         #:ant ,ant; ant is actually a dependency of this package, and we need 1.10
          ,@(substitute-keyword-arguments arguments
              ((#:phases phases)
               `(modify-phases ,phases

gnu/packages/java-maths.scm

@@ -75,7 +75,7 @@
     (inputs
      (list openblas))
     (native-inputs
-     `(("ant" ,ant)
+     `(("ant" ,ant/java7)
        ("ruby" ,ruby)                   ; for configure script
        ("gfortran" ,gfortran)
        ("jdk" ,icedtea "jdk")))

gnu/packages/java.scm

@@ -1964,7 +1964,7 @@ OpenJDK.")
     (home-page "https://www.jetbrains.com/")
     (license license:gpl2+)))
 
-(define-public ant/java8
+(define-public ant
   (package
     (name "ant")
     (version "1.10.15")
@@ -1983,7 +1983,7 @@ OpenJDK.")
     (build-system ant-build-system)
     (arguments
      (list
-      #:ant ant
+      #:ant ant/java7
       #:test-target "test"
       #:phases
       #~(modify-phases %standard-phases
@@ -2057,7 +2057,7 @@ build process and its dependencies, whereas Make uses Makefile format.")
 
 ;; The 1.9.x series is the last that can be built with GCJ.  The 1.10.x series
 ;; requires Java 8.
-(define-public ant
+(define-public ant/java7
   (package
     (name "ant")
     (version "1.9.15")
@@ -2143,10 +2143,10 @@ build process and its dependencies, whereas Make uses Makefile format.")
 
 (define-public ant-apache-bcel
   (package
-    (inherit ant/java8)
+    (inherit ant)
     (name "ant-apache-bcel")
     (arguments
-     (substitute-keyword-arguments (package-arguments ant/java8)
+     (substitute-keyword-arguments (package-arguments ant)
        ((#:phases phases)
         #~(modify-phases #$phases
             (add-after 'unpack 'link-bcel
@@ -2167,11 +2167,11 @@ build process and its dependencies, whereas Make uses Makefile format.")
                   (delete-file-recursively bin)
                   (delete-file-recursively lib))))))))
     (inputs
-     (modify-inputs (package-inputs ant/java8)
+     (modify-inputs (package-inputs ant)
        (prepend java-commons-bcel)))))
 
 (define-deprecated-package ant-junit
-  ant/java8)
+  ant)
 
 (define-public libantlr3c
   (package
@@ -3280,7 +3280,7 @@ is implemented.")
        #:jar-name "qdox.jar"
        ;; Explicitely use an ant version that includes the junit tasks, since
        ;; it is a dependency of junit.
-       #:ant ,ant
+       #:ant ,ant/java7
        #:phases
        (modify-phases %standard-phases
          (replace 'unpack
@@ -3391,7 +3391,7 @@ documentation tools.")
        #:build-target "jar"
        ;; Explicitely use an ant version that includes the junit tasks, since
        ;; it is a dependency of junit.
-       #:ant ,ant
+       #:ant ,ant/java7
        #:phases
        (modify-phases %standard-phases
          (add-before 'build 'do-not-use-bundled-asm
@@ -3492,7 +3492,7 @@ testing frameworks, mocking libraries and UI validation rules.")
      `(#:tests? #f ; Tests require junit
        ;; Explicitely use an ant version that includes the junit tasks, since
        ;; it is a dependency of junit.
-       #:ant ,ant
+       #:ant ,ant/java7
        #:modules ((guix build ant-build-system)
                   (guix build java-utils)
                   (guix build utils)
@@ -3580,7 +3580,7 @@ testing frameworks, mocking libraries and UI validation rules.")
      `(#:tests? #f
        ;; Explicitely use an ant version that includes the junit tasks, since
        ;; it is a dependency of junit.
-       #:ant ,ant
+       #:ant ,ant/java7
        #:phases
        (modify-phases %standard-phases
          (delete 'configure)
@@ -3645,7 +3645,7 @@ testing frameworks, mocking libraries and UI validation rules.")
        #:test-dir "src/test"
        ;; Explicitely use an ant version that includes the junit tasks, so
        ;; we can run the tests.
-       #:ant ,ant
+       #:ant ,ant/java7
        #:test-exclude (list "**/SimpleTest.java" "**/StackTracesTest.java"
                             "**/RuleChainTest.java" "**/TestWatchmanTest.java")
        #:phases
@@ -5163,7 +5163,7 @@ complex transformations and code analysis tools.")
      `(#:tests? #f
        ;; Explicitely use an ant version that includes the junit tasks, since
        ;; it is a dependency of junit.
-       #:ant ,ant
+       #:ant ,ant/java7
        #:phases
        (modify-phases %standard-phases
          (delete 'unpack)
@@ -5187,7 +5187,7 @@ including java-asm.")
      (substitute-keyword-arguments (package-arguments java-asm)
        ;; Explicitely use an ant version that includes the junit tasks, since
        ;; it is a dependency of junit.
-       ((#:ant _ ant) ant)
+       ((#:ant _ ant/java7) ant/java7)
        ((#:tests? _) #f)))
     (native-inputs `())))
 

guix/build-system/ant.scm

@@ -52,7 +52,7 @@
 
 (define (default-ant)
   "Return the default Ant package, resolved lazily."
-  (@* (gnu packages java) ant/java8))
+  (@* (gnu packages java) ant))
 
 (define (default-zip)
   "Return the default ZIP package, resolved lazily."