releng: build against Oxygen.1a
+ some version updates
diff --git a/features/org.eclipse.objectteams.otdt.core.patch/feature.xml b/features/org.eclipse.objectteams.otdt.core.patch/feature.xml
index 0c097f2..0e05103 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.6.0.qualifier"
+ version="2.6.1.qualifier"
provider-name="%providerName"
plugin="org.eclipse.jdt.core">
@@ -59,14 +59,14 @@
</url>
<requires>
- <import feature="org.eclipse.jdt" version="3.13.0.v20170531-2000" patch="true"/>
+ <import feature="org.eclipse.jdt" version="3.13.1.v20171009-0410" patch="true"/>
</requires>
<plugin
id="org.eclipse.jdt.core"
download-size="5614"
install-size="5614"
- version="3.13.0.v_OTDT_r260_qualifier"
+ version="3.13.50.v_OTDT_r261_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 f322d51..4c941c0 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.6.0.qualifier"
+ version="2.6.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.6.0.qualifier"/>
+ version="2.6.1.qualifier"/>
<plugin
id="org.eclipse.objectteams.otdt"
diff --git a/org.eclipse.jdt.core/META-INF/MANIFEST.MF b/org.eclipse.jdt.core/META-INF/MANIFEST.MF
index d0ef9db..64ed159 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.13.50.v_OTDT_r260_qualifier
+Bundle-Version: 3.13.50.v_OTDT_r261_qualifier
Bundle-Activator: org.eclipse.jdt.core.JavaCore
Bundle-Vendor: %providerName
Bundle-Localization: plugin
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 4ae97f9..519dc1b 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
@@ -2,10 +2,10 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.objectteams.otdt.compiler.adaptor;singleton:=true
-Bundle-Version: 2.5.0.qualifier
+Bundle-Version: 2.6.1.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.jdt.core;bundle-version="[3.10.0.v_OTDT_r230,4.0.0)",
+Require-Bundle: org.eclipse.jdt.core;bundle-version="[3.13.50.v_OTDT_r261,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/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otdt/META-INF/MANIFEST.MF
index e0f3246..d9b131e 100644
--- a/plugins/org.eclipse.objectteams.otdt/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otdt/META-INF/MANIFEST.MF
@@ -12,7 +12,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.13.0.v_OTDT_r260,4.0.0)",
+ org.eclipse.jdt.core;bundle-version="[3.13.0.v_OTDT_r261,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/releng/build-scripts/build/otdt_prerequisites-hipp.sh b/releng/build-scripts/build/otdt_prerequisites-hipp.sh
index fc40d37..76b97b6 100644
--- a/releng/build-scripts/build/otdt_prerequisites-hipp.sh
+++ b/releng/build-scripts/build/otdt_prerequisites-hipp.sh
@@ -52,14 +52,14 @@
# VERSIONS:
# Eclipse SDK build identifier (used for substitution in otdt.map.in etc.):
-SDK_QUALIFIER=${SDK_QUALIFIER:="I20170531-2000"}
+SDK_QUALIFIER=${SDK_QUALIFIER:="I20171009-0410"}
# Architecture (as used by OSGi):
ARCH=`arch`
# used only locally (components of the ECLIPSE_SDK_TGZ path):
-EVERSION=${EVERSION:="4.7RC3"}
-DROP=${DROPS4}/${DROP:="S-4.7RC3-201705312000/"}
+EVERSION=${EVERSION:="4.7.1a"}
+DROP=${DROPS4}/${DROP:="R-4.7.1a-201710090410/"}
# 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 9983917..08a3ade 100644
--- a/releng/build-scripts/build/run.properties
+++ b/releng/build-scripts/build/run.properties
@@ -23,12 +23,12 @@
org.eclipse.equinox.launcher_jar=org.eclipse.equinox.launcher_1.4.0.v20161219-1356.jar
# for patching our patch feature to match this version with any suffix:
-jdt.feature.version=3.13.0.v20170531-2000
-jdt.feature.version.next=3.13.0.v20170531-2001
+jdt.feature.version=3.13.1.v20171009-0410
+jdt.feature.version.next=3.13.1.v20171009-411
# jdt.core fragments for extracting pre-built classes and properties:
-jdt.compiler.apt=org.eclipse.jdt.compiler.apt_1.3.0.v20170502-0408.jar
-jdt.compiler.tool=org.eclipse.jdt.compiler.tool_1.2.0.v20170502-0408.jar
+jdt.compiler.apt=org.eclipse.jdt.compiler.apt_1.3.50.v20170920-0950.jar
+jdt.compiler.tool=org.eclipse.jdt.compiler.tool_1.2.50.v20170920-0950.jar
# -----------------------------------------------------------
#Git Support for PDE BUILD:
diff --git a/releng/map/otdt.map.in b/releng/map/otdt.map.in
index 288e6e6..6f7ea74 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.13.0.v_OTDT_r260_qualifier=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=org.eclipse.jdt.core
+plugin@org.eclipse.jdt.core,3.13.0.v_OTDT_r261_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
@@ -38,7 +38,7 @@
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
-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/201606070956
+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
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
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
