Releng: build against I20180725-2000, bump up some versions
diff --git a/features/org.eclipse.objectteams.otdt.core.patch/feature.xml b/features/org.eclipse.objectteams.otdt.core.patch/feature.xml
index 0e50589..4bae537 100644
--- a/features/org.eclipse.objectteams.otdt.core.patch/feature.xml
+++ b/features/org.eclipse.objectteams.otdt.core.patch/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.objectteams.otdt.core.patch"
label="%featureName"
- version="2.7.0.qualifier"
+ version="2.7.1.qualifier"
provider-name="%providerName"
plugin="org.eclipse.jdt.core">
@@ -55,18 +55,18 @@
</license>
<url>
- <update label="Object Teams Updates" url="http://download.eclipse.org/objectteams/updates/ot2.6"/>
+ <update label="Object Teams Updates" url="http://download.eclipse.org/objectteams/updates/ot2.7"/>
</url>
<requires>
- <import feature="org.eclipse.jdt" version="3.14.0.v20180611-0500" patch="true"/>
+ <import feature="org.eclipse.jdt" version="3.15.0.v20180725-2000" patch="true"/>
</requires>
<plugin
id="org.eclipse.jdt.core"
download-size="5614"
install-size="5614"
- version="3.14.0.OTDT_r270_qualifier"
+ version="3.14.100.OTDT_r271_qualifier"
unpack="false"/>
</feature>
diff --git a/features/org.eclipse.objectteams.otdt.feature/feature.xml b/features/org.eclipse.objectteams.otdt.feature/feature.xml
index 4180441..80c6210 100644
--- a/features/org.eclipse.objectteams.otdt.feature/feature.xml
+++ b/features/org.eclipse.objectteams.otdt.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.objectteams.otdt"
label="%featureName"
- version="2.7.0.qualifier"
+ version="2.7.1.qualifier"
provider-name="%providerName"
plugin="org.eclipse.objectteams.otdt"
image="OTDT-110.png">
@@ -65,7 +65,7 @@
<includes
id="org.eclipse.objectteams.otdt.core.patch"
- version="2.7.0.qualifier"/>
+ version="2.7.1.qualifier"/>
<plugin
id="org.eclipse.objectteams.otdt"
diff --git a/features/org.eclipse.objectteams.otdt.source.feature/feature.xml b/features/org.eclipse.objectteams.otdt.source.feature/feature.xml
index efa140a..8d23cdc 100644
--- a/features/org.eclipse.objectteams.otdt.source.feature/feature.xml
+++ b/features/org.eclipse.objectteams.otdt.source.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.objectteams.otdt.source.feature"
label="%featureName"
- version="2.7.0.qualifier"
+ version="2.7.1.qualifier"
provider-name="%providerName">
<description url="http://www.eclipse.org/objectteams">
diff --git a/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties b/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties
index f9e5cc4..7d019a4 100644
--- a/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties
+++ b/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties
@@ -31,8 +31,8 @@
###{ObjectTeams:
otdtc.name = Extension for Object Teams
-otdtc.version = 2.6.1
-otdtc.copyright = Copyright by TU Berlin, Fraunhofer FIRST and others, 2004, 2017.
+otdtc.version = 2.7.1
+otdtc.copyright = Copyright by TU Berlin, Fraunhofer FIRST and others, 2004, 2018.
### SH}
### progress
progress.compiling = Compiling
diff --git a/plugins/org.eclipse.objectteams.otdt.jdt.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otdt.jdt.ui/META-INF/MANIFEST.MF
index f21eae7..0eab793 100644
--- a/plugins/org.eclipse.objectteams.otdt.jdt.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otdt.jdt.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.objectteams.otdt.jdt.ui;singleton:=true
Automatic-Module-Name: org.eclipse.objectteams.otdt.jdt.ui
-Bundle-Version: 2.7.0.qualifier
+Bundle-Version: 2.7.1.qualifier
Require-Bundle: org.eclipse.jdt.ui;bundle-version="[3.10.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.7.0,4.0.0)",
diff --git a/plugins/org.eclipse.objectteams.otdt.refactoring/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otdt.refactoring/META-INF/MANIFEST.MF
index 4f1b7a6..71317e3 100644
--- a/plugins/org.eclipse.objectteams.otdt.refactoring/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otdt.refactoring/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.objectteams.otdt.refactoring;singleton:=true
-Bundle-Version: 2.6.0.qualifier
+Bundle-Version: 2.7.1.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Require-Bundle: org.eclipse.jdt.ui;bundle-version="[3.10.100,4.0.0)",
diff --git a/releng/build-scripts/build/otdt_prerequisites-hipp.sh b/releng/build-scripts/build/otdt_prerequisites-hipp.sh
index 865a9f4..ed33b21 100644
--- a/releng/build-scripts/build/otdt_prerequisites-hipp.sh
+++ b/releng/build-scripts/build/otdt_prerequisites-hipp.sh
@@ -53,14 +53,14 @@
# VERSIONS:
# Eclipse SDK build identifier (used for substitution in otdt.map.in etc.):
-SDK_QUALIFIER=${SDK_QUALIFIER:="I20180611-0500"}
+SDK_QUALIFIER=${SDK_QUALIFIER:="I20180725-2000"}
# Architecture (as used by OSGi):
ARCH=`arch`
# used only locally (components of the ECLIPSE_SDK_TGZ path):
-EVERSION=${EVERSION:="4.8"}
-DROP=${DROPS4}/${DROP:="R-4.8-201806110500"}
+EVERSION=${EVERSION:="I20180725-2000"}
+DROP=${DROPS4}/${DROP:="I20180725-2000"}
# EXPORT: archive file of the base eclipse SDK build:
ECLIPSE_SDK_TGZ=${DROP}/eclipse-SDK-${EVERSION}-linux-gtk-${ARCH}.tar.gz
@@ -69,5 +69,5 @@
ECLIPSE_TESTLIB_ZIP=${DROP}/eclipse-test-framework-${EVERSION}.zip
# EXPORT: where to find previously published plugins&features:
-PUBLISHED_UPDATES=${HOME}/downloads/objectteams/updates/ot2.6
+PUBLISHED_UPDATES=${HOME}/downloads/objectteams/updates/ot2.7/201806120901
diff --git a/releng/build-scripts/build/run.properties b/releng/build-scripts/build/run.properties
index 0c4173e..4c1a114 100644
--- a/releng/build-scripts/build/run.properties
+++ b/releng/build-scripts/build/run.properties
@@ -19,16 +19,16 @@
# ------------- insert current versions here ---------------
# Details of the Eclipse SDK built upon:
-run.eclipseScriptDir=plugins/org.eclipse.pde.build_3.10.0.v20180512-1217/scripts
-org.eclipse.equinox.launcher_jar=org.eclipse.equinox.launcher_1.5.0.v20180512-1130.jar
+run.eclipseScriptDir=plugins/org.eclipse.pde.build_3.10.100.v20180701-0718/scripts
+org.eclipse.equinox.launcher_jar=org.eclipse.equinox.launcher_1.5.100.v20180611-1436.jar
# for patching our patch feature to match this version with any suffix:
-jdt.feature.version=3.14.0.v20180611-0500
-jdt.feature.version.next=3.14.0.v20180611-0501
+jdt.feature.version=3.15.0.v20180725-2000
+jdt.feature.version.next=3.15.0.v20180725-2001
# jdt.core fragments for extracting pre-built classes and properties:
-jdt.compiler.apt=org.eclipse.jdt.compiler.apt_1.3.200.v20180523-0418.jar
-jdt.compiler.tool=org.eclipse.jdt.compiler.tool_1.2.200.v20180512-1206.jar
+jdt.compiler.apt=org.eclipse.jdt.compiler.apt_1.3.300.v20180706-1359.jar
+jdt.compiler.tool=org.eclipse.jdt.compiler.tool_1.2.300.v20180706-1359.jar
# -----------------------------------------------------------
#Git Support for PDE BUILD:
diff --git a/releng/map/otdt.map.in b/releng/map/otdt.map.in
index 908cb67..4bb2be8 100644
--- a/releng/map/otdt.map.in
+++ b/releng/map/otdt.map.in
@@ -1,9 +1,9 @@
!*************** OTDT CONTRIBUTION ********************************************************
!-- Don't set version numbers for features, otherwise pdebuild would complain about a non-existent Basedir: --
-feature@org.eclipse.objectteams.otdt=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=features/org.eclipse.objectteams.otdt.feature,tag=builds/201806120901
+feature@org.eclipse.objectteams.otdt=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=features/org.eclipse.objectteams.otdt.feature
feature@org.eclipse.objectteams.otdt.source.feature=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=features/org.eclipse.objectteams.otdt.source.feature,tag=builds/201806120901
-feature@org.eclipse.objectteams.otdt.core.patch=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=features/org.eclipse.objectteams.otdt.core.patch,tag=builds/201806120901
+feature@org.eclipse.objectteams.otdt.core.patch=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=features/org.eclipse.objectteams.otdt.core.patch
feature@org.eclipse.objectteams.otequinox=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=features/org.eclipse.objectteams.otequinox.feature
feature@org.eclipse.objectteams.otequinox.otre=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=features/org.eclipse.objectteams.otequinox.otre.feature
feature@org.eclipse.objectteams.otequinox.turbo=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=features/org.eclipse.objectteams.otequinox.turbo.feature,tag=builds/201506091717
@@ -35,12 +35,12 @@
!** OT/J Plugins **!
plugin@org.eclipse.objectteams.otequinox.branding=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otequinox.branding,tag=builds/201706061121
plugin@org.eclipse.objectteams.otequinox.branding.otre=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otequinox.branding.otre,tag=builds/201706061122
-plugin@org.eclipse.objectteams.otdt.jdt.ui=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.jdt.ui,tag=builds/201806120901
+plugin@org.eclipse.objectteams.otdt.jdt.ui=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.jdt.ui
plugin@org.eclipse.objectteams.otdt.ui.help=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.ui.help,tag=builds/201606070956
plugin@org.eclipse.objectteams.otdt.apt=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.apt,tag=builds/201706061122
plugin@org.eclipse.objectteams.otdt.compiler.adaptor=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.compiler.adaptor,tag=builds/201806120901
plugin@org.eclipse.objectteams.otdt.debug.adaptor=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.debug.adaptor,tag=builds/201806120901
-plugin@org.eclipse.objectteams.otdt.refactoring=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.refactoring,tag=builds/201806120901
+plugin@org.eclipse.objectteams.otdt.refactoring=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.refactoring
plugin@org.eclipse.objectteams.otdt.pde.ui=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.pde.ui,tag=builds/201706061122
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