From d3839d53d5e7dfd32741f32815832830f0d42ae2 Mon Sep 17 00:00:00 2001
From: Alex Macdonald <almacdon@redhat.com>
Date: Nov 05 2018 17:29:31 +0000
Subject: [PATCH 1/10] fix spelling mistake in dd-plist tarball generation script filename


---

diff --git a/dd-plist/generate-ddp_tarball.sh b/dd-plist/generate-ddp_tarball.sh
new file mode 100755
index 0000000..dca1efe
--- /dev/null
+++ b/dd-plist/generate-ddp_tarball.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+wget https://github.com/3breadt/dd-plist/archive/dd-plist-1.21.tar.gz
+tar xzf dd-plist-1.21.tar.gz
+rm dd-plist-1.21.tar.gz
+mv dd-plist-dd-plist-1.21 dd-plist-1.21/
+tar czf dd-plist-1.21.tar.gz dd-plist-1.21/
+rm -r dd-plist-1.21
\ No newline at end of file
diff --git a/dd-plist/generate-ddp_tarbell.sh b/dd-plist/generate-ddp_tarbell.sh
deleted file mode 100755
index dca1efe..0000000
--- a/dd-plist/generate-ddp_tarbell.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-wget https://github.com/3breadt/dd-plist/archive/dd-plist-1.21.tar.gz
-tar xzf dd-plist-1.21.tar.gz
-rm dd-plist-1.21.tar.gz
-mv dd-plist-dd-plist-1.21 dd-plist-1.21/
-tar czf dd-plist-1.21.tar.gz dd-plist-1.21/
-rm -r dd-plist-1.21
\ No newline at end of file

From 0f2296fa9109c69ebe266ab8fe0d671e6e47cf5b Mon Sep 17 00:00:00 2001
From: Alex Macdonald <almacdon@redhat.com>
Date: Nov 05 2018 17:29:31 +0000
Subject: [PATCH 2/10] cleanup the jaf spec file


remove unrequired "BuildRequires" and format the description

---

diff --git a/jaf/jaf.spec b/jaf/jaf.spec
index 5063085..4e7e008 100644
--- a/jaf/jaf.spec
+++ b/jaf/jaf.spec
@@ -15,21 +15,22 @@ BuildArch:	noarch
 
 BuildRequires:	ee4j
 BuildRequires:	glassfish-hk2-maven-plugins
-BuildRequires:	java-openjdk
 BuildRequires:	javapackages-local
-BuildRequires:	junit
+BuildRequires:	maven-dependency-plugin
 BuildRequires:	maven-enforcer-plugin
 BuildRequires:	maven-local
 BuildRequires:	maven-plugin-build-helper
-BuildRequires:	maven-plugin-bundle maven-dependency-plugin
+BuildRequires:	maven-plugin-bundle
 BuildRequires:	maven-source-plugin
 
 Requires:	java-openjdk
 
-
 %description
-The JavaBeans Activation Framework (JAF) is a standard extension to the Java platform that lets you take advantage of standard services to: determine the type of an arbitrary piece of data; encapsulate access to it; discover the operations available on it; and instantiate the appropriate bean to perform the operation(s).
-
+The JavaBeans Activation Framework (JAF) is a standard extension to the
+Java platform that lets you take advantage of standard services to:
+determine the type of an arbitrary piece of data; encapsulate access to it;
+discover the operations available on it; and instantiate the appropriate
+bean to perform the operation(s).
 
 %prep
 %setup -q
@@ -48,15 +49,12 @@ cp -r %{_builddir}/%{name}-%{version}/activation/META-INF %{_builddir}/%{name}-%
 mkdir -p %{_builddir}/%{name}-%{version}/activationapi/target/classes
 cp -r %{_builddir}/%{name}-%{version}/activationapi/META-INF %{_builddir}/%{name}-%{version}/activationapi/target/classes/
 
-
 %build
 %mvn_build
 
