From 24a31c3cf9a0c71a5ee3e233ed1f5e3fea137607 Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Thu, 18 Jul 2019 14:46:35 +0200
Subject: [PATCH] Update to upstream version 6

---
 .gitignore        |  1 +
 felix-parent.spec | 21 ++++++---------------
 sources           |  2 +-
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index c1b42f3..e09c300 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 felix-parent-1.2.1.tar.bz2
 /felix-parent-2.1-source-release.tar.gz
 /felix-parent-4-source-release.tar.gz
+/felix-parent-6-source-release.tar.gz
diff --git a/felix-parent.spec b/felix-parent.spec
index dcba27a..acc527c 100644
--- a/felix-parent.spec
+++ b/felix-parent.spec
@@ -1,6 +1,6 @@
 Name:           felix-parent
-Version:        4
-Release:        6%{?dist}
+Version:        6
+Release:        1%{?dist}
 Summary:        Parent POM file for Apache Felix Specs
 License:        ASL 2.0
 URL:            http://felix.apache.org/
@@ -8,15 +8,7 @@ Source0:        http://repo1.maven.org/maven2/org/apache/felix/felix-parent/%{ve
 BuildArch:      noarch
 
 BuildRequires:  maven-local
-BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache:apache:pom:)
-BuildRequires:  mvn(org.apache.maven.plugins:maven-antrun-plugin)
-BuildRequires:  mvn(org.easymock:easymock)
-BuildRequires:  mvn(org.mockito:mockito-all)
-
-# FIXME auto-requires are not generated
-Requires:  mvn(org.easymock:easymock)
-Requires:  mvn(org.mockito:mockito-all)
 
 %description
 Parent POM file for Apache Felix Specs.
@@ -24,6 +16,7 @@ Parent POM file for Apache Felix Specs.
 %prep
 %setup -q -n felix-parent-%{version}
 %mvn_alias : :felix
+%pom_remove_plugin :maven-enforcer-plugin
 %pom_remove_plugin :maven-javadoc-plugin
 %pom_remove_plugin :maven-site-plugin
 %pom_remove_plugin :maven-release-plugin
@@ -34,11 +27,6 @@ Parent POM file for Apache Felix Specs.
 # wagon ssh dependency unneeded
 %pom_xpath_remove pom:extensions
 
-# Remove workaround for MANTRUN-51/MNG-6205 issue
-# (should only be needed with old versions of Maven)
-# See: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/site/fml/faq.fml?r1=790402&r2=790401
-%pom_xpath_remove "pom:plugin[pom:artifactId='maven-antrun-plugin']/pom:dependencies"
-
 %build
 %mvn_build
 
@@ -49,6 +37,9 @@ Parent POM file for Apache Felix Specs.
 %doc LICENSE NOTICE
 
 %changelog
+* Thu Jul 18 2019 Marian Koncek <mkoncek@redhat.com> - 6-1
+- Update to upstream version 6
+
 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 4-6
 - Mass rebuild for javapackages-tools 201901
 
diff --git a/sources b/sources
index 0e4f2b8..e7c1b84 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (felix-parent-4-source-release.tar.gz) = 1b6c713e9f56514f3f2af311643b386a9ea9b2ca5efa6be3f160a7444ae77462fc436ee0aa761ef1d0675ae7cf0b95e6f4ecf1eeb208b929ca7071d8c83407ab
+SHA512 (felix-parent-6-source-release.tar.gz) = 0b2c96662075b999c888143b38a114bedb5d68d3ec9a7446b87d4766d777abc99f5f836e2511a255ac2bc1011ffc25b237a8e35b1b3745ded488a9b7e21c1825