From b818b0de1104ca1bee6afeeec86c12c4ce466951 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Thu, 22 Nov 2018 05:27:58 +0100
Subject: [PATCH] Enable all ant subpackages including junit5

Resolves: rhbz#1631451
---
 ant.yaml    | 156 +++++++++++++++++++++++++++++++++++++++++++++++++---
 koschei.cfg |  21 ++++++-
 2 files changed, 168 insertions(+), 9 deletions(-)

diff --git a/ant.yaml b/ant.yaml
index cc0131b..f0fa22b 100644
--- a/ant.yaml
+++ b/ant.yaml
@@ -28,8 +28,6 @@ data:
     api:
         rpms:
             - ant
-    filter:
-        rpms:
             - ant-antlr
             - ant-apache-bcel
             - ant-apache-bsf
@@ -40,24 +38,166 @@ data:
             - ant-apache-xalan2
             - ant-commons-logging
             - ant-commons-net
-            - ant-javadoc
             - ant-javamail
             - ant-jdepend
             - ant-jmf
             - ant-jsch
             - ant-junit
-            - ant-manual
+            - ant-junit5
             - ant-swing
             - ant-testutil
             - ant-xz
-    buildopts:
+    filter:
         rpms:
-            macros: |
-                %_without_junit5 1
+            - ant-javadoc
+            - ant-manual
+            - antlr-C++
+            - antlr-javadoc
+            - antlr-manual
+            - apache-commons-logging-javadoc
+            - apache-commons-net-javadoc
+            - bcel-javadoc
+            - bsf-javadoc
+            - hamcrest
+            - hamcrest-demo
+            - hamcrest-javadoc
+            - jakarta-oro-javadoc
+            - javamail-javadoc
+            - jdepend-demo
+            - jdepend-javadoc
+            - jsch-javadoc
+            - junit-javadoc
+            - junit-manual
+            - junit5-guide
+            - junit5-javadoc
+            - jzlib-demo
+            - jzlib-javadoc
+            - log4j12-javadoc
+            - regexp-javadoc
+            - xalan-j2-demo
+            - xalan-j2-javadoc
+            - xalan-j2-manual
+            - xalan-j2-xsltc
+            - xerces-j2-demo
+            - xerces-j2-javadoc
+            - xml-commons-apis-javadoc
+            - xml-commons-apis-manual
+            - xml-commons-resolver-javadoc
+            - xz-java-javadoc
     components:
         rpms:
             ant:
-                buildorder: 10
+                buildorder: 40
                 ref: javapackages
                 rationale: >
                     Module API.
+            antlr:
+                buildorder: 10
+                ref: javapackages
+                rationale: >
+                    Runtime dependency of ant.
+            apache-commons-logging:
+                buildorder: 10
+                ref: javapackages
+                rationale: >
+                    Runtime dependency of ant, bsf.
+            apache-commons-net:
+                buildorder: 10
+                ref: javapackages
+                rationale: >
+                    Runtime dependency of ant.
+            bcel:
+                buildorder: 10
+                ref: javapackages
+                rationale: >
+                    Runtime dependency of ant.
+            bsf:
+                buildorder: 20
+                ref: javapackages
+                rationale: >
+                    Runtime dependency of ant.
+            hamcrest:
+                buildorder: 10
+                ref: javapackages
+                rationale: >
+                    Runtime dependency of junit.
+            jakarta-oro:
+                buildorder: 10
+                ref: javapackages
+                rationale: >
+                    Runtime dependency of ant.
+            javamail:
+                buildorder: 10
+                ref: javapackages
+                rationale: >
+                    Runtime dependency of ant.
+            jdepend:
+                buildorder: 10
+                ref: javapackages
+                rationale: >
+                    Runtime dependency of ant.
+            jsch:
+                buildorder: 20
+                ref: javapackages
+                rationale: >
+                    Runtime dependency of ant.
+            junit:
+                buildorder: 20
+                ref: javapackages
+                rationale: >
+                    Runtime dependency of ant, junit5.
+            junit5:
+                buildorder: 30
+                ref: javapackages
+                rationale: >
+                    Runtime dependency of ant.
+            jzlib:
+                buildorder: 10
+                ref: javapackages
+                rationale: >
+                    Runtime dependency of jsch.
+            log4j12:
+                buildorder: 10
+                ref: javapackages
+                rationale: >
+                    Runtime dependency of ant.
+            opentest4j:
+                buildorder: 10
+                ref: javapackages
+                rationale: >
+                    Runtime dependency of junit5.
+            regexp:
+                buildorder: 10
+                ref: javapackages
+                rationale: >
+                    Runtime dependency of ant.
+            univocity-parsers:
+                buildorder: 10
+                ref: javapackages
+                rationale: >
+                    Runtime dependency of junit5.
+            xalan-j2:
+                buildorder: 30
+                ref: javapackages
+                rationale: >
+                    Runtime dependency of ant.
+            xerces-j2:
+                buildorder: 20
+                ref: javapackages
+                rationale: >
+                    Runtime dependency of xalan-j2.
+            xml-commons-apis:
+                buildorder: 10
+                ref: javapackages
+                rationale: >
+                    Runtime dependency of xalan-j2, xerces-j2.
+            xml-commons-resolver:
+                buildorder: 10
+                ref: javapackages
+                rationale: >
+                    Runtime dependency of ant, xerces-j2.
+            xz-java:
+                buildorder: 10
+                ref: javapackages
+                rationale: >
+                    Runtime dependency of ant.
diff --git a/koschei.cfg b/koschei.cfg
index 5b1daf7..610d3c2 100644
--- a/koschei.cfg
+++ b/koschei.cfg
@@ -3,6 +3,7 @@
 config = {
     "buildrequires": [
         "javapackages-tools",
+        "platform",
     ],
     "requires": [
         "platform",
@@ -18,6 +19,25 @@ config = {
 
     "api": [
         "ant",
+        "ant-antlr",
+        "ant-apache-bcel",
+        "ant-apache-bsf",
+        "ant-apache-log4j",
+        "ant-apache-oro",
+        "ant-apache-regexp",
+        "ant-apache-resolver",
+        "ant-apache-xalan2",
+        "ant-commons-logging",
+        "ant-commons-net",
+        "ant-javamail",
+        "ant-jdepend",
+        "ant-jmf",
+        "ant-jsch",
+        "ant-junit",
+        "ant-junit5",
+        "ant-swing",
+        "ant-testutil",
+        "ant-xz",
     ],
     "profiles": {
         "default": ["ant"],
@@ -43,7 +63,6 @@ config = {
     },
 
     "macros": {
-        "_without_junit5": 1,
     },
 
     "summary": "Java build tool",