-
 %install
 %mvn_install
 
-
 %files
 %license LICENSE.md
 %license NOTICE.md

From cdba3cea72ab466fc4265968740e6e8adf95a834 Mon Sep 17 00:00:00 2001
From: Alex Macdonald <almacdon@redhat.com>
Date: Nov 05 2018 17:29:31 +0000
Subject: [PATCH 3/10] cleanup the dd-plist spec


remove commented "BuildRequires" line

---

diff --git a/dd-plist/dd-plist.spec b/dd-plist/dd-plist.spec
index a713840..2e43ed6 100644
--- a/dd-plist/dd-plist.spec
+++ b/dd-plist/dd-plist.spec
@@ -12,7 +12,6 @@ Source0:    dd-plist-1.21.tar.gz
 BuildRequires:  javapackages-tools maven-local
 BuildRequires:  sonatype-oss-parent
 BuildRequires:  maven-assembly-plugin maven-plugin-bundle
-#BuildRequires:  maven-parent maven-plugin-plugin maven-javadoc-plugin
 
 Requires:   java-openjdk
 

From 5a0e8b146a60247b7e8c58062a628c67c5a2713f Mon Sep 17 00:00:00 2001
From: Alex Macdonald <almacdon@redhat.com>
Date: Nov 05 2018 17:29:31 +0000
Subject: [PATCH 4/10] cleanup the fix-info-plist-maven-plugin spec


formatted the description

---

diff --git a/fix-info-plist-maven-plugin/fix-info-plist-maven-plugin.spec b/fix-info-plist-maven-plugin/fix-info-plist-maven-plugin.spec
index ae2170b..5d928ec 100644
--- a/fix-info-plist-maven-plugin/fix-info-plist-maven-plugin.spec
+++ b/fix-info-plist-maven-plugin/fix-info-plist-maven-plugin.spec
@@ -20,7 +20,10 @@ Requires:   java-openjdk
 Provides:   fix-info-plist-maven-plugin = %{version}
 
 %description
-Small Maven plugin to "fix" the Info.plist file generated by p2 during a Tycho product build. This Maven plugin manipulates the Info.plist between the materialize-products and archive-products goals of the P2 Directory Tycho plugin to provide a custom Info.plist file for Eclipse RCP product 
+Small Maven plugin to "fix" the Info.plist file generated by p2 during a Tycho
+product build. This Maven plugin manipulates the Info.plist between the
+materialize-products and archive-products goals of the P2 Directory Tycho
+plugin to provide a custom Info.plist file for Eclipse RCP product.
 
 %global debug_package %{nil}
 

From 847ec637b5d867f21eb5325972ad8d531ac94c88 Mon Sep 17 00:00:00 2001
From: Alex Macdonald <almacdon@redhat.com>
Date: Nov 05 2018 17:29:31 +0000
Subject: [PATCH 5/10] cleanup the ee4j spec


remove unrequired "BuildRequires" lines

---

diff --git a/ee4j/ee4j.spec b/ee4j/ee4j.spec
index 0cde4a0..91957bf 100644
--- a/ee4j/ee4j.spec
+++ b/ee4j/ee4j.spec
@@ -6,24 +6,17 @@ Summary:	Parent POM file for Eclipse EE4J projects
 License:	EPL 2.0
 URL:		https://github.com/eclipse-ee4j/ee4j
 
-BuildArch:	noarch
-
 Source0:	https://github.com/eclipse-ee4j/ee4j/archive/1.0.1.tar.gz
 
-BuildRequires:	maven-local
-BuildRequires:	mvn(org.apache.maven.plugins:maven-enforcer-plugin)
-BuildRequires:	mvn(org.apache.maven.plugins:maven-source-plugin)
-BuildRequires:	mvn(org.apache.maven.plugins:maven-javadoc-plugin)
-BuildRequires:	mvn(org.apache.maven.plugins:maven-gpg-plugin)
-BuildRequires:	mvn(org.apache.maven.plugins:maven-release-plugin)
+BuildArch:	noarch
 
