From cc2f5a0813ce38e74bc07db0310b07bbe5fcefb1033d1f216b7d9c1d80e13875 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Fri, 9 Jun 2017 09:04:32 +0000
Subject: [PATCH] - Do not generate poms on ant core packages to reduce deps
 and   allow bootstrap

- Fix bootstrap to avoid new cycle bsc#1041966

- Do not generate poms on ant core packages to reduce deps and
  allow bootstrap

- Fix bootstrap to avoid new cycle bsc#1041966

- Do not generate poms on ant core packages to reduce deps and
  allow bootstrap

OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=85
---
 ant-antlr.changes | 11 +++++++++++
 ant-antlr.spec    | 38 ++++++++++++++++++++++----------------
 ant-junit.changes | 11 +++++++++++
 ant-junit.spec    | 38 ++++++++++++++++++++++----------------
 ant.changes       |  6 ++++++
 ant.spec          | 32 ++++++++++++++++++--------------
 6 files changed, 90 insertions(+), 46 deletions(-)

diff --git a/ant-antlr.changes b/ant-antlr.changes
index 5fd7775..a1904aa 100644
--- a/ant-antlr.changes
+++ b/ant-antlr.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Jun  9 09:05:31 UTC 2017 - tchvatal@suse.com
+
+- Do not generate poms on ant core packages to reduce deps and
+  allow bootstrap
+
+-------------------------------------------------------------------
+Wed May 31 13:35:49 UTC 2017 - tchvatal@suse.com
+
+- Fix bootstrap to avoid new cycle bsc#1041966
+
 -------------------------------------------------------------------
 Fri May 19 08:08:28 UTC 2017 - tchvatal@suse.com
 
diff --git a/ant-antlr.spec b/ant-antlr.spec
index e01dd03..a0f6179 100644
--- a/ant-antlr.spec
+++ b/ant-antlr.spec
@@ -45,15 +45,19 @@ Patch1:         apache-ant-class-path-in-manifest.patch
 Patch3:         reproducible.patch
 %if %{with bootstrap}
 BuildRequires:  java-1_5_0-gcj-compat-devel
-#!BuildIgnore:  java-1_6_0-openjdk java-1_6_0-openjdk-devel
-#!BuildIgnore:  java-1_7_0-openjdk java-1_7_0-openjdk-devel
+#!BuildIgnore:  java-1_6_0-openjdk java-1_6_0-openjdk-devel java-1_6_0-openjdk-headless
+#!BuildIgnore:  java-1_7_0-openjdk java-1_7_0-openjdk-devel java-1_7_0-openjdk-headless
+#!BuildIgnore:  java-1_8_0-openjdk java-1_8_0-openjdk-devel java-1_8_0-openjdk-headless
+#!BuildIgnore:  java-9-openjdk java-9-openjdk-devel java-9-openjdk-headless
 %else
 BuildRequires:  java-devel >= 1.5.0
 %endif
 BuildRequires:  antlr-bootstrap
 BuildRequires:  javapackages-tools
 # Needed for maven conversions
+%if !%{with bootstrap}
 BuildRequires:  javapackages-local
+%endif
 BuildRequires:  unzip
 #BuildRequires:  xerces-j2-bootstrap
 #!BuildIgnore: xerces-j2-bootstrap
@@ -457,15 +461,17 @@ do
   [ $jarname == ant-bootstrap ] && continue
 
   #install pom
+%if !%{with bootstrap}
   install -m 644 src/etc/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname}
   echo %%add_maven_depmap "${pomname}" "${destname}${jarname}.jar"
   %add_maven_depmap ${pomname} ${destname}${jarname}.jar
+%endif
 done
 
 %if %{with bootstrap}
 #ant-parent pom
