[BACKLOG-11041] Updgrade SWT to version 4.6 (#2971)

pentaho · Sep 28, 2016 · 150e6a0 · 150e6a0
1 parent 09f9d63
commit 150e6a0
Show file tree

Hide file tree

Showing 29 changed files with 32 additions and 32 deletions.
diff --git a/assembly/build.xml b/assembly/build.xml
@@ -70,7 +70,7 @@
   	<replace file = "${approot.stage.dir}/Data Integration.app/Contents/Info.plist" token="@KETTLE_VERSION_STRING@" value="${dependency.kettle.revision}" />
   	<!-- Remove the SWT JAR used for compilation -->
   	<delete quiet="true">
-  		<fileset dir="${approot.stage.dir}/lib" includes="swt*.jar" />
+		<fileset dir="${approot.stage.dir}/lib" includes="org.eclipse.swt.*.jar" />
   	</delete>
 
     <antcall target="unzip-swtlibs"/>

diff --git a/assembly/ivy.xml b/assembly/ivy.xml
@@ -22,7 +22,7 @@
     <dependency org="${ivy.artifact.group}" name="kettle-engine"        rev="${project.revision}" changing="true" force="true"/>
     <dependency org="${ivy.artifact.group}" name="kettle-dbdialog"      rev="${project.revision}" changing="true" force="true"/>
     <dependency org="${ivy.artifact.group}" name="kettle-ui-swt"        rev="${project.revision}" changing="true" force="true">
-      <exclude name="swt-linux-x86_64"/>
+      <exclude name="org.eclipse.swt.gtk.linux.x86_64"/>
     </dependency>
 
     <dependency org="pentaho" name="pdi-osgi-bridge-core" rev="${dependency.pdi-osgi-bridge.revision}" changing="true" />
@@ -156,7 +156,7 @@
     </dependency>
 
     <!-- The OS-specific libraries are bundled together, unzip them all for assembly -->
-    <dependency org="org.eclipse"          name="swtlibs"               rev="4.3.2" conf="swtlibs->default" transitive="false">
+    <dependency org="org.eclipse.swt"          name="swtlibs"               rev="4.6" conf="swtlibs->default" transitive="false">
       <artifact name="swtlibs" type="zip"/>
     </dependency>
 

diff --git a/build.xml b/build.xml
@@ -298,7 +298,7 @@
       <classpath>
         <fileset dir="${lib.dir}">
           <include name="*.jar"/>
-          <exclude name="swt-linux*.jar"/>
+          <exclude name="org.eclipse.swt.gtk.linux*.jar"/>
           <exclude name="kettle-*.jar"/>
         </fileset>
         <fileset dir="${testlib.dir}">

diff --git a/dbdialog/ivy.xml b/dbdialog/ivy.xml
@@ -28,8 +28,8 @@
     <!--  Third-party (external) dependencies -->
 
     <!-- SWT it required to compile any version of any architecture will work -->
-    <dependency org="org.eclipse.swt" name="swt-linux-x86_64"  rev="4.3.2" transitive="false" />
-    
+    <dependency org="org.eclipse.swt" name="org.eclipse.swt.gtk.linux.x86_64"  rev="4.6" transitive="false" />
+
     <dependency org="junit" name="junit" rev="4.7" conf="test->default" transitive="false"/>
     <dependency org="org.mockito"         name="mockito-all"   rev="1.9.5"   conf="test->default" transitive="false" />
   </dependencies>

diff --git a/ivy.xml b/ivy.xml
@@ -16,7 +16,7 @@
     </dependency>
     <dependency org="${ivy.artifact.group}" name="kettle-dbdialog" rev="${project.revision}" changing="true"/>
     <dependency org="${ivy.artifact.group}" name="kettle-ui-swt"   rev="${project.revision}" changing="true">
-      <exclude name="swt-linux-x86_64"/>
+      <exclude name="org.eclipse.swt.gtk.linux.x86_64"/>
     </dependency>
 
     <!-- Common (Unit, Integration) test dependencies -->

diff --git a/plugins/aggregate-rows/ivy.xml b/plugins/aggregate-rows/ivy.xml
@@ -23,7 +23,7 @@
     <dependency org="pentaho-kettle" name="kettle-ui-swt" rev="${dependency.kettle.revision}" transitive="false" changing="true"/>
 
     <!-- SWT it required to compile any version of any architecture will work -->
-    <dependency org="org.eclipse.swt" name="swt-linux-x86_64" rev="4.3.2" transitive="false"/>
+    <dependency org="org.eclipse.swt" name="org.eclipse.swt.gtk.linux.x86_64" rev="4.6" transitive="false"/>
     <dependency org="org.eclipse" name="jface" rev="3.3.0-I20070606-0010" transitive="false"/>
 
 	<!-- test dependencies -->

diff --git a/plugins/elasticsearch-bulk-insert/ivy.xml b/plugins/elasticsearch-bulk-insert/ivy.xml
@@ -46,7 +46,7 @@ explicitly covering such access.
     <dependency org="pentaho-kettle" name="kettle-core" rev="${dependency.kettle.revision}" transitive="true" changing="true"/>
     <dependency org="pentaho-kettle" name="kettle-ui-swt" rev="${dependency.kettle.revision}" transitive="false" changing="true"/>
     <!-- SWT it required to compile any version of any architecture will work -->
-    <dependency org="org.eclipse.swt" name="swt-linux-x86_64" rev="4.3.2" transitive="false"/>
+    <dependency org="org.eclipse.swt" name="org.eclipse.swt.gtk.linux.x86_64" rev="4.6" transitive="false"/>
     <dependency org="org.eclipse" name="jface" rev="3.3.0-I20070606-0010" transitive="false"/>
 
     <!-- test dependencies -->

diff --git a/plugins/get-previous-row-field/ivy.xml b/plugins/get-previous-row-field/ivy.xml
@@ -23,7 +23,7 @@
     <dependency org="pentaho-kettle" name="kettle-ui-swt" rev="${dependency.kettle.revision}" transitive="false" changing="true"/>
 
     <!-- SWT it required to compile any version of any architecture will work -->
-    <dependency org="org.eclipse.swt" name="swt-linux-x86_64" rev="4.3.2" transitive="false"/>
+    <dependency org="org.eclipse.swt" name="org.eclipse.swt.gtk.linux.x86_64" rev="4.6" transitive="false"/>
     <dependency org="org.eclipse" name="jface" rev="3.3.0-I20070606-0010" transitive="false"/>
 
 	<!-- test dependencies -->

diff --git a/plugins/googleanalytics/ivy.xml b/plugins/googleanalytics/ivy.xml
@@ -50,7 +50,7 @@ explicitly covering such access.
     <dependency org="pentaho-kettle" name="kettle-core" rev="${dependency.kettle.revision}" transitive="true" changing="true"/>
     <dependency org="pentaho-kettle" name="kettle-ui-swt" rev="${dependency.kettle.revision}" transitive="false" changing="true"/>
     <!-- SWT it required to compile any version of any architecture will work -->
-    <dependency org="org.eclipse.swt" name="swt-linux-x86_64" rev="4.3.2" transitive="false"/>
+    <dependency org="org.eclipse.swt" name="org.eclipse.swt.gtk.linux.x86_64" rev="4.6" transitive="false"/>
     <dependency org="org.eclipse" name="jface" rev="3.3.0-I20070606-0010" transitive="false"/>
 
     <!-- test dependencies -->

diff --git a/plugins/gp-bulk-loader/ivy.xml b/plugins/gp-bulk-loader/ivy.xml
@@ -23,7 +23,7 @@
     <dependency org="pentaho-kettle" name="kettle-ui-swt" rev="${dependency.kettle.revision}" transitive="false" changing="true"/>
 
     <!-- SWT it required to compile any version of any architecture will work -->
-    <dependency org="org.eclipse.swt" name="swt-linux-x86_64" rev="4.3.2" transitive="false"/>
+    <dependency org="org.eclipse.swt" name="org.eclipse.swt.gtk.linux.x86_64" rev="4.6" transitive="false"/>
     <dependency org="org.eclipse" name="jface" rev="3.3.0-I20070606-0010" transitive="false"/>
 
     <!-- test dependencies -->

diff --git a/plugins/kettle-drools5-plugin/ivy.xml b/plugins/kettle-drools5-plugin/ivy.xml
@@ -32,7 +32,7 @@
     <dependency org="org.drools" name="knowledge-internal-api" rev="5.0.1" transitive="true"/>
 -->
     <!-- SWT it required to compile any version of any architecture will work -->
-    <dependency org="org.eclipse.swt" name="swt-linux-x86_64" rev="4.3.2" transitive="false"/>
+    <dependency org="org.eclipse.swt" name="org.eclipse.swt.gtk.linux.x86_64" rev="4.6" transitive="false"/>
     <dependency org="org.eclipse" name="jface" rev="3.3.0-I20070606-0010" transitive="false"/>
 
 

diff --git a/plugins/kettle-dummy-plugin/ivy.xml b/plugins/kettle-dummy-plugin/ivy.xml
@@ -23,7 +23,7 @@
     <dependency org="pentaho-kettle" name="kettle-ui-swt" rev="${dependency.kettle.revision}" changing="true"/>
 
     <!-- SWT it required to compile any version of any architecture will work -->
-    <dependency org="org.eclipse.swt" name="swt-linux-x86_64" rev="4.3.2" transitive="false"/>
+    <dependency org="org.eclipse.swt" name="org.eclipse.swt.gtk.linux.x86_64" rev="4.6" transitive="false"/>
     <dependency org="org.eclipse" name="jface" rev="3.3.0-I20070606-0010" transitive="false"/> 
 
     <dependency org="junit" name="junit" rev="4.7" conf="test->default"/> 

diff --git a/plugins/kettle-gpload-plugin/ivy.xml b/plugins/kettle-gpload-plugin/ivy.xml
@@ -24,7 +24,7 @@
 
     <dependency org="org.apache.commons" name="commons-vfs2" rev="2.1-20150824" transitive="false"/>
     <!-- SWT it required to compile any version of any architecture will work -->
-    <dependency org="org.eclipse.swt" name="swt-linux-x86_64" rev="4.3.2" transitive="false"/>
+    <dependency org="org.eclipse.swt" name="org.eclipse.swt.gtk.linux.x86_64" rev="4.6" transitive="false"/>
     <dependency org="org.eclipse" name="jface" rev="3.3.0-I20070606-0010" transitive="false"/>
 
     <!-- test dependencies -->

diff --git a/plugins/kettle-hl7-plugin/ivy.xml b/plugins/kettle-hl7-plugin/ivy.xml
@@ -35,7 +35,7 @@
     <dependency org="ca.uhn.hapi" name="hapi-structures-v26" rev="1.1" transitive="false"/>
 
     <!-- SWT it required to compile any version of any architecture will work -->
-    <dependency org="org.eclipse.swt" name="swt-linux-x86_64" rev="4.3.2" conf="dev->default" transitive="false"/>
+    <dependency org="org.eclipse.swt" name="org.eclipse.swt.gtk.linux.x86_64" rev="4.6" conf="dev->default" transitive="false"/>
 
     <dependency org="junit" name="junit" rev="4.7" conf="test->default"/>     
   </dependencies>

diff --git a/plugins/kettle-json-plugin/ivy.xml b/plugins/kettle-json-plugin/ivy.xml
@@ -32,7 +32,7 @@
     <dependency org="org.codehaus.jackson"         name="jackson-jaxrs"       rev="1.9.2"           conf="dev->default" transitive="false"/>
 
     <!-- SWT it required to compile any version of any architecture will work -->
-    <dependency org="org.eclipse.swt" name="swt-linux-x86_64" rev="4.3.2" conf="dev->default" transitive="false"/>
+    <dependency org="org.eclipse.swt" name="org.eclipse.swt.gtk.linux.x86_64" rev="4.6" conf="dev->default" transitive="false"/>
 
     <dependency org="junit"          name="junit"              rev="4.7"   conf="test->default"/>
     <dependency org="org.mockito"    name="mockito-all"        rev="1.9.5" conf="test->default" transitive="false" />

diff --git a/plugins/kettle-openerp-plugin/ivy.xml b/plugins/kettle-openerp-plugin/ivy.xml
@@ -27,7 +27,7 @@
       <exclude org="junit" module="junit"/>
     </dependency>
     <!-- SWT it required to compile any version of any architecture will work -->
-    <dependency org="org.eclipse.swt" name="swt-linux-x86_64" rev="4.3.2" transitive="false"/>
+    <dependency org="org.eclipse.swt" name="org.eclipse.swt.gtk.linux.x86_64" rev="4.6" transitive="false"/>
     <dependency org="org.eclipse" name="jface" rev="3.3.0-I20070606-0010" transitive="false"/>
     <dependency org="com.debortoliwines.openerp" name="openerp-java-api" rev="1.3.0" conf="default->default" transitive="false"/>
 

diff --git a/plugins/kettle-palo-plugin/ivy.xml b/plugins/kettle-palo-plugin/ivy.xml
@@ -24,7 +24,7 @@
     <dependency org="pentaho" name="pentaho-palo-core" rev="${dependency.pentaho-palo-core.revision}" conf="default->default" transitive="false"/>
 
     <!-- SWT it required to compile any version of any architecture will work -->
-    <dependency org="org.eclipse.swt" name="swt-linux-x86_64" rev="4.3.2" transitive="false"/>
+    <dependency org="org.eclipse.swt" name="org.eclipse.swt.gtk.linux.x86_64" rev="4.6" transitive="false"/>
     <dependency org="org.eclipse" name="jface" rev="3.3.0-I20070606-0010" transitive="false"/> 
 
     <dependency org="junit" name="junit" rev="4.7" conf="test->default"/> 

diff --git a/plugins/kettle-s3csvinput-plugin/ivy.xml b/plugins/kettle-s3csvinput-plugin/ivy.xml
@@ -25,7 +25,7 @@
     <dependency org="net.java.dev.jets3t" name="jets3t" rev="0.7.0" conf="default->default" transitive="false"/>
 
     <!-- SWT it required to compile any version of any architecture will work -->
-    <dependency org="org.eclipse.swt" name="swt-linux-x86_64" rev="4.3.2" transitive="false"/>
+    <dependency org="org.eclipse.swt" name="org.eclipse.swt.gtk.linux.x86_64" rev="4.6" transitive="false"/>
     <dependency org="org.eclipse" name="jface" rev="3.3.0-I20070606-0010" transitive="false"/> 
 
     <dependency org="junit" name="junit" rev="4.7" conf="test->default"/> 

diff --git a/plugins/kettle-shapefilereader-plugin/ivy.xml b/plugins/kettle-shapefilereader-plugin/ivy.xml
@@ -23,7 +23,7 @@
     <dependency org="pentaho-kettle" name="kettle-ui-swt" rev="${dependency.kettle.revision}" changing="true"/>
 
     <!-- SWT it required to compile any version of any architecture will work -->
-    <dependency org="org.eclipse.swt" name="swt-linux-x86_64" rev="4.3.2" transitive="false"/>
+    <dependency org="org.eclipse.swt" name="org.eclipse.swt.gtk.linux.x86_64" rev="4.6" transitive="false"/>
     <dependency org="org.eclipse" name="jface" rev="3.3.0-I20070606-0010" transitive="false"/> 
 
     <dependency org="junit" name="junit" rev="4.7" conf="test->default"/> 

diff --git a/plugins/kettle-xml-plugin/ivy.xml b/plugins/kettle-xml-plugin/ivy.xml
@@ -31,7 +31,7 @@
     <dependency org="commons-validator"   name="commons-validator"   rev="1.3.1"                                    conf="dev->default" transitive="false"/>
 
     <!-- SWT it required to compile any version of any architecture will work -->
-    <dependency org="org.eclipse.swt" name="swt-linux-x86_64" rev="4.3.2" conf="dev->default" transitive="false"/>
+    <dependency org="org.eclipse.swt" name="org.eclipse.swt.gtk.linux.x86_64" rev="4.6" conf="dev->default" transitive="false"/>
 
     <dependency org="junit"          name="junit"              rev="4.7"   conf="test->default"/>
     <dependency org="org.mockito"    name="mockito-all"        rev="1.9.5" conf="test->default" transitive="false" />

diff --git a/plugins/lucid-db-bulk-loader/ivy.xml b/plugins/lucid-db-bulk-loader/ivy.xml
@@ -42,7 +42,7 @@ explicitly covering such access.
     <dependency org="pentaho-kettle" name="kettle-core" rev="${dependency.kettle.revision}" transitive="true" changing="true"/>
     <dependency org="pentaho-kettle" name="kettle-ui-swt" rev="${dependency.kettle.revision}" transitive="false" changing="true"/>
     <!-- SWT it required to compile any version of any architecture will work -->
-    <dependency org="org.eclipse.swt" name="swt-linux-x86_64" rev="4.3.2" transitive="false"/>
+    <dependency org="org.eclipse.swt" name="org.eclipse.swt.gtk.linux.x86_64" rev="4.6" transitive="false"/>
     <dependency org="org.eclipse" name="jface" rev="3.3.0-I20070606-0010" transitive="false"/>
 
     <!-- test dependencies -->

diff --git a/plugins/lucid-db-streaming-loader/ivy.xml b/plugins/lucid-db-streaming-loader/ivy.xml
@@ -44,7 +44,7 @@ explicitly covering such access.
     <dependency org="pentaho-kettle" name="kettle-core" rev="${dependency.kettle.revision}" transitive="true" changing="true"/>
     <dependency org="pentaho-kettle" name="kettle-ui-swt" rev="${dependency.kettle.revision}" transitive="false" changing="true"/>
     <!-- SWT it required to compile any version of any architecture will work -->
-    <dependency org="org.eclipse.swt" name="swt-linux-x86_64" rev="4.3.2" transitive="false"/>
+    <dependency org="org.eclipse.swt" name="org.eclipse.swt.gtk.linux.x86_64" rev="4.6" transitive="false"/>
     <dependency org="org.eclipse" name="jface" rev="3.3.0-I20070606-0010" transitive="false"/>
 
     <!-- test dependencies -->

diff --git a/plugins/meta-inject-plugin/pom.xml b/plugins/meta-inject-plugin/pom.xml
@@ -27,7 +27,7 @@
     <dependency.pentaho-kettle.version>7.0-SNAPSHOT</dependency.pentaho-kettle.version>
     <guava.version>17.0</guava.version>
     <jface.version>3.3.0-I20070606-0010</jface.version>
-    <swt.version>4.3.2</swt.version>
+    <swt.version>4.6</swt.version>
   </properties>
   <dependencies>
     <dependency>
@@ -56,7 +56,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.swt</groupId>
-      <artifactId>swt-linux-x86_64</artifactId>
+      <artifactId>org.eclipse.swt.gtk.linux.x86_64</artifactId>
       <version>${swt.version}</version>
       <scope>compile</scope>
       <exclusions>

diff --git a/plugins/ms-access-bulk-loader/ivy.xml b/plugins/ms-access-bulk-loader/ivy.xml
@@ -44,7 +44,7 @@ explicitly covering such access.
     <dependency org="pentaho-kettle" name="kettle-core" rev="${dependency.kettle.revision}" transitive="true" changing="true"/>
     <dependency org="pentaho-kettle" name="kettle-ui-swt" rev="${dependency.kettle.revision}" transitive="false" changing="true"/>
     <!-- SWT it required to compile any version of any architecture will work -->
-    <dependency org="org.eclipse.swt" name="swt-linux-x86_64" rev="4.3.2" transitive="false"/>
+    <dependency org="org.eclipse.swt" name="org.eclipse.swt.gtk.linux.x86_64" rev="4.6" transitive="false"/>
     <dependency org="org.eclipse" name="jface" rev="3.3.0-I20070606-0010" transitive="false"/>
 
     <!-- test dependencies -->

diff --git a/plugins/salesforce/ivy.xml b/plugins/salesforce/ivy.xml
@@ -27,7 +27,7 @@
     <!--dependency org="org.apache.axis" name="axis-saaj" rev="1.4"/-->
 
     <!-- SWT it required to compile any version of any architecture will work -->
-    <dependency org="org.eclipse.swt" name="swt-linux-x86_64" rev="4.3.2" conf="dev->default" transitive="false"/>
+    <dependency org="org.eclipse.swt" name="org.eclipse.swt.gtk.linux.x86_64" rev="4.6" conf="dev->default" transitive="false"/>
 
     <dependency org="junit"          name="junit"              rev="4.7"   conf="test->default"/>
     <dependency org="org.mockito"    name="mockito-all"        rev="1.9.5" conf="test->default" transitive="false" />

diff --git a/plugins/ssh2-plugin/ivy.xml b/plugins/ssh2-plugin/ivy.xml
@@ -44,7 +44,7 @@ explicitly covering such access.
     <dependency org="pentaho-kettle" name="kettle-core" rev="${dependency.kettle.revision}" transitive="true" changing="true"/>
     <dependency org="pentaho-kettle" name="kettle-ui-swt" rev="${dependency.kettle.revision}" transitive="false" changing="true"/>
     <!-- SWT it required to compile any version of any architecture will work -->
-    <dependency org="org.eclipse.swt" name="swt-linux-x86_64" rev="4.3.2" transitive="false"/>
+    <dependency org="org.eclipse.swt" name="org.eclipse.swt.gtk.linux.x86_64" rev="4.6" transitive="false"/>
     <dependency org="org.eclipse" name="jface" rev="3.3.0-I20070606-0010" transitive="false"/>
 
     <!-- test dependencies -->

diff --git a/plugins/xml-input-stream/ivy.xml b/plugins/xml-input-stream/ivy.xml
@@ -23,7 +23,7 @@
     <dependency org="pentaho-kettle" name="kettle-ui-swt" rev="${dependency.kettle.revision}" transitive="false" changing="true"/>
 
     <!-- SWT it required to compile any version of any architecture will work -->
-    <dependency org="org.eclipse.swt" name="swt-linux-x86_64" rev="4.3.2" transitive="false"/>
+    <dependency org="org.eclipse.swt" name="org.eclipse.swt.gtk.linux.x86_64" rev="4.6" transitive="false"/>
     <dependency org="org.eclipse" name="jface" rev="3.3.0-I20070606-0010" transitive="false"/>
 
     <!-- test dependencies -->

diff --git a/plugins/xml-input/ivy.xml b/plugins/xml-input/ivy.xml
@@ -23,7 +23,7 @@
     <dependency org="pentaho-kettle" name="kettle-ui-swt" rev="${dependency.kettle.revision}" transitive="false" changing="true"/>
 
     <!-- SWT it required to compile any version of any architecture will work -->
-    <dependency org="org.eclipse.swt" name="swt-linux-x86_64" rev="4.3.2" transitive="false"/>
+    <dependency org="org.eclipse.swt" name="org.eclipse.swt.gtk.linux.x86_64" rev="4.6" transitive="false"/>
     <dependency org="org.eclipse" name="jface" rev="3.3.0-I20070606-0010" transitive="false"/>
 
     <!-- test dependencies -->

diff --git a/ui/ivy.xml b/ui/ivy.xml
@@ -31,7 +31,7 @@
     <!-- Third-party (external) dependencies -->
 
     <!-- SWT it required to compile any version of any architecture will work -->
-    <dependency org="org.eclipse.swt"       name="swt-linux-x86_64"    rev="4.3.2" transitive="false" />
+    <dependency org="org.eclipse.swt"       name="org.eclipse.swt.gtk.linux.x86_64"    rev="4.6" transitive="false" />
 
     <dependency org="org.eclipse.equinox"   name="common"              rev="3.3.0-v20070426"      transitive="false"/>
     <dependency org="org.eclipse"           name="jface"               rev="3.3.0-I20070606-0010" transitive="false" conf="default->default"/>