+BuildRequires:	maven-local
 
 %description
 Eclipse Enterprise for Java (EE4J) is an open source initiative to create standard APIs,
 implementations of those APIs, and technology compatibility kits for Java runtimes
 that enable development, deployment, and management of server-side and cloud-native applications.
 
-
 %prep
 %setup -q
 

From f5cb617d85fad9ed954b2ecf8791b4f7b302ffec Mon Sep 17 00:00:00 2001
From: Alex Macdonald <almacdon@redhat.com>
Date: Nov 05 2018 17:29:31 +0000
Subject: [PATCH 6/10] cleanup the owasp-java-encoder spec


remove unrequired "BuildRequires" lines

---

diff --git a/owasp-java-encoder/owasp-java-encoder.spec b/owasp-java-encoder/owasp-java-encoder.spec
index c30c501..fbe0ab7 100644
--- a/owasp-java-encoder/owasp-java-encoder.spec
+++ b/owasp-java-encoder/owasp-java-encoder.spec
@@ -6,28 +6,24 @@ Summary:	Collection of high-performance low-overhead contextual encoders
 License:	ASL 2.0
 URL:		https://github.com/OWASP/owasp-java-encoder/
 
-BuildArch:	noarch
-
 Source0:	https://github.com/OWASP/owasp-java-encoder/archive/v1.2.1.tar.gz
 
 Patch0:		0_manifest.patch
 
-BuildRequires:	java-openjdk
-BuildRequires:	junit
+BuildArch:	noarch
+
 BuildRequires:	maven-local
 BuildRequires:	maven-source-plugin
 BuildRequires:	sonatype-oss-parent
 
 Requires:	java-openjdk
 
-
 %description
 The OWASP Encoders package is a collection of high-performance low-overhead
 contextual encoders, that when utilized correctly, is an effective tool in
 preventing Web Application security vulnerabilities such as
 Cross-Site Scripting.
 
-
 %prep
 %setup -q
 
@@ -37,18 +33,15 @@ Cross-Site Scripting.
 # analysis tool for testing coverage - not required
 %pom_remove_plugin :cobertura-maven-plugin
 
-
 %build
 %mvn_build
 
 # inject OSGi manifest
 jar ufm %{_builddir}/%{name}-%{version}/core/target/encoder-%{version}.jar %{_builddir}/%{name}-%{version}/META-INF/MANIFEST.MF
 
-
 %install
 %mvn_install
 
-
 %files
 %license LICENSE
 %doc README.md

From e01d1b3ea625ea4215e11451a591f283f3fa02a9 Mon Sep 17 00:00:00 2001
From: Alex Macdonald <almacdon@redhat.com>
Date: Nov 05 2018 17:29:31 +0000
Subject: [PATCH 7/10] cleanup the javamail spec


remove unrequired "BuildRequires" lines and formatted the description

---

diff --git a/javamail/javamail.spec b/javamail/javamail.spec
index 19e0b23..b77ce09 100644
--- a/javamail/javamail.spec
+++ b/javamail/javamail.spec
@@ -9,8 +9,6 @@ URL:		https://github.com/eclipse-ee4j/javamail
 # original source: https://github.com/eclipse-ee4j/javamail/archive/initial-contribution.tar.gz
 Source0:	javamail-1.6.3.tar.gz
 
-BuildArch:	noarch
-
 Patch0:		0_ignore_broken_tests.patch
 Patch1:		1_dont_publish.patch
 Patch2:		2_module_info.patch
@@ -18,19 +16,19 @@ Patch3:		3_remove_javadoc_aggregate.patch
 Patch5:		4_jar_for_webapp.patch
 Patch6:		5_servlet_module.patch
 
