diff options
author | Stephan Herrmann | 2017-03-05 19:21:29 +0000 |
---|---|---|
committer | Stephan Herrmann | 2017-03-05 19:21:29 +0000 |
commit | 84567a7678c14512da952259decf043ba4ef69bf (patch) | |
tree | 82710203cb90da9e901fbc5beb5879f61557b870 | |
parent | 0368bb244cb1c5c60d38d7c2de0d8bdaba4a566d (diff) | |
download | org.eclipse.objectteams-84567a7678c14512da952259decf043ba4ef69bf.tar.gz org.eclipse.objectteams-84567a7678c14512da952259decf043ba4ef69bf.tar.xz org.eclipse.objectteams-84567a7678c14512da952259decf043ba4ef69bf.zip |
Releng: build against M20170301-0400 (Neon.3 RC4)
+ cleanup freeze/unfree & some versions
8 files changed, 14 insertions, 14 deletions
diff --git a/features/org.eclipse.objectteams.otdt.core.patch/feature.xml b/features/org.eclipse.objectteams.otdt.core.patch/feature.xml index 8b7ba9d55..a882db968 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.12.3.v20170208-0400" patch="true"/> + <import feature="org.eclipse.jdt" version="3.12.3.v20170301-0400" patch="true"/> </requires> <plugin diff --git a/plugins/org.eclipse.objectteams.otdt.apt/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otdt.apt/META-INF/MANIFEST.MF index 3b3b37ed1..cafc7db78 100644 --- a/plugins/org.eclipse.objectteams.otdt.apt/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.objectteams.otdt.apt/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.objectteams.otdt.apt;singleton:=true -Bundle-Version: 2.5.0.qualifier +Bundle-Version: 2.5.3.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.7 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 375f76bed..1c9e631f0 100644 --- a/plugins/org.eclipse.objectteams.otdt.debug/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.objectteams.otdt.debug/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.objectteams.otdt.debug;singleton:=true -Bundle-Version: 2.3.0.qualifier +Bundle-Version: 2.5.3.qualifier Bundle-Activator: org.eclipse.objectteams.otdt.debug.OTDebugPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin 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 31dbb80fd..4353d1e94 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 @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.objectteams.otdt.jdt.ui;singleton:=true -Bundle-Version: 2.5.0.qualifier +Bundle-Version: 2.5.3.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.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otdt.ui/META-INF/MANIFEST.MF index 589c1d699..b14d1ce41 100644 --- a/plugins/org.eclipse.objectteams.otdt.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.objectteams.otdt.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.objectteams.otdt.ui;singleton:=true -Bundle-Version: 2.5.0.qualifier +Bundle-Version: 2.5.3.qualifier Bundle-Activator: org.eclipse.objectteams.otdt.ui.OTDTUIPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/releng/build-scripts/build/otdt_prerequisites-hipp.sh b/releng/build-scripts/build/otdt_prerequisites-hipp.sh index 6e5786439..316b3be46 100644 --- a/releng/build-scripts/build/otdt_prerequisites-hipp.sh +++ b/releng/build-scripts/build/otdt_prerequisites-hipp.sh @@ -52,14 +52,14 @@ NICE="10" # VERSIONS: # Eclipse SDK build identifier (used for substitution in otdt.map.in etc.): -SDK_QUALIFIER=${SDK_QUALIFIER:="M20170208-0400"} +SDK_QUALIFIER=${SDK_QUALIFIER:="M20170301-0400"} # Architecture (as used by OSGi): ARCH=`arch` # used only locally (components of the ECLIPSE_SDK_TGZ path): -EVERSION=${EVERSION:="4.6.3RC1"} -DROP=${DROPS4}/${DROP:="M-4.6.3RC1-201702080400"} +EVERSION=${EVERSION:="4.6.3RC4"} +DROP=${DROPS4}/${DROP:="M-4.6.3RC4-201703010400"} # 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 95e306599..472128f70 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.9.200.v20160204-0642/script org.eclipse.equinox.launcher_jar=org.eclipse.equinox.launcher_1.3.201.v20161025-1711.jar # for patching our patch feature to match this version with any suffix: -jdt.feature.version=3.12.3.v20170208-0400 -jdt.feature.version.next=3.12.3.v20170208-401 +jdt.feature.version=3.12.3.v20170301-0400 +jdt.feature.version.next=3.12.3.v20170301-401 # jdt.core fragments for extracting pre-built classes and properties: jdt.compiler.apt=org.eclipse.jdt.compiler.apt_1.2.100.v20160418-1457.jar diff --git a/releng/map/otdt.map.in b/releng/map/otdt.map.in index 708d4b34a..856cb9108 100644 --- a/releng/map/otdt.map.in +++ b/releng/map/otdt.map.in @@ -14,9 +14,9 @@ plugin@org.eclipse.jdt.core,3.12.3.v_OTDT_r253_qualifier=GIT,repo=git://git.ecli !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.5.x
-plugin@org.eclipse.objectteams.otdt.debug=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.debug,tag=builds/201406101339
+plugin@org.eclipse.objectteams.otdt.debug=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.debug,tag=branches/maintenance/OTDT_2.5.x
plugin@org.eclipse.objectteams.otdt.debug.ui=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.debug.ui,tag=builds/201606070956
-plugin@org.eclipse.objectteams.otdt.ui=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.ui,tag=builds/201606070956
+plugin@org.eclipse.objectteams.otdt.ui=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.ui,tag=branches/maintenance/OTDT_2.5.x
plugin@org.eclipse.objectteams.otdt.doc=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.doc,tag=builds/201606070956
!plugin@org.eclipse.objectteams.otdt.metrics=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.metrics,tag=builds/201101290806
@@ -35,9 +35,9 @@ plugin@org.eclipse.objectteams.eclipse.monitor=GIT,repo=git://git.eclipse.org/gi !** 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=branches/maintenance/OTDT_2.5.x
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=branches/maintenance/OTDT_2.5.x
-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/201606070956
+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=branches/maintenance/OTDT_2.5.x
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/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=branches/maintenance/OTDT_2.5.x
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.debug.adaptor=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.debug.adaptor,tag=builds/201606070956
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/201606070956
|