-install -m 644 src/etc/poms/pom.xml %{buildroot}/%{_mavenpomdir}/JPP-ant-parent.pom
-%add_maven_depmap JPP-ant-parent.pom
+#install -m 644 src/etc/poms/pom.xml %{buildroot}/%{_mavenpomdir}/JPP-ant-parent.pom
+#%add_maven_depmap JPP-ant-parent.pom
 
 # scripts: remove dos and os/2 scripts
 rm -f src/script/*.bat
@@ -566,15 +572,15 @@ find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \
 %{ant_home}/lib/ant-bootstrap.jar
 %{ant_home}/lib/ant-launcher.jar
 %dir %{_sysconfdir}/ant.d
-%{_mavenpomdir}/JPP-ant-launcher.pom
-%{_mavenpomdir}/JPP-ant-parent.pom
-%{_mavenpomdir}/JPP-ant.pom
-%if %{?suse_version} > 1320
-%{_datadir}/maven-metadata/ant.xml
-%else
-%config(noreplace) %{_mavendepmapfragdir}/ant
-%endif
-%dir %{_mavenpomdir}
+#%{_mavenpomdir}/JPP-ant-launcher.pom
+#%{_mavenpomdir}/JPP-ant-parent.pom
+#%{_mavenpomdir}/JPP-ant.pom
+#%if %{?suse_version} > 1320
+#%{_datadir}/maven-metadata/ant.xml
+#%else
+#%config(noreplace) %{_mavendepmapfragdir}/ant
+#%endif
+#%dir %{_mavenpomdir}
 
 %endif
 %if %{with antlr}
@@ -618,15 +624,15 @@ find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \
 %{_javadir}/ant/ant-jmf.jar
 %{ant_home}/lib/ant-jmf.jar
 %config(noreplace) %{_sysconfdir}/ant.d/jmf
-%{_mavenpomdir}/JPP.ant-ant-jmf.pom
+#%{_mavenpomdir}/JPP.ant-ant-jmf.pom
 
 %files -n ant-swing
 %defattr(0644,root,root,0755)
 %{_javadir}/ant/ant-swing.jar
 %{ant_home}/lib/ant-swing.jar
 %config(noreplace) %{_sysconfdir}/ant.d/swing
-%{_mavenpomdir}/JPP.ant-ant-swing.pom
-%dir %{_mavenpomdir}
+#%{_mavenpomdir}/JPP.ant-ant-swing.pom
+#%dir %{_mavenpomdir}
 
 %files -n ant-scripts
 %defattr(0755,root,root,0755)
diff --git a/ant-junit.changes b/ant-junit.changes
index 5fd7775..a1904aa 100644
--- a/ant-junit.changes
+++ b/ant-junit.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Jun  9 09:05:31 UTC 2017 - tchvatal@suse.com
+
+- Do not generate poms on ant core packages to reduce deps and
+  allow bootstrap
+
+-------------------------------------------------------------------
+Wed May 31 13:35:49 UTC 2017 - tchvatal@suse.com
+
+- Fix bootstrap to avoid new cycle bsc#1041966
+
 -------------------------------------------------------------------
 Fri May 19 08:08:28 UTC 2017 - tchvatal@suse.com
 
diff --git a/ant-junit.spec b/ant-junit.spec
index 9ac17aa..6af3cbb 100644
--- a/ant-junit.spec
+++ b/ant-junit.spec
@@ -45,15 +45,19 @@ Patch1:         apache-ant-class-path-in-manifest.patch
 Patch3:         reproducible.patch
 %if %{with bootstrap}
 BuildRequires:  java-1_5_0-gcj-compat-devel
-#!BuildIgnore:  java-1_6_0-openjdk java-1_6_0-openjdk-devel
-#!BuildIgnore:  java-1_7_0-openjdk java-1_7_0-openjdk-devel
+#!BuildIgnore:  java-1_6_0-openjdk java-1_6_0-openjdk-devel java-1_6_0-openjdk-headless
+#!BuildIgnore:  java-1_7_0-openjdk java-1_7_0-openjdk-devel java-1_7_0-openjdk-headless
+#!BuildIgnore:  java-1_8_0-openjdk java-1_8_0-openjdk-devel java-1_8_0-openjdk-headless
+#!BuildIgnore:  java-9-openjdk java-9-openjdk-devel java-9-openjdk-headless
 %else
 BuildRequires:  java-devel >= 1.5.0
 %endif
 BuildRequires:  antlr-bootstrap
 BuildRequires:  javapackages-tools
 # Needed for maven conversions
+%if !%{with bootstrap}
 BuildRequires:  javapackages-local
+%endif
 BuildRequires:  unzip
 #BuildRequires:  xerces-j2-bootstrap
 #!BuildIgnore: xerces-j2-bootstrap
@@ -457,15 +461,17 @@ do
   [ $jarname == ant-bootstrap ] && continue
 
   #install pom
+%if !%{with bootstrap}
   install -m 644 src/etc/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname}
   echo %%add_maven_depmap "${pomname}" "${destname}${jarname}.jar"
   %add_maven_depmap ${pomname} ${destname}${jarname}.jar
+%endif
 done
 
 %if %{with bootstrap}
 #ant-parent pom
-install -m 644 src/etc/poms/pom.xml %{buildroot}/%{_mavenpomdir}/JPP-ant-parent.pom
-%add_maven_depmap JPP-ant-parent.pom
+#install -m 644 src/etc/poms/pom.xml %{buildroot}/%{_mavenpomdir}/JPP-ant-parent.pom
+#%add_maven_depmap JPP-ant-parent.pom
 
 # scripts: remove dos and os/2 scripts
 rm -f src/script/*.bat
@@ -566,15 +572,15 @@ find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \
 %{ant_home}/lib/ant-bootstrap.jar
 %{ant_home}/lib/ant-launcher.jar
 %dir %{_sysconfdir}/ant.d
-%{_mavenpomdir}/JPP-ant-launcher.pom
-%{_mavenpomdir}/JPP-ant-parent.pom
-%{_mavenpomdir}/JPP-ant.pom
-%if %{?suse_version} > 1320
-%{_datadir}/maven-metadata/ant.xml
-%else
-%config(noreplace) %{_mavendepmapfragdir}/ant
-%endif
-%dir %{_mavenpomdir}
+#%{_mavenpomdir}/JPP-ant-launcher.pom
+#%{_mavenpomdir}/JPP-ant-parent.pom
+#%{_mavenpomdir}/JPP-ant.pom
+#%if %{?suse_version} > 1320
+#%{_datadir}/maven-metadata/ant.xml
+#%else
+#%config(noreplace) %{_mavendepmapfragdir}/ant
+#%endif
+#%dir %{_mavenpomdir}
 
 %endif
 %if %{with antlr}
@@ -618,15 +624,15 @@ find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \
 %{_javadir}/ant/ant-jmf.jar
 %{ant_home}/lib/ant-jmf.jar
 %config(noreplace) %{_sysconfdir}/ant.d/jmf
-%{_mavenpomdir}/JPP.ant-ant-jmf.pom
+#%{_mavenpomdir}/JPP.ant-ant-jmf.pom
 
 %files -n ant-swing
 %defattr(0644,root,root,0755)
 %{_javadir}/ant/ant-swing.jar
 %{ant_home}/lib/ant-swing.jar
 %config(noreplace) %{_sysconfdir}/ant.d/swing
-%{_mavenpomdir}/JPP.ant-ant-swing.pom
-%dir %{_mavenpomdir}
+#%{_mavenpomdir}/JPP.ant-ant-swing.pom
+#%dir %{_mavenpomdir}
 
 %files -n ant-scripts
 %defattr(0755,root,root,0755)
diff --git a/ant.changes b/ant.changes
index ad90f4b..a1904aa 100644
--- a/ant.changes
+++ b/ant.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jun  9 09:05:31 UTC 2017 - tchvatal@suse.com
+
+- Do not generate poms on ant core packages to reduce deps and
+  allow bootstrap
+
 -------------------------------------------------------------------
 Wed May 31 13:35:49 UTC 2017 - tchvatal@suse.com
 
diff --git a/ant.spec b/ant.spec
index 6e911ac..e519c4c 100644
--- a/ant.spec
+++ b/ant.spec
@@ -54,7 +54,9 @@ BuildRequires:  java-devel >= 1.5.0
 BuildRequires:  antlr-bootstrap
 BuildRequires:  javapackages-tools
 # Needed for maven conversions
+%if !%{with bootstrap}
 BuildRequires:  javapackages-local
+%endif
 BuildRequires:  unzip
 #BuildRequires:  xerces-j2-bootstrap
 #!BuildIgnore: xerces-j2-bootstrap
@@ -458,15 +460,17 @@ do
   [ $jarname == ant-bootstrap ] && continue
 
   #install pom
+%if !%{with bootstrap}
   install -m 644 src/etc/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname}
   echo %%add_maven_depmap "${pomname}" "${destname}${jarname}.jar"
   %add_maven_depmap ${pomname} ${destname}${jarname}.jar
+%endif
 done
 
 %if %{with bootstrap}
 #ant-parent pom
-install -m 644 src/etc/poms/pom.xml %{buildroot}/%{_mavenpomdir}/JPP-ant-parent.pom
-%add_maven_depmap JPP-ant-parent.pom
+#install -m 644 src/etc/poms/pom.xml %{buildroot}/%{_mavenpomdir}/JPP-ant-parent.pom
+#%add_maven_depmap JPP-ant-parent.pom
 
 # scripts: remove dos and os/2 scripts
 rm -f src/script/*.bat
@@ -567,15 +571,15 @@ find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \
 %{ant_home}/lib/ant-bootstrap.jar
 %{ant_home}/lib/ant-launcher.jar
 %dir %{_sysconfdir}/ant.d
-%{_mavenpomdir}/JPP-ant-launcher.pom
-%{_mavenpomdir}/JPP-ant-parent.pom
-%{_mavenpomdir}/JPP-ant.pom
-%if %{?suse_version} > 1320
-%{_datadir}/maven-metadata/ant.xml
-%else
-%config(noreplace) %{_mavendepmapfragdir}/ant
-%endif
-%dir %{_mavenpomdir}
+#%{_mavenpomdir}/JPP-ant-launcher.pom
+#%{_mavenpomdir}/JPP-ant-parent.pom
+#%{_mavenpomdir}/JPP-ant.pom
+#%if %{?suse_version} > 1320
+#%{_datadir}/maven-metadata/ant.xml
+#%else
+#%config(noreplace) %{_mavendepmapfragdir}/ant
+#%endif
+#%dir %{_mavenpomdir}
 
 %endif
 %if %{with antlr}
@@ -619,15 +623,15 @@ find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \
 %{_javadir}/ant/ant-jmf.jar
 %{ant_home}/lib/ant-jmf.jar
 %config(noreplace) %{_sysconfdir}/ant.d/jmf
-%{_mavenpomdir}/JPP.ant-ant-jmf.pom
+#%{_mavenpomdir}/JPP.ant-ant-jmf.pom
 
 %files -n ant-swing
 %defattr(0644,root,root,0755)
 %{_javadir}/ant/ant-swing.jar
 %{ant_home}/lib/ant-swing.jar
 %config(noreplace) %{_sysconfdir}/ant.d/swing
-%{_mavenpomdir}/JPP.ant-ant-swing.pom
-%dir %{_mavenpomdir}
+#%{_mavenpomdir}/JPP.ant-ant-swing.pom
+#%dir %{_mavenpomdir}
 
 %files -n ant-scripts
 %defattr(0755,root,root,0755)