Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Herrmann2016-12-04 12:38:19 +0000
committerStephan Herrmann2016-12-04 12:38:19 +0000
commitadd14365471b6d553ef62251709016fbc5b5e3d9 (patch)
treea87189a79b11802abfe652790369922abb257e13
parent29b46b9ee0064a63725e1bf690e278238c3c6133 (diff)
downloadorg.eclipse.objectteams-add14365471b6d553ef62251709016fbc5b5e3d9.tar.gz
org.eclipse.objectteams-add14365471b6d553ef62251709016fbc5b5e3d9.tar.xz
org.eclipse.objectteams-add14365471b6d553ef62251709016fbc5b5e3d9.zip
Releng:
- mark as 2.5.2 - re-open otredyn (has one change in 2.5.2)
-rw-r--r--features/org.eclipse.objectteams.otdt.core.patch/feature.xml2
-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/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties2
-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--plugins/org.eclipse.objectteams.otredyn/META-INF/MANIFEST.MF2
-rw-r--r--releng/map/otdt.map.in2
10 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 51e492090..291f17f4d 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.5.1.qualifier"
+ version="2.5.2.qualifier"
provider-name="%providerName"
plugin="org.eclipse.jdt.core">
diff --git a/features/org.eclipse.objectteams.otdt.feature/feature.xml b/features/org.eclipse.objectteams.otdt.feature/feature.xml
index 272abc94c..743149fc7 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.5.1.qualifier"
+ version="2.5.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.5.1.qualifier"/>
+ version="2.5.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 15d59f148..5c8e5b061 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.5.1.qualifier"
+ version="2.5.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 f2a8bf173..97550da34 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.5.1.qualifier"
+ version="2.5.2.qualifier"
provider-name="%providerName"
plugin="org.eclipse.objectteams.otequinox"
colocation-affinity="org.eclipse.rcp">
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 60911307e..3d53ed1fe 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.5.1
+otdtc.version = 2.5.2
otdtc.copyright = Copyright by TU Berlin, Fraunhofer FIRST and others, 2004, 2016.
### SH}
### progress
diff --git a/plugins/org.eclipse.objectteams.otequinox/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otequinox/META-INF/MANIFEST.MF
index 20cb19833..8375b4811 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.5.1.qualifier
+Bundle-Version: 2.5.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 fbed12045..4be9ff53c 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.5.1.$qualifier$
+units.0.version = 2.5.2.$qualifier$
units.0.hostRequirements.0.namespace=osgi.bundle
units.0.hostRequirements.0.name=org.eclipse.objectteams.otequinox
-units.0.hostRequirements.0.range=[2.5.1,3.0.0)
+units.0.hostRequirements.0.range=[2.5.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.5.1,3.0.0)
+units.0.requires.0.range = [2.5.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.5.1.$qualifier$
+units.0.provides.0.version = 2.5.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 151e12902..e8efcd015 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.5.0\n\
+Version: 2.5.2\n\
\n\
Part of the Eclipse Mars Simultaneous Release\n\
\n\
diff --git a/plugins/org.eclipse.objectteams.otredyn/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otredyn/META-INF/MANIFEST.MF
index 621ef0116..4e3774e11 100644
--- a/plugins/org.eclipse.objectteams.otredyn/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otredyn/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.objectteams.otredyn
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.2.1.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Export-Package: org.eclipse.objectteams.otredyn.bytecode,
diff --git a/releng/map/otdt.map.in b/releng/map/otdt.map.in
index 40f2012ce..f77833ce0 100644
--- a/releng/map/otdt.map.in
+++ b/releng/map/otdt.map.in
@@ -21,7 +21,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/201606070956
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,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,tag=branches/maintenance/OTDT_2.5.x
!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,tag=branches/maintenance/OTDT_2.5.x
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

Back to the top