Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Herrmann2018-03-27 18:22:05 +0000
committerStephan Herrmann2018-03-27 18:22:05 +0000
commit989c481974b635ffafb73e0e0dca23292ae7b9a8 (patch)
tree1012fd207b2648f87d21405036f75ba59c3c103f
parent8c3809c4da70f89313f6ff3cbe20d989f93f45fe (diff)
downloadorg.eclipse.objectteams-989c481974b635ffafb73e0e0dca23292ae7b9a8.tar.gz
org.eclipse.objectteams-989c481974b635ffafb73e0e0dca23292ae7b9a8.tar.xz
org.eclipse.objectteams-989c481974b635ffafb73e0e0dca23292ae7b9a8.zip
Releng: build against M-4.7.3aRC1-201803231030
-rw-r--r--features/org.eclipse.objectteams.otdt.core.patch/feature.xml4
-rw-r--r--org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties2
-rw-r--r--plugins/org.eclipse.objectteams.otdt/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.objectteams.otdt/about.ini2
-rw-r--r--releng/build-scripts/build/run.properties8
-rw-r--r--releng/map/otdt.map.in2
6 files changed, 10 insertions, 10 deletions
diff --git a/features/org.eclipse.objectteams.otdt.core.patch/feature.xml b/features/org.eclipse.objectteams.otdt.core.patch/feature.xml
index e875a4bb7..0a8064c34 100644
--- a/features/org.eclipse.objectteams.otdt.core.patch/feature.xml
+++ b/features/org.eclipse.objectteams.otdt.core.patch/feature.xml
@@ -59,14 +59,14 @@ Project Leader:
</url>
<requires>
- <import feature="org.eclipse.jdt" version="3.13.3.v20180221-1700" patch="true"/>
+ <import feature="org.eclipse.jdt" version="3.13.4.v20180323-1351" patch="true"/>
</requires>
<plugin
id="org.eclipse.jdt.core"
download-size="5614"
install-size="5614"
- version="3.13.101.v_OTDT_r262_qualifier"
+ version="3.13.102.v_OTDT_r262_qualifier"
unpack="false"/>
</feature>
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 b8900876e..9e8ae1815 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,7 +31,7 @@ compiler.copyright = Copyright IBM Corp 2000, 2015. All rights reserved.
###{ObjectTeams:
otdtc.name = Extension for Object Teams
-otdtc.version = 2.6.2
+otdtc.version = 2.6.2a
otdtc.copyright = Copyright by TU Berlin, Fraunhofer FIRST and others, 2004, 2018.
### SH}
### progress
diff --git a/plugins/org.eclipse.objectteams.otdt/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otdt/META-INF/MANIFEST.MF
index 6c66e8eee..a2875f648 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 @@ Export-Package: org.eclipse.objectteams.otdt.core.ext,
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.101.v_OTDT_r262,4.0.0)",
+ org.eclipse.jdt.core;bundle-version="[3.13.102.v_OTDT_r262,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 bedaffb62..236715854 100644
--- a/plugins/org.eclipse.objectteams.otdt/about.ini
+++ b/plugins/org.eclipse.objectteams.otdt/about.ini
@@ -1,6 +1,6 @@
aboutText=Object Teams Development Tooling\n\
\n\
-Version: 2.6.2\n\
+Version: 2.6.2a\n\
\n\
Part of the Eclipse Oxygen Simultaneous Release\n\
\n\
diff --git a/releng/build-scripts/build/run.properties b/releng/build-scripts/build/run.properties
index debe8db74..a8994a343 100644
--- a/releng/build-scripts/build/run.properties
+++ b/releng/build-scripts/build/run.properties
@@ -23,12 +23,12 @@ run.eclipseScriptDir=plugins/org.eclipse.pde.build_3.9.300.v20170515-0912/script
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.3.v20180221-1700
-jdt.feature.version.next=3.13.3.v20180221-1701
+jdt.feature.version=3.13.4.v20180323-1351
+jdt.feature.version.next=3.13.4.v20180323-1352
# jdt.core fragments for extracting pre-built classes and properties:
-jdt.compiler.apt=org.eclipse.jdt.compiler.apt_1.3.60.v20171129-1553.jar
-jdt.compiler.tool=org.eclipse.jdt.compiler.tool_1.2.51.v20171122-1403.jar
+jdt.compiler.apt=org.eclipse.jdt.compiler.apt_1.3.110.v20180322-1206.jar
+jdt.compiler.tool=org.eclipse.jdt.compiler.tool_1.2.101.v20180322-1206.jar
# -----------------------------------------------------------
#Git Support for PDE BUILD:
diff --git a/releng/map/otdt.map.in b/releng/map/otdt.map.in
index c907aedc2..05b5348d0 100644
--- a/releng/map/otdt.map.in
+++ b/releng/map/otdt.map.in
@@ -9,7 +9,7 @@ feature@org.eclipse.objectteams.otequinox.otre=GIT,repo=git://git.eclipse.org/gi
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.101.v_OTDT_r262_qualifier=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=org.eclipse.jdt.core,tag=branches/maintenance/OTDT_2.6.x
+plugin@org.eclipse.jdt.core,3.13.102.v_OTDT_r262_qualifier=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=org.eclipse.jdt.core,tag=branches/maintenance/OTDT_2.6.x
!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,tag=branches/maintenance/OTDT_2.6.x

Back to the top