Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Herrmann2018-02-10 15:18:18 +0000
committerStephan Herrmann2018-02-10 15:24:42 +0000
commit275e6774eb33c073440dd0ed215661bda437a065 (patch)
tree550fbf01d9e7fe4be3f3e658c73a647ac9976e35
parent284a59c5dfff0c31e7ff0b398ff2257141f99ca8 (diff)
downloadorg.eclipse.objectteams-275e6774eb33c073440dd0ed215661bda437a065.tar.gz
org.eclipse.objectteams-275e6774eb33c073440dd0ed215661bda437a065.tar.xz
org.eclipse.objectteams-275e6774eb33c073440dd0ed215661bda437a065.zip
Releng: versioning towards 2.6.2 (Oxygen.3)
-rw-r--r--features/org.eclipse.objectteams.otdt.core.patch/feature.xml4
-rw-r--r--features/org.eclipse.objectteams.otdt.feature/feature.xml4
-rw-r--r--features/org.eclipse.objectteams.otdt.source.feature/feature.xml2
-rw-r--r--features/org.eclipse.objectteams.otequinox.feature/feature.xml2
-rw-r--r--org.eclipse.jdt.core/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties4
-rw-r--r--plugins/org.eclipse.objectteams.otdt.compiler.adaptor/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.objectteams.otdt/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.objectteams.otdt/about.ini4
-rw-r--r--plugins/org.eclipse.objectteams.otequinox/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.objectteams.otequinox/META-INF/p2.inf8
-rw-r--r--plugins/org.eclipse.objectteams.otequinox/about.ini2
-rw-r--r--releng/build-scripts/build/buildVersions.properties4
-rw-r--r--releng/map/otdt.map.in4
14 files changed, 23 insertions, 23 deletions
diff --git a/features/org.eclipse.objectteams.otdt.core.patch/feature.xml b/features/org.eclipse.objectteams.otdt.core.patch/feature.xml
index dd866d1e6..7ee51a38c 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.1.qualifier"
+ version="2.6.2.qualifier"
provider-name="%providerName"
plugin="org.eclipse.jdt.core">
@@ -66,7 +66,7 @@ Project Leader:
id="org.eclipse.jdt.core"
download-size="5614"
install-size="5614"
- version="3.13.101.v_OTDT_r261_qualifier"
+ version="3.13.101.v_OTDT_r262_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 4c941c09d..63a4b9d71 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.1.qualifier"
+ version="2.6.2.qualifier"
provider-name="%providerName"
plugin="org.eclipse.objectteams.otdt"
image="OTDT-110.png">
@@ -65,7 +65,7 @@ Project Leader:
<includes
id="org.eclipse.objectteams.otdt.core.patch"
- version="2.6.1.qualifier"/>
+ version="2.6.2.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 713c89078..5a71e1024 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.6.1.qualifier"
+ version="2.6.2.qualifier"
provider-name="%providerName">
<description url="http://www.eclipse.org/objectteams">
diff --git a/features/org.eclipse.objectteams.otequinox.feature/feature.xml b/features/org.eclipse.objectteams.otequinox.feature/feature.xml
index ab16d6ce0..6dfc3ed83 100644
--- a/features/org.eclipse.objectteams.otequinox.feature/feature.xml
+++ b/features/org.eclipse.objectteams.otequinox.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.objectteams.otequinox"
label="%featureName"
- version="2.6.1.qualifier"
+ version="2.6.2.qualifier"
provider-name="%providerName"
plugin="org.eclipse.objectteams.otequinox"
colocation-affinity="org.eclipse.rcp">
diff --git a/org.eclipse.jdt.core/META-INF/MANIFEST.MF b/org.eclipse.jdt.core/META-INF/MANIFEST.MF
index 35aff84a7..ef4066239 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.101.v_OTDT_r261_qualifier
+Bundle-Version: 3.13.101.v_OTDT_r262_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 fc547f261..b8900876e 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 @@ compiler.copyright = Copyright IBM Corp 2000, 2015. All rights reserved.
###{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.6.2
+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.compiler.adaptor/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otdt.compiler.adaptor/META-INF/MANIFEST.MF
index 17da0058a..82f907a4e 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-SymbolicName: org.eclipse.objectteams.otdt.compiler.adaptor;singleton:=tr
Bundle-Version: 2.6.1.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.jdt.core;bundle-version="[3.13.100.v_OTDT_r261,4.0.0)",
+Require-Bundle: org.eclipse.jdt.core;bundle-version="[3.13.101.v_OTDT_r262,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 d3067ea59..6c66e8eee 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.100.v_OTDT_r261,4.0.0)",
+ org.eclipse.jdt.core;bundle-version="[3.13.101.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 63014a726..bedaffb62 100644
--- a/plugins/org.eclipse.objectteams.otdt/about.ini
+++ b/plugins/org.eclipse.objectteams.otdt/about.ini
@@ -1,10 +1,10 @@
aboutText=Object Teams Development Tooling\n\
\n\
-Version: 2.6.1\n\
+Version: 2.6.2\n\
\n\
Part of the Eclipse Oxygen Simultaneous Release\n\
\n\
-(c) Copyright TU Berlin, Fraunhofer FIRST and others, 2005, 2017\n\
+(c) Copyright TU Berlin, Fraunhofer FIRST and others, 2005, 2018\n\
Visit http://www.eclipse.org/objectteams
featureImage=OTDT_32x32.png
diff --git a/plugins/org.eclipse.objectteams.otequinox/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otequinox/META-INF/MANIFEST.MF
index 773d24991..b8396f7f8 100644
--- a/plugins/org.eclipse.objectteams.otequinox/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otequinox/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.objectteams.otequinox;singleton:=true
-Bundle-Version: 2.6.1.qualifier
+Bundle-Version: 2.6.2.qualifier
Bundle-Activator: org.eclipse.objectteams.otequinox.TransformerPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.objectteams.otequinox/META-INF/p2.inf b/plugins/org.eclipse.objectteams.otequinox/META-INF/p2.inf
index 872098257..6ddbea527 100644
--- a/plugins/org.eclipse.objectteams.otequinox/META-INF/p2.inf
+++ b/plugins/org.eclipse.objectteams.otequinox/META-INF/p2.inf
@@ -4,11 +4,11 @@ requires.0.range = [$version$,$version$]
units.0.id = org.eclipse.objectteams.otequinox.configuration
-units.0.version = 2.6.1.$qualifier$
+units.0.version = 2.6.2.$qualifier$
units.0.hostRequirements.0.namespace=osgi.bundle
units.0.hostRequirements.0.name=org.eclipse.objectteams.otequinox
-units.0.hostRequirements.0.range=[2.6.1,3.0.0)
+units.0.hostRequirements.0.range=[2.6.2,3.0.0)
units.0.hostRequirements.1.namespace = org.eclipse.equinox.p2.eclipse.type
units.0.hostRequirements.1.name = bundle
units.0.hostRequirements.1.range = [1.0.0,2.0.0)
@@ -17,7 +17,7 @@ units.0.properties.0.name = org.eclipse.equinox.p2.type.fragment
units.0.properties.0.value = true
units.0.requires.0.namespace = osgi.bundle
units.0.requires.0.name = org.eclipse.objectteams.otequinox
-units.0.requires.0.range = [2.6.1,3.0.0)
+units.0.requires.0.range = [2.6.2,3.0.0)
units.0.requires.1.namespace = org.eclipse.equinox.p2.eclipse.type
units.0.requires.1.name = bundle
@@ -26,7 +26,7 @@ units.0.requires.1.greedy = false
units.0.provides.0.namespace = org.eclipse.equinox.p2.iu
units.0.provides.0.name = org.eclipse.objectteams.otequinox.configuration
-units.0.provides.0.version = 2.6.1.$qualifier$
+units.0.provides.0.version = 2.6.2.$qualifier$
units.0.instructions.install=\
installBundle(bundle:${artifact})
diff --git a/plugins/org.eclipse.objectteams.otequinox/about.ini b/plugins/org.eclipse.objectteams.otequinox/about.ini
index 0e9905134..65aef9f0b 100644
--- a/plugins/org.eclipse.objectteams.otequinox/about.ini
+++ b/plugins/org.eclipse.objectteams.otequinox/about.ini
@@ -1,6 +1,6 @@
aboutText=Object Teams -- Equinox integration (OT/Equinox)\n\
\n\
-Version: 2.6.0\n\
+Version: 2.6.2\n\
\n\
Part of the Eclipse Oxygen Simultaneous Release\n\
\n\
diff --git a/releng/build-scripts/build/buildVersions.properties b/releng/build-scripts/build/buildVersions.properties
index b98ddfaca..48a4d7f6c 100644
--- a/releng/build-scripts/build/buildVersions.properties
+++ b/releng/build-scripts/build/buildVersions.properties
@@ -1,4 +1,4 @@
#fetchTag=GIT=master
-buildType=I
-buildId=2.6.0
+buildType=M
+buildId=2.6.2
#forceContextQualifier=v20161110-1404
diff --git a/releng/map/otdt.map.in b/releng/map/otdt.map.in
index 8ac3de2e0..03bc93faf 100644
--- a/releng/map/otdt.map.in
+++ b/releng/map/otdt.map.in
@@ -22,7 +22,7 @@ plugin@org.eclipse.objectteams.otdt.doc=GIT,repo=git://git.eclipse.org/gitroot/o
plugin@org.eclipse.objectteams.runtime=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.runtime,tag=builds/201706061121
plugin@org.eclipse.objectteams.otre=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otre,tag=builds/201606070956
-plugin@org.eclipse.objectteams.otredyn=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otredyn
+plugin@org.eclipse.objectteams.otredyn=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otredyn=builds/201712031505
!the following is also referenced in otdt.doc/buildDoc.xml (plugin-name without version):
plugin@org.eclipse.objectteams.otequinox=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otequinox
fragment@org.eclipse.objectteams.otequinox.turbo=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otequinox.turbo,tag=builds/201506091717
@@ -38,7 +38,7 @@ plugin@org.eclipse.objectteams.otequinox.branding.otre=GIT,repo=git://git.eclips
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/201706061122
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
+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=builds/201712031505
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/201706061122
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/201706061122
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

Back to the top