From: Ben Soares <bsoares@dundee.ac.uk>
Date: Fri, 4 Oct 2019 19:52:04 +0000 (+0100)
Subject: JAL-3210 ... a bit closer ... goomph jalviewjs build
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=efd3ed3e33e3c24e8b6bfd77b7e1463b36e1c362;p=jalview.git

JAL-3210 ... a bit closer ... goomph jalviewjs build
---

diff --git a/build.gradle b/build.gradle
index fe25132..0a5af56 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,6 @@ import org.apache.tools.ant.filters.ReplaceTokens
 import org.gradle.internal.os.OperatingSystem
 import org.gradle.plugins.ide.eclipse.model.*
 import groovy.transform.ExternalizeMethods
-//import org.eclipse.osgi.*
 import com.diffplug.gradle.GoomphCacheLocations
 
 buildscript {
@@ -13,9 +12,6 @@ buildscript {
     */
 	mavenLocal()
   }
-  dependencies {
-    //classpath 'org.apache.ant:org.apache.ant:1.6.5'
-  }
 }
 
 plugins {
@@ -25,25 +21,45 @@ plugins {
   id 'com.diffplug.gradle.oomph.ide' version '3.18.1'
   id 'com.diffplug.gradle.equinoxlaunch' version '3.18.1'
   id 'com.diffplug.gradle.eclipse.mavencentral' version '3.18.1'
+  id 'com.diffplug.gradle.p2.asmaven' version '3.18.1'
 }
 
-
 def jalviewDirAbsolutePath = file(jalviewDir).getAbsolutePath()
 
 repositories {
   jcenter()
   mavenCentral()
-  maven { url "http://maven.icm.edu.pl/artifactory/repo/" }
-  maven { url "http://maven.geomajas.org/" }
-  maven { url "https://repo.spring.io/plugins-release/" }
-  maven { url "http://maven.thingml.org/thirdparty/" }
-  maven { url "${jalviewDirAbsolutePath}/${m2RepoDir}" }
-  mavenLocal()
+  //maven { url "http://maven.icm.edu.pl/artifactory/repo/" }
+  //maven { url "http://maven.geomajas.org/" }
+  //maven { url "https://repo.spring.io/plugins-release/" }
+  //maven { url "http://maven.thingml.org/thirdparty/" }
+  //maven { url "${jalviewDirAbsolutePath}/${m2RepoDir}" }
+  //mavenLocal()
   flatDir {
     dirs gradlePluginsDir
   }
 }
 
+configurations {
+  jalviewjsIde
+}
+
+p2AsMaven {
+  group 'eclipseDeps', {
+    repoEclipse goomph_eclipse_repo_version
+    slicingOption 'latestVersionOnly', 'true'
+    iu 'org.eclipse.update.configurator'
+  }
+  group 'eclipseOrbit', {
+    repo goomph_orbit_repo
+    slicingOption 'latestVersionOnly', 'true'
+    iu 'org.apache.ant'
+    iu 'org.apache.batik.css'
+    iu 'org.apache.commons.jxpath'
+    iu 'javax.servlet'
+  }
+}
+
 dependencies {
     //compile group: 'org.osgi', name: 'org.osgi.service.component', version: '1.4.0'
 /*
@@ -55,62 +71,72 @@ dependencies {
     source.addMaven('org.eclipse.platform:org.eclipse.equinox.ds:1.6.0')
     source.addMaven('javax.inject:com.springsource.javax.inject:1.0.0')
 */
-  //compile 'org.apache.ant:org.apache.ant:1.6.5'
-}
 
+  //compile 'eclipseOrbit:org.apache.ant:1.10.5.v20190526-1402'
+  //compile 'eclipseOrbit:javax.servlet:3.1.0.v201410161800'
+  //compile 'eclipseDeps:net.sf.j2s.core:3.2.4'
+  //compile 'eclipseDeps:com.seeq.eclipse.importprojects:1.4.0'
 
+  //compile 'eclipseDeps:org.eclipse.update.configurator:3.3.400'
 
+  
+}
 
 
 
 
-/*
-p2AsMaven {
-  def requiredBundles = [
-		'org.eclipse.core.commands',
-		'org.eclipse.core.resources',
-		'org.eclipse.core.runtime',
-		'org.eclipse.ui',
-		'org.eclipse.ui.ide',
-		'org.eclipse.jface',
-		'org.eclipse.swt',
-		//"org.eclipse.swt.${com.diffplug.common.swt.os.SwtPlatform.getNative()}",
-		'org.eclipse.equinox.registry',
-		'org.eclipse.equinox.common',
-		'org.eclipse.osgi',
-		'org.eclipse.core.jobs',
-		'org.eclipse.ui.workbench',
-		'org.eclipse.jdt.core',
-		'org.eclipse.jdt.ui',
-		'org.eclipse.text'
-  ]
 
-  group 'eclipse-deps', {
-    repoEclipse '4.12.0'
-    // reduce the number of plugins downloaded
-    slicingOption 'latestVersionOnly', 'true'
-    requiredBundles.each {
-      iu "${it}"
-    }
-    append true
-  }
-}
-*/
 
