[tycho-extras] Update to 0.22.0 pre-release.

[Roland Grunberg]

commit a6c33e875bc83ca28d975f2eb3bab94d3be9826d
Author: Roland Grunberg <rgrunber at redhat.com>
Date:   Tue Nov 25 13:43:27 2014 -0500

    Update to 0.22.0 pre-release.

 sources                                |    2 +-
 tycho-extras-use-custom-resolver.patch |   20 +++++++-------------
 tycho-extras.spec                      |   11 +++++++----
 3 files changed, 15 insertions(+), 18 deletions(-)
---
diff --git a/sources b/sources
index 5b68383..89960d5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-01bcb174c0d2d22cc017d34dce0101fe  tycho-extras-0.21.0.tar.bz2
+a42a4623b1436715d342ff0041e30354  org.eclipse.tycho.extras-ef068adc592181366556601f2428f5fa77c1e1c8.tar.bz2
diff --git a/tycho-extras-use-custom-resolver.patch b/tycho-extras-use-custom-resolver.patch
index 5622ced..c6fe163 100644
--- a/tycho-extras-use-custom-resolver.patch
+++ b/tycho-extras-use-custom-resolver.patch
@@ -1,4 +1,4 @@
-From a53e62e3183471e48f4a126cd6fd0fe955be3427 Mon Sep 17 00:00:00 2001
+From 8c5f7ddcf38279d30102084ba0f99f7b755212a2 Mon Sep 17 00:00:00 2001
 From: Roland Grunberg <rgrunber at redhat.com>
 Date: Mon, 6 May 2013 14:20:58 -0400
 Subject: [PATCH] Use custom resolver for tycho-eclipserun-plugin.
@@ -9,11 +9,11 @@ used by tycho-eclipserun-plugin.
 Change-Id: Ifd0aae3f32c8077cd0ae33e70f40698c1129788d
 ---
  tycho-eclipserun-plugin/pom.xml                    |  5 ++++
- .../tycho/extras/eclipserun/EclipseRunMojo.java    | 35 ++++++++++++++++++++++
- 2 files changed, 40 insertions(+)
+ .../tycho/extras/eclipserun/EclipseRunMojo.java    | 29 ++++++++++++++++++++++
+ 2 files changed, 34 insertions(+)
 
 diff --git a/tycho-eclipserun-plugin/pom.xml b/tycho-eclipserun-plugin/pom.xml
-index 74d160b..9cf83cf 100644
+index 708b35c..c4e9b17 100644
 --- a/tycho-eclipserun-plugin/pom.xml
 +++ b/tycho-eclipserun-plugin/pom.xml
 @@ -38,6 +38,11 @@
@@ -29,7 +29,7 @@ index 74d160b..9cf83cf 100644
  	<profiles>
  		<profile>
 diff --git a/tycho-eclipserun-plugin/src/main/java/org/eclipse/tycho/extras/eclipserun/EclipseRunMojo.java b/tycho-eclipserun-plugin/src/main/java/org/eclipse/tycho/extras/eclipserun/EclipseRunMojo.java
-index 4c4baf0..e00ee4d 100644
+index 4c4baf0..a7179e0 100644
 --- a/tycho-eclipserun-plugin/src/main/java/org/eclipse/tycho/extras/eclipserun/EclipseRunMojo.java
 +++ b/tycho-eclipserun-plugin/src/main/java/org/eclipse/tycho/extras/eclipserun/EclipseRunMojo.java
 @@ -13,9 +13,14 @@ package org.eclipse.tycho.extras.eclipserun;
@@ -55,7 +55,7 @@ index 4c4baf0..e00ee4d 100644
  
  /**
   * Launch an eclipse process with arbitrary commandline arguments. The eclipse installation is
-@@ -187,6 +193,35 @@ public class EclipseRunMojo extends AbstractMojo {
+@@ -187,6 +193,29 @@ public class EclipseRunMojo extends AbstractMojo {
          TargetPlatformConfigurationStub tpConfiguration = new TargetPlatformConfigurationStub();
          // we want to resolve from remote repos only
          tpConfiguration.setForceIgnoreLocalArtifacts(true);
@@ -66,16 +66,10 @@ index 4c4baf0..e00ee4d 100644
 +            Set<String> allLocations = new HashSet<String>();
 +            final Set<String> roots = EclipseSystemLayout.getSCLRoots();
 +
-+            Set<String> platformDirs = new HashSet<String>();
-+            Set<String> internalDirs = new HashSet<String>();
-+            Set<String> externalDirs = new HashSet<String>();
 +            for (String root : roots) {
-+                EclipseSystemLayout.initLocations(Paths.get(root), platformDirs, internalDirs, externalDirs, false);
++                EclipseSystemLayout.initLocations(Paths.get(root), allLocations, allLocations, allLocations, false);
 +            }
 +
-+            allLocations.addAll(platformDirs);
-+            allLocations.addAll(internalDirs);
-+            allLocations.addAll(externalDirs);
 +            allLocations.addAll(EclipseSystemLayout.getUserDefinedBundleLocations());
 +
 +            for (String loc : allLocations) {
diff --git a/tycho-extras.spec b/tycho-extras.spec
index 26f4acd..8723ebd 100644
--- a/tycho-extras.spec
+++ b/tycho-extras.spec
@@ -3,13 +3,13 @@
 %global snap %{nil}
 
 Name:           tycho-extras
-Version:        0.21.0
-Release:        3%{?dist}
+Version:        0.22.0
+Release:        0.1.gitef068a%{?dist}
 Summary:        Additional plugins for Tycho
 
 License:        EPL
 URL:            http://eclipse.org/tycho/
-Source0:        http://git.eclipse.org/c/tycho/org.eclipse.tycho.extras.git/snapshot/tycho-extras-0.21.0.tar.bz2
+Source0:        http://git.eclipse.org/c/tycho/org.eclipse.tycho.extras.git/snapshot/org.eclipse.tycho.extras-ef068adc592181366556601f2428f5fa77c1e1c8.tar.bz2
 Patch0:         %{name}-fix-build.patch
 Patch1:         %{name}-use-custom-resolver.patch
 
@@ -36,7 +36,7 @@ Requires:       jpackage-utils
 This package contains the API documentation for %{name}.
 
 %prep
-%setup -q -n tycho-extras-0.21.0
+%setup -q -n org.eclipse.tycho.extras-ef068adc592181366556601f2428f5fa77c1e1c8
 %patch0 -p1
 %patch1 -p1
 
@@ -62,6 +62,9 @@ This package contains the API documentation for %{name}.
 %files javadoc -f .mfiles-javadoc
 
 %changelog
+* Tue Nov 25 2014 Roland Grunberg <rgrunber at redhat.com> - 0.22.0-0.1.gitef068a
+- Update to 0.22.0 pre-release.
+
 * Wed Sep 03 2014 Roland Grunberg <rgrunber at redhat.com> - 0.21.0-3
 - Use fedoraproject-p2 to do OSGi bundle discovery.