From ec019cc329efc379097f6ad511b522cd8891ffe3 Mon Sep 17 00:00:00 2001
From: Andrew Bowley <andrewbowley@aapt.net.au>
Date: Tue, 14 Nov 2017 19:36:38 +1100
Subject: [PATCH] [Bug 526437] Android SWT Libraries need to be forked

1. Fixed relative paths to parent pom in andmore-swt feature poms
2. Adjusted target file to reduce early workbench load errors
3. Added missing library jar dependency jar download in ddmuilib pom

Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=526437
Signed-off-by: Andrew Bowley <andrewbowley@aapt.net.au>
---
 .../org.eclipse.andmore.ddmuilib/pom.xml      |  2 +-
 .../pom.xml                                   |  2 +-
 .../org.eclipse.andmore.sdkstats/pom.xml      |  2 +-
 .../org.eclipse.andmore.sdkuilib/pom.xml      |  2 +-
 .../features/org.eclipse.andmore.swt/pom.xml  |  2 +-
 .../org.eclipse.andmore.swtmenubar/pom.xml    |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../org.eclipse.andmore.ddmuilib/pom.xml      |  1 -
 andmore-swt/org.eclipse.andmore.swt/pom.xml   | 20 +++++--------------
 andmore.target/andmore.target.target          | 20 +++++++++++++------
 11 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/andmore-swt/features/org.eclipse.andmore.ddmuilib/pom.xml b/andmore-swt/features/org.eclipse.andmore.ddmuilib/pom.xml
index 46037543..f489559b 100644
--- a/andmore-swt/features/org.eclipse.andmore.ddmuilib/pom.xml
+++ b/andmore-swt/features/org.eclipse.andmore.ddmuilib/pom.xml
@@ -8,7 +8,7 @@
     <name>ddmuilib</name>
 
 	<parent>
-		<relativePath>../pom.xml</relativePath>
+		<relativePath>../../pom.xml</relativePath>
 	    <groupId>org.eclipse.andmore</groupId>
 	    <artifactId>swt-droid-parent</artifactId>
 		<version>0.5.2-SNAPSHOT</version>
diff --git a/andmore-swt/features/org.eclipse.andmore.hierarchyviewer2lib/pom.xml b/andmore-swt/features/org.eclipse.andmore.hierarchyviewer2lib/pom.xml
index cfb8cc1e..08a4a37e 100644
--- a/andmore-swt/features/org.eclipse.andmore.hierarchyviewer2lib/pom.xml
+++ b/andmore-swt/features/org.eclipse.andmore.hierarchyviewer2lib/pom.xml
@@ -8,7 +8,7 @@
     <name>hierarchyviewer2lib</name>
 
 	<parent>
-		<relativePath>../pom.xml</relativePath>
+		<relativePath>../../pom.xml</relativePath>
 	    <groupId>org.eclipse.andmore</groupId>
 	    <artifactId>swt-droid-parent</artifactId>
 		<version>0.5.2-SNAPSHOT</version>
diff --git a/andmore-swt/features/org.eclipse.andmore.sdkstats/pom.xml b/andmore-swt/features/org.eclipse.andmore.sdkstats/pom.xml
index 6c3e500b..7c24d460 100644
--- a/andmore-swt/features/org.eclipse.andmore.sdkstats/pom.xml
+++ b/andmore-swt/features/org.eclipse.andmore.sdkstats/pom.xml
@@ -8,7 +8,7 @@
     <name>sdkstats</name>
 
 	<parent>
-		<relativePath>../pom.xml</relativePath>
+		<relativePath>../../pom.xml</relativePath>
 	    <groupId>org.eclipse.andmore</groupId>
 	    <artifactId>swt-droid-parent</artifactId>
 		<version>0.5.2-SNAPSHOT</version>
diff --git a/andmore-swt/features/org.eclipse.andmore.sdkuilib/pom.xml b/andmore-swt/features/org.eclipse.andmore.sdkuilib/pom.xml
index a0b56f88..2858670e 100644
--- a/andmore-swt/features/org.eclipse.andmore.sdkuilib/pom.xml
+++ b/andmore-swt/features/org.eclipse.andmore.sdkuilib/pom.xml
@@ -8,7 +8,7 @@
     <name>sdkuilib</name>
 
 	<parent>
-		<relativePath>../pom.xml</relativePath>
+		<relativePath>../../pom.xml</relativePath>
 	    <groupId>org.eclipse.andmore</groupId>
 	    <artifactId>swt-droid-parent</artifactId>
 		<version>0.5.2-SNAPSHOT</version>
diff --git a/andmore-swt/features/org.eclipse.andmore.swt/pom.xml b/andmore-swt/features/org.eclipse.andmore.swt/pom.xml
index 7c9ed59b..f2b437b8 100644
--- a/andmore-swt/features/org.eclipse.andmore.swt/pom.xml
+++ b/andmore-swt/features/org.eclipse.andmore.swt/pom.xml
@@ -8,7 +8,7 @@
     <name>swt base</name>
 
 	<parent>