-/*
 eclipseMavenCentral {
-  release '4.13.0', {
-    compile 'org.eclipse.osgi'
-    compile 'org.eclipse.equinox.common'
-    compile 'org.eclipse.update.configurator'
-    compile 'org.eclipse.core.runtime'
+  release goomph_eclipse_repo_version, {
+
+    //def platformCode="cocoa.macosx.x86_64"
+    //compile 'org.eclipse.swt.'+platformCode
+    useNativesForRunningPlatform()
+    compile 'org.eclipse.swt'
+
+    compile 'org.eclipse.ant.core'
+    compile 'org.eclipse.compare.core'
+    compile 'org.eclipse.core.commands'
+    compile 'org.eclipse.core.contenttype'
     compile 'org.eclipse.core.jobs'
+    compile 'org.eclipse.core.expressions'
+    compile 'org.eclipse.core.filesystem'
+    compile 'org.eclipse.core.resources'
+    compile 'org.eclipse.core.runtime'
+    compile 'org.eclipse.core.variables'
+    compile 'org.eclipse.e4.core.commands'
+    compile 'org.eclipse.e4.core.contexts'
+    compile 'org.eclipse.e4.core.di'
+    compile 'org.eclipse.e4.core.di.annotations'
+    compile 'org.eclipse.e4.core.services'
+    compile 'org.eclipse.equinox.common'
     compile 'org.eclipse.equinox.ds'
+    compile 'org.eclipse.equinox.app'
+    compile 'org.eclipse.equinox.registry'
+    compile 'org.eclipse.equinox.preferences'
+    compile 'org.eclipse.jface'
+    compile 'org.eclipse.osgi'
     compile 'org.eclipse.osgi.services'
-    useNativesForRunningPlatform()
+    compile 'org.eclipse.ui'
+    compile 'org.eclipse.ui.workbench'
+    compile 'org.eclipse.team.core'
+    compile 'org.eclipse.text'
+
+    compile 'org.eclipse.e4.ui.bindings'
+    compile 'org.eclipse.e4.ui.model.workbench'
+    compile 'org.eclipse.e4.ui.workbench'
+    compile 'org.eclipse.e4.ui.workbench.swt'
+    compile 'org.eclipse.e4.ui.css.core'
+    compile 'org.eclipse.e4.ui.css.swt'
+    compile 'org.eclipse.e4.ui.services'
+    compile 'org.eclipse.e4.ui.di'
+
+    // org.eclipse.update.configurator deliberately kept at 3.3.400 see https://github.com/diffplug/goomph/issues/69
+    //compile 'org.eclipse.update.configurator'
+
   }
 }
-*/
 
 
 