-BuildRequires:	maven-local
-BuildRequires:	java-openjdk
+BuildArch:	noarch
+
+BuildRequires:	ee4j
 BuildRequires:	jboss-jsp-2.2-api
-BuildRequires:	jvnet-parent 
 BuildRequires:	glassfish-hk2-maven-plugins
 BuildRequires:	glassfish-servlet-api
 BuildRequires:	maven-dependency-plugin
 BuildRequires:	maven-enforcer-plugin
+BuildRequires:	maven-local
 BuildRequires:	maven-plugin-build-helper
 BuildRequires:	maven-plugin-bundle
 BuildRequires:	maven-javadoc-plugin
 BuildRequires:	maven-source-plugin
-BuildRequires:  ee4j
 
 Requires:	java-openjdk
 
@@ -40,10 +38,11 @@ Provides:	osgi(javax.mail.imap) = %{version}
 Provides:	osgi(javax.mail.pop3) = %{version}
 Provides:	osgi(javax.mail.smtp) = %{version}
 
-
 %description
-The JavaMail API provides a platform-independent and protocol-independent framework to build mail and messaging applications. The JavaMail API is available as an optional package for use with the Java SE platform and is also included in the Java EE platform.
-
+The JavaMail API provides a platform-independent and protocol-independent
+framework to build mail and messaging applications. The JavaMail API is
+available as an optional package for use with the Java SE platform
+and is also included in the Java EE platform.
 
 %prep
 %setup -q
@@ -82,7 +81,6 @@ The JavaMail API provides a platform-independent and protocol-independent framew
 # skip javadoc generation
 %mvn_build -j
 
-
 %install
 %mvn_install
 

From 37544bab7b06210e709a8a58f2b14c9e7395d65a Mon Sep 17 00:00:00 2001
From: Alex Macdonald <almacdon@redhat.com>
Date: Nov 05 2018 17:29:31 +0000
Subject: [PATCH 8/10] cleanup the jmc-core spec


removed unrequired "BuildRequires" lines

---

diff --git a/jmc-core/jmc-core.spec b/jmc-core/jmc-core.spec
index b37fa51..24d86b8 100644
--- a/jmc-core/jmc-core.spec
+++ b/jmc-core/jmc-core.spec
@@ -9,8 +9,6 @@ URL:		http://openjdk.java.net/projects/jmc/
 # original source: http://hg.openjdk.java.net/jmc/jmc/archive/tip.tar.gz
 Source0:	jmc-core-7.0.0.tar.gz
 
-BuildRequires:	java-openjdk
-BuildRequires:	javapackages-tools
 BuildRequires:	maven-local
 BuildRequires:	owasp-java-encoder
 

From 2973611a32a354d17ccbad37706c535573168b9b Mon Sep 17 00:00:00 2001
From: Alex Macdonald <almacdon@redhat.com>
Date: Nov 05 2018 17:30:32 +0000
Subject: [PATCH 9/10] cleanup the jmc spec


removed unrequired "BuildRequires" lines

---

diff --git a/jmc/jmc.spec b/jmc/jmc.spec
index 4e0fd7c..c519a5b 100644
--- a/jmc/jmc.spec
+++ b/jmc/jmc.spec
@@ -19,11 +19,17 @@ Patch6:     6_remove_ide_jdt.patch
 Patch7:     7_remove_buchen_repo.patch
 Patch8:     8_add_hamcrest.patch
 