-		<relativePath>../pom.xml</relativePath>
+		<relativePath>../../pom.xml</relativePath>
 	    <groupId>org.eclipse.andmore</groupId>
 	    <artifactId>swt-droid-parent</artifactId>
 		<version>0.5.2-SNAPSHOT</version>
diff --git a/andmore-swt/features/org.eclipse.andmore.swtmenubar/pom.xml b/andmore-swt/features/org.eclipse.andmore.swtmenubar/pom.xml
index c291652c..314d1759 100644
--- a/andmore-swt/features/org.eclipse.andmore.swtmenubar/pom.xml
+++ b/andmore-swt/features/org.eclipse.andmore.swtmenubar/pom.xml
@@ -8,7 +8,7 @@
     <name>swtmenubar</name>
 
 	<parent>
-		<relativePath>../pom.xml</relativePath>
+		<relativePath>../../pom.xml</relativePath>
 	    <groupId>org.eclipse.andmore</groupId>
 	    <artifactId>swt-droid-parent</artifactId>
 		<version>0.5.2-SNAPSHOT</version>
diff --git a/andmore-swt/features/org.eclipse.andmore.traceviewuilib/pom.xml b/andmore-swt/features/org.eclipse.andmore.traceviewuilib/pom.xml
index 40391cff..fb108a9f 100644
--- a/andmore-swt/features/org.eclipse.andmore.traceviewuilib/pom.xml
+++ b/andmore-swt/features/org.eclipse.andmore.traceviewuilib/pom.xml
@@ -8,7 +8,7 @@
     <name>traceviewuilib</name>
 
 	<parent>
-		<relativePath>../pom.xml</relativePath>
+		<relativePath>../../pom.xml</relativePath>
 	    <groupId>org.eclipse.andmore</groupId>
 	    <artifactId>swt-droid-parent</artifactId>
 		<version>0.5.2-SNAPSHOT</version>
diff --git a/andmore-swt/features/org.eclipse.andmore.uiautomatorviewer/pom.xml b/andmore-swt/features/org.eclipse.andmore.uiautomatorviewer/pom.xml
index 8c566cf8..02b62a9d 100644
--- a/andmore-swt/features/org.eclipse.andmore.uiautomatorviewer/pom.xml
+++ b/andmore-swt/features/org.eclipse.andmore.uiautomatorviewer/pom.xml
@@ -8,7 +8,7 @@
     <name>uiautomatorviewer</name>
 
 	<parent>
-		<relativePath>../pom.xml</relativePath>
+		<relativePath>../../pom.xml</relativePath>
 	    <groupId>org.eclipse.andmore</groupId>
 	    <artifactId>swt-droid-parent</artifactId>
 		<version>0.5.2-SNAPSHOT</version>
diff --git a/andmore-swt/org.eclipse.andmore.ddmuilib/pom.xml b/andmore-swt/org.eclipse.andmore.ddmuilib/pom.xml
index 3a905784..31b0fb70 100644
--- a/andmore-swt/org.eclipse.andmore.ddmuilib/pom.xml
+++ b/andmore-swt/org.eclipse.andmore.ddmuilib/pom.xml
@@ -7,7 +7,6 @@
 	<packaging>eclipse-plugin</packaging>
 	<name>ddmuilib</name>
 	<parent>
-		<relativePath>../pom.xml</relativePath>
     	<groupId>org.eclipse.andmore</groupId>
     	<artifactId>swt-droid-parent</artifactId>
 		<version>0.5.2-SNAPSHOT</version>
diff --git a/andmore-swt/org.eclipse.andmore.swt/pom.xml b/andmore-swt/org.eclipse.andmore.swt/pom.xml
index 52c173a0..3e48751e 100644
--- a/andmore-swt/org.eclipse.andmore.swt/pom.xml
+++ b/andmore-swt/org.eclipse.andmore.swt/pom.xml
@@ -104,21 +104,6 @@
                 </exclusion>
 			</exclusions>
          </dependency>
-         <dependency>
-             <groupId>com.android.tools.build</groupId>
-             <artifactId>builder-model</artifactId>
-             <version>2.3.3</version>
-         </dependency>
-         <dependency>
-             <groupId>org.bouncycastle</groupId>
-             <artifactId>bcpkix-jdk15on</artifactId>
-             <version>1.48</version>
-         </dependency>
-         <dependency>
-             <groupId>org.bouncycastle</groupId>
-             <artifactId>bcprov-jdk15on</artifactId>
-             <version>1.48</version>
-         </dependency>
          <dependency>
               <groupId>com.intellij</groupId>
               <artifactId>annotations</artifactId>
@@ -208,6 +193,11 @@
 			          <artifactItem>
                         <groupId>com.android.tools.ddms</groupId>
                         <artifactId>ddmlib</artifactId>
