Releng: build against S-4.12M1-201904110625 - bump to 2.7.4
diff --git a/features/org.eclipse.objectteams.otdt.core.patch/feature.xml b/features/org.eclipse.objectteams.otdt.core.patch/feature.xml
index 5167be7..9572fb8 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.3.qualifier"
+ version="2.7.4.qualifier"
provider-name="%providerName"
plugin="org.eclipse.jdt.core">
@@ -59,14 +59,14 @@
</url>
<requires>
- <import feature="org.eclipse.jdt" version="3.17.0.v20190307-0500" patch="true"/>
+ <import feature="org.eclipse.jdt" version="3.18.0.v20190411-0625" patch="true"/>
</requires>
<plugin
id="org.eclipse.jdt.core"
download-size="5614"
install-size="5614"
- version="3.17.0.OTDT_r273_qualifier"
+ version="3.18.0.OTDT_r274_qualifier"
unpack="false"/>
</feature>
diff --git a/org.eclipse.jdt.core/META-INF/MANIFEST.MF b/org.eclipse.jdt.core/META-INF/MANIFEST.MF
index 9d583e5..1896387 100644
--- a/org.eclipse.jdt.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.core/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jdt.core; singleton:=true
-Bundle-Version: 3.18.0.OTDT_r273_qualifier
+Bundle-Version: 3.18.0.OTDT_r274_qualifier
Bundle-Activator: org.eclipse.jdt.core.JavaCore
Bundle-Vendor: %providerName
Bundle-Localization: plugin
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 b7b2f11..c66af39 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
@@ -34,7 +34,7 @@
###{ObjectTeams:
otdtc.name = Extension for Object Teams
-otdtc.version = 2.7.3
+otdtc.version = 2.7.4
otdtc.copyright = Copyright by TU Berlin, Fraunhofer FIRST and others, 2004, 2019.
### SH}
### progress
diff --git a/plugins/org.eclipse.objectteams.otdt.compiler.adaptor/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otdt.compiler.adaptor/META-INF/MANIFEST.MF
index 56fe028..2534697 100644
--- a/plugins/org.eclipse.objectteams.otdt.compiler.adaptor/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otdt.compiler.adaptor/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@
Bundle-Version: 2.7.3.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.jdt.core;bundle-version="[3.17.0.OTDT_r273,4.0.0)",
+Require-Bundle: org.eclipse.jdt.core;bundle-version="[3.18.0.OTDT_r274,4.0.0)",
org.eclipse.objectteams.otequinox;bundle-version="[2.5.0,3.0.0)",
org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.7.100,4.0.0)",
diff --git a/plugins/org.eclipse.objectteams.otdt.debug.adaptor/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otdt.debug.adaptor/META-INF/MANIFEST.MF
index c407377..a1c59d2 100644
--- a/plugins/org.eclipse.objectteams.otdt.debug.adaptor/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otdt.debug.adaptor/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@
Bundle-Version: 2.7.3.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.jdt.core;bundle-version="[3.17.0.OTDT_r273,4.0.0)",
+Require-Bundle: org.eclipse.jdt.core;bundle-version="[3.18.0.OTDT_r274,4.0.0)",
org.eclipse.objectteams.otequinox;bundle-version="[2.3.0,3.0.0)",
org.eclipse.objectteams.otdt;bundle-version="[2.3.0,3.0.0)",
org.eclipse.objectteams.otdt.debug;bundle-version="[2.3.0,3.0.0)",
diff --git a/plugins/org.eclipse.objectteams.otdt.debug/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otdt.debug/META-INF/MANIFEST.MF
index 32f26e7..c160e8e 100644
--- a/plugins/org.eclipse.objectteams.otdt.debug/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otdt.debug/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@
org.eclipse.debug.core;bundle-version="[3.7.0,4.0.0)",
org.eclipse.jdt.debug;bundle-version="[3.7.0,4.0.0)",
org.eclipse.jdt.launching;bundle-version="[3.6.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.17.0.OTDT_r273,4.0.0)",
+ org.eclipse.jdt.core;bundle-version="[3.18.0.OTDT_r274,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.7.100,4.0.0)",
org.eclipse.objectteams.otdt;bundle-version="[2.0.0,3.0.0)"
Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.objectteams.otdt/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otdt/META-INF/MANIFEST.MF
index bd36d25..5592a0a 100644
--- a/plugins/org.eclipse.objectteams.otdt/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otdt/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.objectteams.otdt;singleton:=true
Automatic-Module-Name: org.eclipse.objectteams.otdt
-Bundle-Version: 2.7.3.qualifier
+Bundle-Version: 2.7.4.qualifier
Bundle-ClassPath: otdtcoreext.jar
Bundle-Activator: org.eclipse.objectteams.otdt.core.ext.OTDTPlugin
Bundle-Vendor: %providerName
@@ -13,7 +13,7 @@
org.eclipse.objectteams.otdt.internal.core.ext;x-internal:=true
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.17.0.OTDT_r273,4.0.0)",
+ org.eclipse.jdt.core;bundle-version="[3.18.0.OTDT_r274,4.0.0)",
org.eclipse.jdt.launching;bundle-version="[3.6.100,4.0.0)",
org.eclipse.debug.core;bundle-version="[3.7.100,4.0.0)",
org.eclipse.osgi;bundle-version="[3.10.0,4.0.0)",
diff --git a/plugins/org.eclipse.objectteams.otdt/about.ini b/plugins/org.eclipse.objectteams.otdt/about.ini
index 40455b6..ccaac7d 100644
--- a/plugins/org.eclipse.objectteams.otdt/about.ini
+++ b/plugins/org.eclipse.objectteams.otdt/about.ini
@@ -1,8 +1,8 @@
aboutText=Object Teams Development Tooling\n\
\n\
-Version: 2.7.3\n\
+Version: 2.7.4\n\
\n\
-Part of Eclipse SimRel 2019-03\n\
+Part of Eclipse SimRel 2019-06\n\
\n\
(c) Copyright TU Berlin, Fraunhofer FIRST and others, 2005, 2019\n\
Visit http://www.eclipse.org/objectteams
diff --git a/releng/build-scripts/build/otdt_prerequisites-hipp.sh b/releng/build-scripts/build/otdt_prerequisites-hipp.sh
index 0a44f42..cc0b37c 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:="I20190307-0500"}
+SDK_QUALIFIER=${SDK_QUALIFIER:="I20190411-0625"}
# Architecture (as used by OSGi):
ARCH=`arch`
# used only locally (components of the ECLIPSE_SDK_TGZ path):
-EVERSION=${EVERSION:="4.11RC2"}
-DROP=${DROPS4}/${DROP:="S-4.11RC2-201903070500"}
+EVERSION=${EVERSION:="4.12M1"}
+DROP=${DROPS4}/${DROP:="S-4.12M1-201904110625"}
# 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 1faadc7..479b6f2 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.300.v20190305-0856/scripts
+run.eclipseScriptDir=plugins/org.eclipse.pde.build_3.10.400.v20190320-1020/scripts
org.eclipse.equinox.launcher_jar=org.eclipse.equinox.launcher_1.5.300.v20190213-1655.jar
# for patching our patch feature to match this version with any suffix:
-jdt.feature.version=3.17.0.v20190307-0500
-jdt.feature.version.next=3.17.0.v20190307-0501
+jdt.feature.version=3.18.0.v20190411-0625
+jdt.feature.version.next=3.18.0.v20190411-0626
# jdt.core fragments for extracting pre-built classes and properties:
-jdt.compiler.apt=org.eclipse.jdt.compiler.apt_1.3.500.v20190304-0429.jar
-jdt.compiler.tool=org.eclipse.jdt.compiler.tool_1.2.500.v20190304-0429.jar
+jdt.compiler.apt=org.eclipse.jdt.compiler.apt_1.3.600.v20190402-0634.jar
+jdt.compiler.tool=org.eclipse.jdt.compiler.tool_1.2.600.v20190322-0450.jar
# -----------------------------------------------------------
#Git Support for PDE BUILD:
diff --git a/releng/build-scripts/build/test.properties.in b/releng/build-scripts/build/test.properties.in
index 3b93501..0a76813 100644
--- a/releng/build-scripts/build/test.properties.in
+++ b/releng/build-scripts/build/test.properties.in
@@ -1,10 +1,10 @@
# versions of test plugins:
# ---- versions of test bundles compiled from an existing GIT tag: ----
-#org.eclipse.jdt.core.tests.builder=3.10.400.@SDK_QUALIFIER@
-org.eclipse.jdt.debug.tests=3.11.400.@SDK_QUALIFIER@
-org.eclipse.jdt.ui.tests=3.13.400.@SDK_QUALIFIER@
-org.eclipse.jdt.ui.tests.refactoring=3.13.400.@SDK_QUALIFIER@
+#org.eclipse.jdt.core.tests.builder=3.10.600.@SDK_QUALIFIER@
+org.eclipse.jdt.debug.tests=3.11.500.@SDK_QUALIFIER@
+org.eclipse.jdt.ui.tests=3.13.500.@SDK_QUALIFIER@
+org.eclipse.jdt.ui.tests.refactoring=3.13.500.@SDK_QUALIFIER@
org.eclipse.test.performance=3.13.400.@SDK_QUALIFIER@
# ----
diff --git a/releng/map/otdt.map.in b/releng/map/otdt.map.in
index 2bf1511..b4541d6 100644
--- a/releng/map/otdt.map.in
+++ b/releng/map/otdt.map.in
@@ -9,7 +9,7 @@
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
!-- Also don't use version numbers for those plugins that hold the various otre jars: --
-plugin@org.eclipse.jdt.core,3.17.0.OTDT_r273_qualifier=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=org.eclipse.jdt.core
+plugin@org.eclipse.jdt.core,3.18.0.OTDT_r274_qualifier=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=org.eclipse.jdt.core
!next plug-in don't specify version so that org.eclipse.objectteams.runtime/customBuildCallbacks.xml will find the plug-in directory:
plugin@org.eclipse.objectteams.otdt=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt
@@ -112,6 +112,6 @@
plugin@org.eclipse.core.filebuffers.tests=GIT,tag=@SDK_QUALIFIER@,repo=git://git.eclipse.org/gitroot/platform/eclipse.platform.text.git,path=org.eclipse.core.filebuffers.tests
!-- jdt.annotation: --!
-plugin@org.eclipse.jdt.annotation,2.2.200=GIT,tag=@SDK_QUALIFIER@,repo=git://git.eclipse.org/gitroot/jdt/eclipse.jdt.core.git,path=org.eclipse.jdt.annotation
+plugin@org.eclipse.jdt.annotation,2.2.300=GIT,tag=@SDK_QUALIFIER@,repo=git://git.eclipse.org/gitroot/jdt/eclipse.jdt.core.git,path=org.eclipse.jdt.annotation
plugin@org.eclipse.jdt.annotation,1.1.400=GIT,tag=@SDK_QUALIFIER@,repo=git://git.eclipse.org/gitroot/jdt/eclipse.jdt.core.git,path=org.eclipse.jdt.annotation_v1