-BuildRequires:  java-11-openjdk ant maven-local javapackages-tools tycho tycho-extras icu hamcrest-core
-BuildRequires:  maven-deploy-plugin buildnumber-maven-plugin maven-enforcer-plugin maven-install-plugin maven-site-plugin directory-maven-plugin fix-info-plist-maven-plugin
-BuildRequires:  eclipse-platform eclipse-equinox-osgi eclipse-tests
-BuildRequires:  glassfish-annotation-api glassfish-el-api
-BuildRequires:  jmc-core javamail owasp-java-encoder jaf
+BuildRequires:  buildnumber-maven-plugin
+BuildRequires:  directory-maven-plugin
+BuildRequires:  eclipse-tests
+BuildRequires:  fix-info-plist-maven-plugin
+BuildRequires:  glassfish-annotation-api
+BuildRequires:  jaf
+BuildRequires:  jmc-core
+BuildRequires:  maven-deploy-plugin
+BuildRequires:  maven-enforcer-plugin
+BuildRequires:  maven-local
+BuildRequires:  tycho
 
 Requires:       java-11-openjdk
 

From 5dce383d4fa60741b961f14b1cafd7f93b387250 Mon Sep 17 00:00:00 2001
From: Alex Macdonald <almacdon@redhat.com>
Date: Nov 05 2018 17:30:34 +0000
Subject: [PATCH 10/10] cleanup BuildRequires new lines in spec files


---

diff --git a/dd-plist/dd-plist.spec b/dd-plist/dd-plist.spec
index 2e43ed6..27a8a2a 100644
--- a/dd-plist/dd-plist.spec
+++ b/dd-plist/dd-plist.spec
@@ -9,9 +9,11 @@ URL:        https://github.com/jdcasey/directory-maven-plugin
 # original source: https://github.com/3breadt/dd-plist/archive/dd-plist-1.21.tar.gz
 Source0:    dd-plist-1.21.tar.gz
 
-BuildRequires:  javapackages-tools maven-local
+BuildRequires:  javapackages-tools
+BuildRequires:  maven-assembly-plugin
+BuildRequires:  maven-local
+BuildRequires:  maven-plugin-bundle
 BuildRequires:  sonatype-oss-parent
-BuildRequires:  maven-assembly-plugin maven-plugin-bundle
 
 Requires:   java-openjdk
 
diff --git a/directory-maven-plugin/directory-maven-plugin.spec b/directory-maven-plugin/directory-maven-plugin.spec
index ebe37c1..9a85dd5 100644
--- a/directory-maven-plugin/directory-maven-plugin.spec
+++ b/directory-maven-plugin/directory-maven-plugin.spec
@@ -9,9 +9,12 @@ URL:        https://github.com/jdcasey/directory-maven-plugin
 # original source: https://github.com/jdcasey/directory-maven-plugin/archive/directory-maven-plugin-0.3.1.tar.gz
 Source0:    directory-maven-plugin-0.3.1.tar.gz
 
-BuildRequires:  javapackages-tools maven-local
-BuildRequires:  sonatype-oss-parent 
-BuildRequires:  maven-parent maven-plugin-plugin maven-javadoc-plugin
+BuildRequires:  javapackages-tools
+BuildRequires:  maven-local
+BuildRequires:  maven-parent
+BuildRequires:  maven-plugin-plugin
+BuildRequires:  maven-javadoc-plugin
+BuildRequires:  sonatype-oss-parent
 
 Requires:   java-openjdk
 
diff --git a/fix-info-plist-maven-plugin/fix-info-plist-maven-plugin.spec b/fix-info-plist-maven-plugin/fix-info-plist-maven-plugin.spec
index 5d928ec..70e184f 100644
--- a/fix-info-plist-maven-plugin/fix-info-plist-maven-plugin.spec
+++ b/fix-info-plist-maven-plugin/fix-info-plist-maven-plugin.spec
@@ -11,9 +11,11 @@ Source0:    fix-info-plist-maven-plugin-1.2.tar.gz
 
 Patch0: 0_update_ddp_version.patch
 
-BuildRequires:  javapackages-tools maven-local
-BuildRequires:  xz-devel dd-plist
+BuildRequires:  dd-plist
+BuildRequires:  javapackages-tools
+BuildRequires:  maven-local
 BuildRequires:  maven-plugin-plugin
+BuildRequires:  xz-devel
 
 Requires:   java-openjdk
 