+                        <version>${android.tools.version}</version>
+			          </artifactItem>
+			          <artifactItem>
+                        <groupId>com.android.tools.layoutlib</groupId>
+                        <artifactId>layoutlib-api</artifactId>
                         <version>${android.tools.version}</version>
 			          </artifactItem>
 			          <artifactItem>
diff --git a/andmore.target/andmore.target.target b/andmore.target/andmore.target.target
index c5d38472..bcbee37b 100644
--- a/andmore.target/andmore.target.target
+++ b/andmore.target/andmore.target.target
@@ -2,7 +2,9 @@
 <?pde version="3.8"?><target name="andmore" sequenceNumber="1">
 <locations>
 <location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="false" type="InstallableUnit">
-<unit id="org.eclipse.wb.core.xml.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.wb.core.feature.feature.group" version="1.9.0"/>
+<unit id="org.eclipse.wb.core.java.feature.feature.group" version="1.9.0"/>
+<unit id="org.eclipse.wb.core.xml.feature.feature.group" version="1.9.0"/>
 <repository location="http://download.eclipse.org/windowbuilder/WB/release/4.6/"/>
 </location>
 <location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="false" type="InstallableUnit">
@@ -12,7 +14,6 @@
 <unit id="org.apache.commons.httpclient.source" version="3.1.0.v201012070820"/>
 <unit id="org.apache.oro" version="2.0.8.v201005080400"/>
 <unit id="org.easymock" version="2.4.0.v20090202-0900"/>
-<unit id="org.slf4j.api" version="1.7.10.v20170224-1220"/>
 <repository location="http://download.eclipse.org/tools/orbit/R-builds/R20170307180635/repository/"/>
 </location>
 <location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="false" type="InstallableUnit">
@@ -28,9 +29,6 @@
 <unit id="org.mockito" version="1.9.5.v201311280930"/>
 <unit id="org.objenesis" version="1.0.0.v201105211943"/>
 <unit id="com.google.guava" version="15.0.0.v201403281430"/>
-<unit id="org.slf4j.api" version="1.7.2.v20121108-1250"/>
-<unit id="org.slf4j.nop" version="1.7.2.v201212060727"/>
-<unit id="org.slf4j.impl.log4j12" version="1.7.2.v20131105-2200"/>
 <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository/"/>
 </location>
 <location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="false" type="InstallableUnit">
@@ -65,10 +63,13 @@
 <unit id="org.eclipse.sequoyah.device.common.feature.feature.group" version="2.1.0.N20120718-0509"/>
 <unit id="org.eclipse.sequoyah.device.feature.feature.group" version="2.1.0.N20120718-0509"/>
 <unit id="org.eclipse.wst.common.fproj.feature.group" version="3.7.0.v201505072140"/>
+<unit id="org.eclipse.wst.common.modulecore" version="1.2.500.v201701032135"/>
+<unit id="org.eclipse.wst.common.modulecore.ui" version="1.0.300.v201505072128"/>
 <unit id="org.eclipse.xsd.feature.group" version="2.12.0.v20160526-0356"/>
 <unit id="org.eclipse.xsd.edit.feature.group" version="2.9.0.v20160526-0356"/>
 <unit id="org.eclipse.datatools.sdk.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.egit.feature.group" version="4.6.1.201703071140-r"/>
+<unit id="org.eclipse.jgit.feature.group" version="4.6.1.201703071140-r"/>
 <unit id="org.eclipse.emf.codegen.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.emf.codegen.ui.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.emf.common.feature.group" version="0.0.0"/>
@@ -83,6 +84,13 @@
 <unit id="org.eclipse.mat.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.platform.ide" version="0.0.0"/>
 <unit id="org.eclipse.pde.source.feature.group" version="3.12.3.v20170301-0400"/>
+<unit id="org.eclipse.equinox.p2.discovery" version="1.0.400.v20160504-1450"/>
+<unit id="org.eclipse.equinox.p2.ui.discovery" version="1.0.201.v20160901-1335"/>
+<unit id="org.eclipse.equinox.p2.discovery.compatibility" version="1.0.200.v20131211-1531"/>
+<unit id="org.eclipse.ecf" version="3.8.0.v20160823-2221"/>
+<unit id="org.eclipse.ecf.identity" version="3.7.0.v20160823-2221"/>
+<unit id="org.eclipse.ecf.filetransfer" version="5.0.0.v20160823-2221"/>
+<unit id="org.eclipse.ecf.provider.filetransfer" version="3.2.200.v20160823-2221"/>
 <unit id="org.eclipse.launchbar.core" version="2.1.0.201612052026"/>
 <unit id="org.eclipse.launchbar.ui" version="2.1.0.201612052026"/>
 <unit id="org.eclipse.tools.templates.ui" version="1.1.1.201702141301"/>