@@ -392,33 +418,33 @@ oomphIde {
 
 equinoxLaunch {
   ideJalviewjsBuildSetup {
-    //source.addThisProject()
 
     source.addConfiguration(configurations.compile)
-    source.addConfiguration(configurations.compileClasspath)
-    
-    //source.addMaven('com.ibm.icu:icu4j:65.1')
-    source.addMaven('org.eclipse.birt.runtime:com.ibm.icu:56.1.0.v201601250100')
 
+    source.addMaven('eclipseOrbit:org.apache.ant:1.10.5.v20190526-1402')
+    source.addMaven('eclipseOrbit:javax.servlet:3.1.0.v201410161800')
+
+    source.addMaven('org.eclipse.birt.runtime:com.ibm.icu:56.1.0.v201601250100')
     source.addMaven('javax.inject:com.springsource.javax.inject:1.0.0')
 
-    //source.addMaven('org.apache.ant:ant:1.6.5')
-    //source.addMaven('org.apache.ant:org.apache.ant:1.6.5')
-    //source.addMaven('ant:ant:1.6.5')
+    //source.addMaven('eclipse-deps:org.apache.ant:1.10.5')
 
     source.addMaven('org.apache.felix:org.apache.felix.scr:2.1.16')
 
     source.addMaven('org.osgi:org.osgi.framework:1.9.0')
     source.addMaven('org.osgi:org.osgi.service.component:1.4.0')
+    source.addMaven('org.osgi:org.osgi.service.event:1.4.0')
     source.addMaven('org.osgi:org.osgi.util.promise:1.1.1')
     source.addMaven('org.osgi:org.osgi.util.function:1.1.0')
 
-### TRY AND FIND A HEADLESS BUILD WITHOUT org.eclipse.jdt.apt.core
-    source.addMaven('org.eclipse.maven:org.eclipse.jdt.apt.core:3.8.0')
-    source.addMaven('org.eclipse.maven:org.eclipse.jdt.core:3.8.0')
-    //source.addMaven('org.eclipse.jdt:org.eclipse.jdt.apt.core:3.6.500')
-    //source.addMaven('org.eclipse.jdt:org.eclipse.jdt.core:3.19.0')
+//### TRY AND FIND A HEADLESS BUILD WITHOUT org.eclipse.jdt.apt.core
+    source.addMaven('org.eclipse.jdt:org.eclipse.jdt.apt.core:3.6.500')
+    source.addMaven('org.eclipse.jdt:org.eclipse.jdt.core:3.19.0')
 
+    source.addMaven('org.eclipse.platform:org.eclipse.update.configurator:3.3.400')
+
+    //source.addMaven('org.eclipse.e4.ui.internal.workbench.swt')
+    /*
     source.addMaven('org.eclipse.platform:org.eclipse.ant.core:3.5.500')
     source.addMaven('org.eclipse.platform:org.eclipse.compare.core:3.6.600')
     source.addMaven('org.eclipse.platform:org.eclipse.core.commands:3.9.500')
@@ -429,22 +455,29 @@ equinoxLaunch {
     source.addMaven('org.eclipse.platform:org.eclipse.core.resources:3.13.500')
     source.addMaven('org.eclipse.platform:org.eclipse.core.runtime:3.16.0')
     source.addMaven('org.eclipse.platform:org.eclipse.core.variables:3.4.600')
+    //source.addMaven('org.eclipse.platform:org.eclipse.e4.commands:3.10.500')
+    source.addMaven('org.eclipse.platform:org.eclipse.e4.core.commands:0.12.700')
+    source.addMaven('org.eclipse.platform:org.eclipse.e4.core.contexts:1.8.200')
+    source.addMaven('org.eclipse.platform:org.eclipse.e4.core.di:1.7.400')
+    source.addMaven('org.eclipse.platform:org.eclipse.e4.core.di.annotations:1.6.400')
+    source.addMaven('org.eclipse.platform:org.eclipse.e4.core.services:2.2.0')
+    source.addMaven('org.eclipse.platform:org.eclipse.e4.ui.workbench:1.10.100')
     source.addMaven('org.eclipse.platform:org.eclipse.equinox.common:3.10.500')
     source.addMaven('org.eclipse.platform:org.eclipse.equinox.ds:1.6.0')
     source.addMaven('org.eclipse.platform:org.eclipse.equinox.app:1.4.300')
     source.addMaven('org.eclipse.platform:org.eclipse.equinox.registry:3.8.500')
     source.addMaven('org.eclipse.platform:org.eclipse.equinox.preferences:3.7.500')
+    source.addMaven('org.eclipse.platform:org.eclipse.jface:3.17.0')
     source.addMaven('org.eclipse.platform:org.eclipse.osgi:3.14.0')
+    source.addMaven('org.eclipse.platform:org.eclipse.swt:3.112.0')
+    source.addMaven('org.eclipse.platform:org.eclipse.ui:3.114.0')
+    source.addMaven('org.eclipse.platform:org.eclipse.ui.workbench:3.116.0')
     source.addMaven('org.eclipse.platform:org.eclipse.team.core:3.8.700')
     source.addMaven('org.eclipse.platform:org.eclipse.text:3.9.0')
     // org.eclipse.update.configurator deliberately kept at 3.3.400 see https://github.com/diffplug/goomph/issues/69
     source.addMaven('org.eclipse.platform:org.eclipse.update.configurator:3.3.400')
-    /*
-    source.addMaven('org.eclipse.platform:org.eclipse.:3.')
-    source.addMaven('org.eclipse.platform:org.eclipse.:3.')
-    source.addMaven('org.eclipse.platform:org.eclipse.:3.')
-    source.addMaven('org.eclipse.platform:org.eclipse.:3.')
-    source.addMaven('org.eclipse.platform:org.eclipse.:3.')
+
+    source.addMaven('org.eclipse.platform:org.eclipse.e4.ui.bindings:0.12.600')
     */
 
 
diff --git a/gradle.properties b/gradle.properties
index 216fddc..7633898 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -87,6 +87,8 @@ spotless_eclipse_version = 4.12.0
 ## 4.12
 #goomph_eclipse_version = 4.12
 #goomph_eclipse_version_name = 2019-06
+#goomph_eclipse_repo_version = 4.13.0
+#goomph_orbit_repo = https://download.eclipse.org/tools/orbit/downloads/drops/R20190602212107/repository
 #goomph_eclipse_jee_feature = org.eclipse.epp.package.jee.feature
 ## find the jee feature version from https://download.eclipse.org/technology/epp/packages/<ECLIPSE_VERSION_NAME>/features/
 #goomph_eclipse_jee_version = 4.12.0.20190614-1200
@@ -94,6 +96,8 @@ spotless_eclipse_version = 4.12.0
 # 4.13
 goomph_eclipse_version = 4.13
 goomph_eclipse_version_name = 2019-09
+goomph_eclipse_repo_version = 4.13.0
+goomph_orbit_repo = https://download.eclipse.org/tools/orbit/downloads/drops/R20190827152740/repository
 goomph_eclipse_jee_feature = org.eclipse.epp.package.jee.feature
 goomph_eclipse_jee_version = 4.13.0.20190917-0000
 
diff --git a/gradle/plugins/com.seeq.eclipse.importprojects-1.4.0.jar b/gradle/plugins/com.seeq.eclipse.importprojects-1.4.0.jar
new file mode 100644
index 0000000..69d7603
Binary files /dev/null and b/gradle/plugins/com.seeq.eclipse.importprojects-1.4.0.jar differ
diff --git a/gradle/plugins/net.sf.j2s.core-3.2.4.jar b/gradle/plugins/net.sf.j2s.core-3.2.4.jar
new file mode 100644
index 0000000..e8288a9
Binary files /dev/null and b/gradle/plugins/net.sf.j2s.core-3.2.4.jar differ
diff --git a/gradle/plugins/org/apache/ant/maven-metadata.xml b/gradle/plugins/org/apache/ant/maven-metadata.xml
deleted file mode 100644
index 118b7de..0000000
--- a/gradle/plugins/org/apache/ant/maven-metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<metadata>
-  <groupId>org.apache.ant</groupId>
-  <artifactId>org.apache.ant</artifactId>
-  <version>1.6.5</version>
-</metadata>
diff --git a/gradle/plugins/org/apache/ant/org.apache.ant-1.6.5.jar b/gradle/plugins/org/apache/ant/org.apache.ant-1.6.5.jar
deleted file mode 100644
index 3beb3b8..0000000
Binary files a/gradle/plugins/org/apache/ant/org.apache.ant-1.6.5.jar and /dev/null differ
diff --git a/gradle/plugins/org/apache/ant/org.apache.ant-1.6.5.pom b/gradle/plugins/org/apache/ant/org.apache.ant-1.6.5.pom
deleted file mode 100644
index 67eca35..0000000
--- a/gradle/plugins/org/apache/ant/org.apache.ant-1.6.5.pom
+++ /dev/null
@@ -1,27 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache</groupId>
-    <artifactId>apache</artifactId>
-    <version>4</version>
-  </parent>
-  <groupId>org.apache.ant</groupId>
-  <artifactId>org.apache.ant</artifactId>
-  <version>1.6.5</version>
-  <!-- Fixed per MEV-531 -->
-  <dependencies>
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xercesImpl</artifactId>
-      <version>2.6.2</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>xml-apis</groupId>
-      <artifactId>xml-apis</artifactId>
-      <version>1.3.04</version>
-      <optional>true</optional>
-    </dependency>
-  </dependencies>
-</project>