From: soares <bsoares@dundee.ac.uk>
Date: Thu, 3 Oct 2019 21:15:06 +0000 (+0100)
Subject: JAL-3210 ... almost goomph build
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=9690724bb5f76f9a5c23cf3b9c44716a6a39928b;p=jalview.git

JAL-3210 ... almost goomph build
---

diff --git a/build.gradle b/build.gradle
index f355258..fe25132 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,6 +11,10 @@ buildscript {
     mavenCentral()
     jcenter()
     */
+	mavenLocal()
+  }
+  dependencies {
+    //classpath 'org.apache.ant:org.apache.ant:1.6.5'
   }
 }
 
@@ -24,20 +28,6 @@ plugins {
 }
 
 
-dependencies {
-    //compile group: 'org.osgi', name: 'org.osgi.service.component', version: '1.4.0'
-/*
-    source.addMaven('org.eclipse.platform:org.eclipse.osgi:3.14.0')
-    source.addMaven('org.eclipse.platform:org.eclipse.equinox.common:3.10.400')
-    source.addMaven('org.eclipse.platform:org.eclipse.core.jobs:3.10.400')
-    source.addMaven('org.eclipse.platform:org.eclipse.update.configurator:3.4.300')
-    source.addMaven('org.eclipse.platform:org.eclipse.core.runtime:3.16.0')
-    source.addMaven('org.eclipse.platform:org.eclipse.equinox.ds:1.6.0')
-    source.addMaven('javax.inject:com.springsource.javax.inject:1.0.0')
-*/
-  //compile 'com.ibm.icu:com.ibm.icu:4.4.2'
-}
-
 def jalviewDirAbsolutePath = file(jalviewDir).getAbsolutePath()
 
 repositories {
@@ -46,6 +36,7 @@ repositories {
   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 {
@@ -53,6 +44,20 @@ repositories {
   }
 }
 
+dependencies {
+    //compile group: 'org.osgi', name: 'org.osgi.service.component', version: '1.4.0'
+/*
+    source.addMaven('org.eclipse.platform:org.eclipse.osgi:3.14.0')
+    source.addMaven('org.eclipse.platform:org.eclipse.equinox.common:3.10.400')
+    source.addMaven('org.eclipse.platform:org.eclipse.core.jobs:3.10.400')
+    source.addMaven('org.eclipse.platform:org.eclipse.update.configurator:3.4.300')
+    source.addMaven('org.eclipse.platform:org.eclipse.core.runtime:3.16.0')
+    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'
+}
+
 
 
 
@@ -387,16 +392,19 @@ oomphIde {
 
 equinoxLaunch {
   ideJalviewjsBuildSetup {
-    source.addThisProject()
+    //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('javax.inject:com.springsource.javax.inject:1.0.0')
 
-    //source.addMaven('org.apache.ant:ant:1.7.0')
-    source.addMaven('org.apache.ant:org.apache.ant:1.6.5')
+    //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('org.apache.felix:org.apache.felix.scr:2.1.16')
 
@@ -405,10 +413,11 @@ equinoxLaunch {
     source.addMaven('org.osgi:org.osgi.util.promise:1.1.1')
     source.addMaven('org.osgi:org.osgi.util.function:1.1.0')
 
-    source.addMaven('org.eclipse.jdt:org.eclipse.jdt.apt.core:3.6.500')
-    //source.addMaven('org.eclipse.jdt:org.eclipse.jdt.apt.ui:3.6.300')
-    //source.addMaven('org.eclipse.jdt:org.eclipse.jdt.compiler.apt:1.3.700')
-    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.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')
 
     source.addMaven('org.eclipse.platform:org.eclipse.ant.core:3.5.500')
     source.addMaven('org.eclipse.platform:org.eclipse.compare.core:3.6.600')
@@ -428,6 +437,7 @@ equinoxLaunch {
     source.addMaven('org.eclipse.platform:org.eclipse.osgi:3.14.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.')