From 2111b8f107adf2724a1966e767cf67f8a5fc72b3 Mon Sep 17 00:00:00 2001
From: Stephan Herrmann
Date: Sun, 8 Sep 2019 19:22:53 +0200
Subject: Releng: build against S-4.13RC2-201909071130 and Orbit
 R20190827152740

---
 .../feature.xml                                    |  2 +-
 .../build-scripts/build/otdt_prerequisites-hipp.sh |  6 ++---
 releng/build-scripts/build/run.properties          |  4 ++--
 releng/map/otdt.map.in                             | 26 +++++++++-------------
 4 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/features/org.eclipse.objectteams.otdt.core.patch/feature.xml b/features/org.eclipse.objectteams.otdt.core.patch/feature.xml
index 3c7cf2c12..348473ca8 100644
--- a/features/org.eclipse.objectteams.otdt.core.patch/feature.xml
+++ b/features/org.eclipse.objectteams.otdt.core.patch/feature.xml
@@ -59,7 +59,7 @@ Project Leader:
    </url>
 
    <requires>
-      <import feature="org.eclipse.jdt" version="3.18.100.v20190828-1800" patch="true"/>
+      <import feature="org.eclipse.jdt" version="3.18.100.v20190907-1130" patch="true"/>
    </requires>
 
    <plugin
diff --git a/releng/build-scripts/build/otdt_prerequisites-hipp.sh b/releng/build-scripts/build/otdt_prerequisites-hipp.sh
index ed20690c6..85550603b 100644
--- a/releng/build-scripts/build/otdt_prerequisites-hipp.sh
+++ b/releng/build-scripts/build/otdt_prerequisites-hipp.sh
@@ -56,11 +56,11 @@ ARCH=`arch`
 
 # VERSIONS:
 # Eclipse SDK build identifier (used for substitution in otdt.map.in etc.):
-SDK_QUALIFIER=${SDK_QUALIFIER:="I20190828-1800"}
+SDK_QUALIFIER=${SDK_QUALIFIER:="I20190907-1130"}
 
 # used only locally (components of the ECLIPSE_SDK_TGZ path):
-EVERSION=${EVERSION:="4.13RC1"}
-DROP=${DROPS4}/${DROP:="S-4.13RC1-201908281800"}
+EVERSION=${EVERSION:="4.13RC2"}
+DROP=${DROPS4}/${DROP:="S-4.13RC2-201909071130"}
 
 # EXPORT: archive file of the base eclipse SDK build:
 ECLIPSE_SDK_TGZ=${DROP}/eclipse-SDK-${EVERSION}-linux-gtk-${ARCH}.tar.gz
diff --git a/releng/build-scripts/build/run.properties b/releng/build-scripts/build/run.properties
index 6544897bc..2c94810f6 100644
--- a/releng/build-scripts/build/run.properties
+++ b/releng/build-scripts/build/run.properties
@@ -23,8 +23,8 @@ run.eclipseScriptDir=plugins/org.eclipse.pde.build_3.10.500.v20190620-0530/scrip
 org.eclipse.equinox.launcher_jar=org.eclipse.equinox.launcher_1.5.500.v20190715-1310.jar
 
 # for patching our patch feature to match this version with any suffix:
-jdt.feature.version=3.18.100.v20190828-1800
-jdt.feature.version.next=3.18.100.v20190828-1801
+jdt.feature.version=3.18.100.v20190907-1130
+jdt.feature.version.next=3.18.100.v20190907-1131
 
 # jdt.core fragments for extracting pre-built classes and properties:
 jdt.compiler.apt=org.eclipse.jdt.compiler.apt_1.3.700.v20190704-1731.jar
diff --git a/releng/map/otdt.map.in b/releng/map/otdt.map.in
index c683b9f9a..514048561 100644
--- a/releng/map/otdt.map.in
+++ b/releng/map/otdt.map.in
@@ -45,23 +45,17 @@ plugin@org.eclipse.objectteams.otdt.pde.ui=GIT,repo=git://git.eclipse.org/gitroo
 plugin@org.eclipse.objectteams.otdt.samples=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.samples,tag=builds/201706061122
 
 !** Consume BCEL from Orbit: **!
-plugin@org.apache.bcel,5.2.0=p2IU,id=org.apache.bcel,version=5.2.0.v201005080400,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20190226160451/repository
+plugin@org.apache.bcel,5.2.0=p2IU,id=org.apache.bcel,version=5.2.0.v201005080400,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20190827152740/repository
 !** ASM from Orbit: **!
