From a71ee1ea535154b5090d8b2f6cb6962c4872f3c3 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Jun 21 2017 11:46:59 +0000
Subject: Update to latest fp-p2 snapshot for XMvn 3.0.0 support


---

diff --git a/p2-install.sh b/p2-install.sh
index 30bfd35..e04cb9d 100755
--- a/p2-install.sh
+++ b/p2-install.sh
@@ -7,16 +7,8 @@ _prefer_jre="true"
 set_jvm
 
 set_classpath \
-    aether/aether-api \
-    atinject \
     beust-jcommander \
-    cglib \
     eclipse/osgi \
-    google-guice \
-    guava \
-    objectweb-asm/asm \
-    org.eclipse.sisu.inject \
-    plexus/utils \
     slf4j/api \
     slf4j/simple \
     tycho/org.fedoraproject.p2 \
diff --git a/sources b/sources
index 4abf4ea..68355d1 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (fedoraproject-p2-f0168e8.tar.xz) = 4f6028b7e3901fd218ec61b368329bf3871d74b96b7339efc39a07bd009f194c7eeeb5abe77a7b94a4f6c13b5cb31b4a7914a28d90cfaed9a2706632e93556e3
+SHA512 (fedoraproject-p2-b8b13f9.tar.xz) = e271fbf57573b104190392adad369b03937af4f799d9696284904537ee55e49d5c9f311719669fa165f6949f484bf0583487b9c66ac5bea5bb10a18e51066def
 SHA512 (org.eclipse.tycho-tycho-1.0.0.tar.xz) = 31a082931e578c03d1a7e435944c0d61b1062a99b54c25ae67a705858691855fbd163eba01642210a7a11376e53f7ffa65b29df1f41f3f2dc71771df9d13f10a
 SHA512 (eclipse-bootstrap-oxygen.tar.xz) = 3d5694dd0d97334ec780c8e8df9d884f55b892e445a9afa371acb62bfb6d242a369728f7411d798a8274b2efa5c7cfbe1c7195c60e3992c88a520f9dda2fe55c
diff --git a/tycho.spec b/tycho.spec
index 1cf0a9f..9c2be39 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -17,7 +17,7 @@
 
 %global git_tag tycho-1.0.0
 
-%global fp_p2_sha f0168e8
+%global fp_p2_sha b8b13f9
 %global fp_p2_version 0.0.1
 %global fp_p2_snap -SNAPSHOT
 
@@ -25,7 +25,7 @@
 
 Name:           tycho
 Version:        1.0.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
 
 # license file is missing but all files having some licensing information are ASL 2.0
@@ -47,7 +47,7 @@ Source5:        eclipse-bootstrap-oxygen.tar.xz
 %endif
 # Eclipse Plugin Project supporting filesystem as p2 repository
 # https://github.com/rgrunber/fedoraproject-p2
-# Generated using 'git archive --prefix=fedoraproject-p2/ -o fedoraproject-p2-%%{fp_p2_sha}.tar %%{fp_p2_sha} && xz fedoraproject-p2-%%{fp_p2_sha}.tar'
+# Generated using 'git archive --prefix=fedoraproject-p2/ -o fedoraproject-p2-%{fp_p2_sha}.tar %{fp_p2_sha} && xz fedoraproject-p2-%{fp_p2_sha}.tar'
 Source6:        fedoraproject-p2-%{fp_p2_sha}.tar.xz
 # Script that can be used to install or simulate installation of P2
 # artifacts. It is used in OSGi requires generation.
@@ -66,7 +66,7 @@ Patch8:         tycho-maven-archiver-3.0.1.patch
 BuildArch:      noarch
 
 BuildRequires:  maven-local
-BuildRequires:  xmvn
+BuildRequires:  xmvn-minimal >= 3
 BuildRequires:  maven-clean-plugin
 BuildRequires:  maven-dependency-plugin
 BuildRequires:  maven-install-plugin
@@ -112,7 +112,7 @@ BuildRequires:  maven-shared-utils
 BuildRequires:  mockito
 
 Requires:       maven-local
-Requires:       xmvn-minimal
+Requires:       xmvn-minimal >= 3
 Requires:       ecj >= 1:4.5.2-2
 %if ! %{eclipse_bootstrap}
 Requires:       eclipse-platform >= 1:4.7.0
@@ -361,6 +361,9 @@ ln -s %{_javadir}/tycho/org.fedoraproject.p2.jar %{buildroot}%{_datadir}/xmvn/li
 %files javadoc -f .mfiles-javadoc
 
 %changelog
+* Wed Jun 21 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.0.0-7
+- Update to latest fp-p2 snapshot for XMvn 3.0.0 support
+
 * Tue Jun 20 2017 Mat Booth <mat.booth@redhat.com> - 1.0.0-6
 - Improve bootstrap mode