-!plugin@org.objectweb.asm,6.2.1=p2IU,id=org.objectweb.asm,version=6.2.1.v20181030-2244,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20190226160451/repository/
-!plugin@org.objectweb.asm.tree,6.2.1=p2IU,id=org.objectweb.asm.tree,version=6.2.1.v20181030-2244,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20190226160451/repository/
-!plugin@org.objectweb.asm.commons,6.2.1=p2IU,id=org.objectweb.asm.commons,version=6.2.1.v20181030-2244,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20190226160451/repository/
-!plugin@org.objectweb.asm.util,6.2.1=p2IU,id=org.objectweb.asm.util,version=6.2.1.v20181030-2244,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20190226160451/repository/
-!plugin@org.objectweb.asm.analysis,6.2.1=p2IU,id=org.objectweb.asm.analysis,version=6.2.1.v20181030-2244,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20190226160451/repository/
-
-plugin@org.objectweb.asm,7.1.0=p2IU,id=org.objectweb.asm,version=7.1.0.v20190412-2143,repository=http://download.eclipse.org/tools/orbit/downloads/drops/S20190827152740/repository/
-plugin@org.objectweb.asm.tree,7.1.0=p2IU,id=org.objectweb.asm.tree,version=7.1.0.v20190412-2143,repository=http://download.eclipse.org/tools/orbit/downloads/drops/S20190827152740/repository/
-plugin@org.objectweb.asm.commons,7.1.0=p2IU,id=org.objectweb.asm.commons,version=7.1.0.v20190412-2143,repository=http://download.eclipse.org/tools/orbit/downloads/drops/S20190827152740/repository/
-plugin@org.objectweb.asm.util,7.1.0=p2IU,id=org.objectweb.asm.util,version=7.1.0.v20190412-2143,repository=http://download.eclipse.org/tools/orbit/downloads/drops/S20190827152740/repository/
-plugin@org.objectweb.asm.analysis,7.1.0=p2IU,id=org.objectweb.asm.analysis,version=7.1.0.v20190412-2143,repository=http://download.eclipse.org/tools/orbit/downloads/drops/S20190827152740/repository/
-
-plugin@org.mockito,1.9.5=p2IU,id=org.mockito,version=1.9.5.v201605172210,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20190226160451/repository/
-plugin@org.hamcrest.core,1.3.0=p2IU,id=org.hamcrest.core,version=1.3.0.v20180420-1519,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20190226160451/repository/
-plugin@org.hamcrest.library,1.3.0=p2IU,id=org.hamcrest.library,version=1.3.0.v20180524-2246,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20190226160451/repository/
+plugin@org.objectweb.asm,7.1.0=p2IU,id=org.objectweb.asm,version=7.1.0.v20190412-2143,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20190827152740/repository/
+plugin@org.objectweb.asm.tree,7.1.0=p2IU,id=org.objectweb.asm.tree,version=7.1.0.v20190412-2143,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20190827152740/repository/
+plugin@org.objectweb.asm.commons,7.1.0=p2IU,id=org.objectweb.asm.commons,version=7.1.0.v20190412-2143,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20190827152740/repository/
+plugin@org.objectweb.asm.util,7.1.0=p2IU,id=org.objectweb.asm.util,version=7.1.0.v20190412-2143,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20190827152740/repository/
+plugin@org.objectweb.asm.analysis,7.1.0=p2IU,id=org.objectweb.asm.analysis,version=7.1.0.v20190412-2143,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20190827152740/repository/
+
+plugin@org.mockito,1.9.5=p2IU,id=org.mockito,version=1.9.5.v201605172210,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20190827152740/repository/
+plugin@org.hamcrest.core,1.3.0=p2IU,id=org.hamcrest.core,version=1.3.0.v20180420-1519,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20190827152740/repository/
+plugin@org.hamcrest.library,1.3.0=p2IU,id=org.hamcrest.library,version=1.3.0.v20180524-2246,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20190827152740/repository/
 
 !========== JDT/UI: ==========!
 plugin@org.eclipse.jdt.ui=GIT,tag=@SDK_QUALIFIER@,repo=git://git.eclipse.org/gitroot/jdt/eclipse.jdt.ui.git,path=org.eclipse.jdt.ui
-- 
cgit v1.2.3