Releng: go back to building from master
+ mark as 2.5.0 (all OT/J bundles and some more)
- resolve a few warnings
diff --git a/features/org.eclipse.objectteams.otdt.feature/category.xml b/features/org.eclipse.objectteams.otdt.feature/category.xml
index 1ee1163..5c88e15 100644
--- a/features/org.eclipse.objectteams.otdt.feature/category.xml
+++ b/features/org.eclipse.objectteams.otdt.feature/category.xml
@@ -73,4 +73,21 @@
<iu id="org.eclipse.objectteams.otequinox.turbo.feature.group" range="[2.4.0,2.5.0)">
<category name="org.eclipse.objectteams.otdt_2.4"/>
</iu>
+ <category-def name="org.eclipse.objectteams.otdt_2.5" label="OTDT 2.5 based on Eclipse 4.6">
+ <description>
+ The Object Teams Development Tooling versions 2.5.x based on Eclipse 4.6.x
+ </description>
+ </category-def>
+ <iu id="org.eclipse.objectteams.otdt.feature.group" range="[2.5.0,2.6.0)">
+ <category name="org.eclipse.objectteams.otdt_2.5"/>
+ </iu>
+ <iu id="org.eclipse.objectteams.otdt.source.feature.feature.group" range="[2.5.0,2.6.0)">
+ <category name="org.eclipse.objectteams.otdt_2.5"/>
+ </iu>
+ <iu id="org.eclipse.objectteams.otequinox.feature.group" range="[2.5.0,2.6.0)">
+ <category name="org.eclipse.objectteams.otdt_2.5"/>
+ </iu>
+ <iu id="org.eclipse.objectteams.otequinox.turbo.feature.group" range="[2.5.0,2.6.0)">
+ <category name="org.eclipse.objectteams.otdt_2.5"/>
+ </iu>
</site>
diff --git a/features/org.eclipse.objectteams.otdt.feature/feature.xml b/features/org.eclipse.objectteams.otdt.feature/feature.xml
index bcdb545..17e4a60 100644
--- a/features/org.eclipse.objectteams.otdt.feature/feature.xml
+++ b/features/org.eclipse.objectteams.otdt.feature/feature.xml
@@ -46,6 +46,7 @@
Marco Mosconi
Markus Witte
Michael Krüger
+ Oliver Frank
Ralf Anklam
Sascha Kolewa
Stephan Herrmann
@@ -58,7 +59,7 @@
</license>
<url>
- <update label="Object Teams Updates" url="http://download.eclipse.org/objectteams/updates/ot2.3"/>
+ <update label="Object Teams Updates" url="http://download.eclipse.org/objectteams/updates/ot2.5"/>
<discovery label="Object Teams Contributions" url="http://download.eclipse.org/objectteams/updates/contrib"/>
</url>
diff --git a/features/org.eclipse.objectteams.otdt.source.feature/feature.xml b/features/org.eclipse.objectteams.otdt.source.feature/feature.xml
index 3866650..e4b5047 100644
--- a/features/org.eclipse.objectteams.otdt.source.feature/feature.xml
+++ b/features/org.eclipse.objectteams.otdt.source.feature/feature.xml
@@ -45,6 +45,7 @@
Marco Mosconi
Markus Witte
Michael Krüger
+ Oliver Frank
Ralf Anklam
Sascha Kolewa
Stephan Herrmann
diff --git a/features/org.eclipse.objectteams.otequinox.feature/feature.xml b/features/org.eclipse.objectteams.otequinox.feature/feature.xml
index 190673b..ec02e35 100644
--- a/features/org.eclipse.objectteams.otequinox.feature/feature.xml
+++ b/features/org.eclipse.objectteams.otequinox.feature/feature.xml
@@ -21,7 +21,7 @@
</license>
<url>
- <update label="Object Teams Updates" url="http://download.eclipse.org/objectteams/updates/ot2.3"/>
+ <update label="Object Teams Updates" url="http://download.eclipse.org/objectteams/updates/ot2.5"/>
<discovery label="Orbit Repository" url="http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository"/>
</url>
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 b1d4e9b..f759899 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 @@
###{ObjectTeams:
otdtc.name = Extension for Object Teams
-otdtc.version = 2.4.0 M7
+otdtc.version = 2.5.0 M3
otdtc.copyright = Copyright by TU Berlin, Fraunhofer FIRST and others, 2004, 2015.
### SH}
### progress
diff --git a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/BaseCallMessageSend.java b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/BaseCallMessageSend.java
index 000b73e..aac40bb 100644
--- a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/BaseCallMessageSend.java
+++ b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/BaseCallMessageSend.java
@@ -68,11 +68,11 @@
* {@link StructuralPropertyDescriptor}),
* or null if uninitialized.
*/
- private static final List PROPERTY_DESCRIPTORS;
+ private static final List<StructuralPropertyDescriptor> PROPERTY_DESCRIPTORS;
static
{
- List propertyList = new ArrayList(3);
+ List<StructuralPropertyDescriptor> propertyList = new ArrayList<StructuralPropertyDescriptor>(3);
createPropertyList(BaseCallMessageSend.class, propertyList);
addProperty(NAME_PROPERTY, propertyList);
addProperty(ARGUMENTS_PROPERTY, propertyList);
@@ -88,7 +88,7 @@
* @return a list of property descriptors (element type:
* {@link StructuralPropertyDescriptor})
*/
- public static List propertyDescriptors(int apiLevel)
+ public static List<StructuralPropertyDescriptor> propertyDescriptors(int apiLevel)
{
return PROPERTY_DESCRIPTORS;
}
diff --git a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/BaseConstructorInvocation.java b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/BaseConstructorInvocation.java
index b4030c4..7d3a060 100644
--- a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/BaseConstructorInvocation.java
+++ b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/BaseConstructorInvocation.java
@@ -59,11 +59,11 @@
* {@link StructuralPropertyDescriptor}),
* or null if uninitialized.
*/
- private static final List PROPERTY_DESCRIPTORS;
+ private static final List<StructuralPropertyDescriptor> PROPERTY_DESCRIPTORS;
static
{
- List propertyList = new ArrayList(2);
+ List<StructuralPropertyDescriptor> propertyList = new ArrayList<StructuralPropertyDescriptor>(2);
createPropertyList(BaseConstructorInvocation.class, propertyList);
addProperty(ARGUMENTS_PROPERTY, propertyList);
PROPERTY_DESCRIPTORS = reapPropertyList(propertyList);
@@ -78,7 +78,7 @@
* @return a list of property descriptors (element type:
* {@link StructuralPropertyDescriptor})
*/
- public static List propertyDescriptors(int apiLevel)
+ public static List<StructuralPropertyDescriptor> propertyDescriptors(int apiLevel)
{
return PROPERTY_DESCRIPTORS;
}
diff --git a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/CallinMappingDeclaration.java b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/CallinMappingDeclaration.java
index 32f020a..7ded6c5 100644
--- a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/CallinMappingDeclaration.java
+++ b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/CallinMappingDeclaration.java
@@ -151,7 +151,7 @@
* {@link StructuralPropertyDescriptor}),
* or null if uninitialized.
*/
- private static final List PROPERTY_DESCRIPTORS_2_0;
+ private static final List<StructuralPropertyDescriptor> PROPERTY_DESCRIPTORS_2_0;
/**
* A list of property descriptors (element type:
@@ -159,7 +159,7 @@
* or null if uninitialized.
*/
- private static final List PROPERTY_DESCRIPTORS_3_0;
+ private static final List<StructuralPropertyDescriptor> PROPERTY_DESCRIPTORS_3_0;
private SimpleName _labelName = null;
@@ -170,7 +170,7 @@
static
{
- List propertyList = new ArrayList(7);
+ List<StructuralPropertyDescriptor> propertyList = new ArrayList<StructuralPropertyDescriptor>(7);
createPropertyList(CallinMappingDeclaration.class, propertyList);
addProperty(NAME_PROPERTY, propertyList);
addProperty(JAVADOC_PROPERTY, propertyList);
@@ -180,7 +180,7 @@
addProperty(PARAMETER_MAPPINGS_PROPERTY, propertyList);
PROPERTY_DESCRIPTORS_2_0 = reapPropertyList(propertyList);
- propertyList = new ArrayList(9);
+ propertyList = new ArrayList<StructuralPropertyDescriptor>(9);
createPropertyList(CallinMappingDeclaration.class, propertyList);
addProperty(NAME_PROPERTY, propertyList);
addProperty(MODIFIERS2_PROPERTY, propertyList); // for annotations
@@ -201,7 +201,7 @@
* @return a list of property descriptors (element type:
* {@link StructuralPropertyDescriptor})
*/
- public static List propertyDescriptors(int apiLevel)
+ public static List<StructuralPropertyDescriptor> propertyDescriptors(int apiLevel)
{
if(apiLevel >= AST.JLS3_INTERNAL)
return PROPERTY_DESCRIPTORS_3_0;
@@ -424,6 +424,7 @@
* @exception UnsupportedOperationException if this operation is used in
* a JLS2 AST
*/
+ @SuppressWarnings("rawtypes")
public List getBaseMappingElements()
{
return this._baseMappingElements;
diff --git a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/CalloutMappingDeclaration.java b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/CalloutMappingDeclaration.java
index 88eb7c5..75d8a30 100644
--- a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/CalloutMappingDeclaration.java
+++ b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/CalloutMappingDeclaration.java
@@ -119,7 +119,9 @@
/**
* The "modifiers" structural property of this node type.
+ * @deprecated use {@link #MODIFIERS2_PROPERTY}
*/
+ @Deprecated
public static final SimplePropertyDescriptor MODIFIERS_PROPERTY =
internalModifiersPropertyFactory(CalloutMappingDeclaration.class);
@@ -134,7 +136,7 @@
* {@link StructuralPropertyDescriptor}),
* or null if uninitialized.
*/
- private static final List PROPERTY_DESCRIPTORS_2_0;
+ private static final List<StructuralPropertyDescriptor> PROPERTY_DESCRIPTORS_2_0;
/**
* A list of property descriptors (element type:
@@ -142,7 +144,7 @@
* or null if uninitialized.
*/
- private static final List PROPERTY_DESCRIPTORS_3_0;
+ private static final List<StructuralPropertyDescriptor> PROPERTY_DESCRIPTORS_3_0;
private MethodMappingElement baseMappingElement = null;
private boolean baseMappingInitialized= false;
@@ -150,7 +152,7 @@
static
{
- List propertyList = new ArrayList(8);
+ List<StructuralPropertyDescriptor> propertyList = new ArrayList<StructuralPropertyDescriptor>(8);
createPropertyList(CalloutMappingDeclaration.class, propertyList);
addProperty(JAVADOC_PROPERTY, propertyList);
addProperty(ROLE_MAPPING_ELEMENT_PROPERTY, propertyList);
@@ -161,7 +163,7 @@
addProperty(MODIFIERS_PROPERTY, propertyList);
PROPERTY_DESCRIPTORS_2_0 = reapPropertyList(propertyList);
- propertyList = new ArrayList(8);
+ propertyList = new ArrayList<StructuralPropertyDescriptor>(8);
createPropertyList(CalloutMappingDeclaration.class, propertyList);
addProperty(JAVADOC_PROPERTY, propertyList);
addProperty(ROLE_MAPPING_ELEMENT_PROPERTY, propertyList);
@@ -181,7 +183,7 @@
* @return a list of property descriptors (element type:
* {@link StructuralPropertyDescriptor})
*/
- public static List propertyDescriptors(int apiLevel)
+ public static List<StructuralPropertyDescriptor> propertyDescriptors(int apiLevel)
{
if(apiLevel >= AST.JLS3_INTERNAL)
return PROPERTY_DESCRIPTORS_3_0;
@@ -308,7 +310,6 @@
return CALLOUT_MAPPING_DECLARATION;
}
- @SuppressWarnings("unchecked")
ASTNode clone0(AST target)
{
CalloutMappingDeclaration result = new CalloutMappingDeclaration(target);
diff --git a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/FieldAccessSpec.java b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/FieldAccessSpec.java
index 2f3814f..dad0966 100644
--- a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/FieldAccessSpec.java
+++ b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/FieldAccessSpec.java
@@ -71,20 +71,20 @@
* {@link StructuralPropertyDescriptor}),
* or null if uninitialized.
*/
- private static final List PROPERTY_DESCRIPTORS_2_0;
+ private static final List<StructuralPropertyDescriptor> PROPERTY_DESCRIPTORS_2_0;
- private static final List PROPERTY_DESCRIPTORS_3_0;
+ private static final List<StructuralPropertyDescriptor> PROPERTY_DESCRIPTORS_3_0;
static
{
- List propertyList = new ArrayList(4);
+ List<StructuralPropertyDescriptor> propertyList = new ArrayList<StructuralPropertyDescriptor>(4);
createPropertyList(FieldAccessSpec.class, propertyList);
addProperty(SIGNATURE_PROPERTY, propertyList);
addProperty(NAME_PROPERTY, propertyList);
addProperty(FIELD_TYPE_PROPERTY, propertyList);
PROPERTY_DESCRIPTORS_2_0 = reapPropertyList(propertyList);
- propertyList = new ArrayList(4);
+ propertyList = new ArrayList<StructuralPropertyDescriptor>(4);
createPropertyList(FieldAccessSpec.class, propertyList);
addProperty(SIGNATURE_PROPERTY, propertyList);
addProperty(NAME_PROPERTY, propertyList);
@@ -100,7 +100,7 @@
* @return a list of property descriptors (element type:
* {@link StructuralPropertyDescriptor})
*/
- public static List propertyDescriptors(int apiLevel)
+ public static List<StructuralPropertyDescriptor> propertyDescriptors(int apiLevel)
{
if (apiLevel == AST.JLS2_INTERNAL)
return PROPERTY_DESCRIPTORS_2_0;
diff --git a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/GuardPredicateDeclaration.java b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/GuardPredicateDeclaration.java
index 4621758..df41d81 100644
--- a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/GuardPredicateDeclaration.java
+++ b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/GuardPredicateDeclaration.java
@@ -43,17 +43,17 @@
new SimplePropertyDescriptor(GuardPredicateDeclaration.class, "base", boolean.class, MANDATORY); //$NON-NLS-1$
- private static final List PROPERTY_DESCRIPTORS_3_0;
+ private static final List<StructuralPropertyDescriptor> PROPERTY_DESCRIPTORS_3_0;
static {
- List propertyList = new ArrayList(3);
+ List<StructuralPropertyDescriptor> propertyList = new ArrayList<StructuralPropertyDescriptor>(3);
createPropertyList(GuardPredicateDeclaration.class, propertyList);
addProperty(BASE_PROPERTY, propertyList);
addProperty(EXPRESSION_PROPERTY, propertyList);
PROPERTY_DESCRIPTORS_3_0 = reapPropertyList(propertyList);
}
- public static List propertyDescriptors(int apiLevel) {
+ public static List<StructuralPropertyDescriptor> propertyDescriptors(int apiLevel) {
if (apiLevel == AST.JLS2_INTERNAL) {
throw new UnsupportedOperationException("JLS2 not supported"); //$NON-NLS-1$
} else {
diff --git a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/LiftingType.java b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/LiftingType.java
index 2712697..07b9761 100644
--- a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/LiftingType.java
+++ b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/LiftingType.java
@@ -70,11 +70,11 @@
* {@link StructuralPropertyDescriptor}),
* or null if uninitialized.
*/
- private static final List PROPERTY_DESCRIPTORS;
+ private static final List<StructuralPropertyDescriptor> PROPERTY_DESCRIPTORS;
static
{
- List propertyList = new ArrayList(4);
+ List<StructuralPropertyDescriptor> propertyList = new ArrayList<StructuralPropertyDescriptor>(4);
createPropertyList(LiftingType.class, propertyList);
addProperty(NAME_PROPERTY, propertyList);
addProperty(BASE_TYPE_PROPERTY, propertyList);
@@ -91,7 +91,7 @@
* @return a list of property descriptors (element type:
* {@link StructuralPropertyDescriptor})
*/
- public static List propertyDescriptors(int apiLevel)
+ public static List<StructuralPropertyDescriptor> propertyDescriptors(int apiLevel)
{
return PROPERTY_DESCRIPTORS;
}
diff --git a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/MethodBindingOperator.java b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/MethodBindingOperator.java
index 6e91502..fdfb0d1 100644
--- a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/MethodBindingOperator.java
+++ b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/MethodBindingOperator.java
@@ -29,7 +29,6 @@
* @author stephan
* @since 1.3.1
*/
-@SuppressWarnings("unchecked")
public class MethodBindingOperator extends ASTNode {
public static final int KIND_CALLOUT = 1;
@@ -54,24 +53,24 @@
* {@link StructuralPropertyDescriptor}),
* or null if uninitialized.
*/
- private static final List PROPERTY_DESCRIPTORS_2_0;
+ private static final List<StructuralPropertyDescriptor> PROPERTY_DESCRIPTORS_2_0;
/**
* A list of property descriptors (element type:
* {@link StructuralPropertyDescriptor}),
* or null if uninitialized.
*/
- private static final List PROPERTY_DESCRIPTORS_3_0;
+ private static final List<StructuralPropertyDescriptor> PROPERTY_DESCRIPTORS_3_0;
static
{
- List propertyList = new ArrayList(1);
+ List<StructuralPropertyDescriptor> propertyList = new ArrayList<StructuralPropertyDescriptor>(1);
createPropertyList(MethodBindingOperator.class, propertyList);
addProperty(BINDING_KIND_PROPERTY, propertyList);
addProperty(BINDING_MODIFIER_PROPERTY, propertyList);
PROPERTY_DESCRIPTORS_2_0 = reapPropertyList(propertyList);
- propertyList = new ArrayList(1);
+ propertyList = new ArrayList<StructuralPropertyDescriptor>(1);
createPropertyList(MethodBindingOperator.class, propertyList);
addProperty(BINDING_KIND_PROPERTY, propertyList);
addProperty(BINDING_MODIFIER_PROPERTY, propertyList); // one flag, not a bitset
@@ -86,7 +85,7 @@
* @return a list of property descriptors (element type:
* {@link StructuralPropertyDescriptor})
*/
- public static List propertyDescriptors(int apiLevel)
+ public static List<StructuralPropertyDescriptor> propertyDescriptors(int apiLevel)
{
if(apiLevel == AST.JLS3_INTERNAL)
return PROPERTY_DESCRIPTORS_3_0;
diff --git a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/MethodSpec.java b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/MethodSpec.java
index 1137ae9..949c3cc 100644
--- a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/MethodSpec.java
+++ b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/MethodSpec.java
@@ -95,7 +95,7 @@
* {@link StructuralPropertyDescriptor}),
* or null if uninitialized.
*/
- private static final List PROPERTY_DESCRIPTORS_2_0;
+ private static final List<StructuralPropertyDescriptor> PROPERTY_DESCRIPTORS_2_0;
/**
* A list of property descriptors (element type:
@@ -103,12 +103,12 @@
* or null if uninitialized.
* @since 3.1
*/
- private static final List PROPERTY_DESCRIPTORS_3_0;
+ private static final List<StructuralPropertyDescriptor> PROPERTY_DESCRIPTORS_3_0;
static
{
- List propertyList = new ArrayList(6);
+ List<StructuralPropertyDescriptor> propertyList = new ArrayList<StructuralPropertyDescriptor>(6);
createPropertyList(MethodSpec.class, propertyList);
addProperty(RETURN_TYPE_PROPERTY, propertyList);
addProperty(NAME_PROPERTY, propertyList);
@@ -117,7 +117,7 @@
addProperty(COVARIANT_RETURN_PROPERTY, propertyList);
PROPERTY_DESCRIPTORS_2_0 = reapPropertyList(propertyList);
- propertyList = new ArrayList(7);
+ propertyList = new ArrayList<StructuralPropertyDescriptor>(7);
createPropertyList(MethodSpec.class, propertyList);
addProperty(RETURN_TYPE2_PROPERTY, propertyList);
addProperty(TYPE_PARAMETERS_PROPERTY, propertyList);
@@ -138,7 +138,7 @@
* {@link StructuralPropertyDescriptor})
* @since 3.0
*/
- public static List propertyDescriptors(int apiLevel) {
+ public static List<StructuralPropertyDescriptor> propertyDescriptors(int apiLevel) {
if (apiLevel == AST.JLS2_INTERNAL) {
return PROPERTY_DESCRIPTORS_2_0;
} else {
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 0ae442f..3b3b37e 100644
--- a/plugins/org.eclipse.objectteams.otdt.apt/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otdt.apt/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.objectteams.otdt.apt;singleton:=true
-Bundle-Version: 2.2.0.qualifier
+Bundle-Version: 2.5.0.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Require-Bundle: org.eclipse.objectteams.otequinox;bundle-version="[2.3.0,3.0.0)",
+Require-Bundle: org.eclipse.objectteams.otequinox;bundle-version="[2.5.0,3.0.0)",
org.eclipse.osgi;bundle-version="[3.7.0,4.0.0)",
org.eclipse.jdt.core;bundle-version="[3.7.0.v_OTDT_r200,4.0.0)"
Bundle-ActivationPolicy: lazy
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 c2cdc2f..4ae97f9 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,15 +2,15 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.objectteams.otdt.compiler.adaptor;singleton:=true
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.5.0.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Require-Bundle: org.eclipse.jdt.core;bundle-version="[3.10.0.v_OTDT_r230,4.0.0)",
- org.eclipse.objectteams.otequinox;bundle-version="[2.3.0,3.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)",
org.eclipse.pde.core;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.objectteams.otdt;bundle-version="[2.3.0,3.0.0)"
+ org.eclipse.objectteams.otdt;bundle-version="[2.5.0,3.0.0)"
Export-Package: org.eclipse.objectteams.otdt.internal.compiler.adaptor;x-friends:="org.eclipse.objectteams.otdt.test.builder,org.eclipse.core.resources,org.eclipse.jdt.core,org.eclipse.pde.core"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ActivationPolicy: lazy
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 eac277a..101b5ff 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.objectteams.otdt.jdt.ui;singleton:=true
-Bundle-Version: 2.4.0.qualifier
+Bundle-Version: 2.5.0.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)",
@@ -19,9 +19,9 @@
org.eclipse.ui.views;bundle-version="[3.6.0,4.0.0)",
org.eclipse.core.filesystem;bundle-version="[1.3.100,2.0.0)",
org.eclipse.jdt.core;bundle-version="[3.10.0.v_OTDT_r230,4.0.0)",
- org.eclipse.objectteams.otequinox;bundle-version="[2.3.0,3.0.0)",
- org.eclipse.objectteams.otdt.ui;bundle-version="[2.3.0,3.0.0)",
- org.eclipse.objectteams.otdt;bundle-version="[2.3.0,3.0.0)",
+ org.eclipse.objectteams.otequinox;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.objectteams.otdt.ui;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.objectteams.otdt;bundle-version="[2.5.0,3.0.0)",
org.eclipse.jdt.launching;bundle-version="[3.7.100,4.0.0)"
Bundle-Vendor: %providerName
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/org.eclipse.objectteams.otdt.pde.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otdt.pde.ui/META-INF/MANIFEST.MF
index 5b638e8..afd3837 100644
--- a/plugins/org.eclipse.objectteams.otdt.pde.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otdt.pde.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.objectteams.otdt.pde.ui;singleton:=true
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.5.0.qualifier
Bundle-Activator: org.eclipse.objectteams.otdt.internal.pde.ui.OTPDEUIPlugin
Require-Bundle: org.eclipse.ui;bundle-version="[3.9.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
@@ -17,10 +17,10 @@
org.eclipse.search;bundle-version="[3.9.0,4.0.0)",
org.eclipse.pde.api.tools.ui;bundle-version="[1.0.300,4.0.0)",
org.eclipse.jdt.core;bundle-version="[3.10.0.v_OTDT_r230,4.0.0)",
- org.eclipse.objectteams.otdt;bundle-version="[2.3.0,3.0.0)",
+ org.eclipse.objectteams.otdt;bundle-version="[2.5.0,3.0.0)",
org.eclipse.objectteams.otdt.debug;bundle-version="[2.3.0,3.0.0)",
- org.eclipse.objectteams.otequinox;bundle-version="[2.3.0,3.0.0)",
- org.eclipse.objectteams.otdt.ui;bundle-version="[2.3.0,3.0.0)"
+ org.eclipse.objectteams.otequinox;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.objectteams.otdt.ui;bundle-version="[2.5.0,3.0.0)"
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Export-Package: org.eclipse.objectteams.otdt.internal.migration;x-internal:=true,
diff --git a/plugins/org.eclipse.objectteams.otdt.refactoring/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otdt.refactoring/META-INF/MANIFEST.MF
index ab355d9..92869bf 100644
--- a/plugins/org.eclipse.objectteams.otdt.refactoring/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otdt.refactoring/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.objectteams.otdt.refactoring;singleton:=true
-Bundle-Version: 2.4.0.qualifier
+Bundle-Version: 2.5.0.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Require-Bundle: org.eclipse.jdt.ui;bundle-version="[3.10.100,4.0.0)",
@@ -16,8 +16,8 @@
org.eclipse.objectteams.otequinox;bundle-version="[2.3.0,3.0.0)",
org.eclipse.jdt.core.manipulation;bundle-version="[1.2.0,2.0.0)",
org.eclipse.ltk.ui.refactoring;bundle-version="[3.4.1,4.0.0)",
- org.eclipse.objectteams.otdt;bundle-version="[2.3.0,3.0.0)",
- org.eclipse.objectteams.otdt.jdt.ui;bundle-version="[2.3.0,3.0.0)"
+ org.eclipse.objectteams.otdt;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.objectteams.otdt.jdt.ui;bundle-version="[2.5.0,3.0.0)"
Export-Package: org.eclipse.objectteams.otdt.internal.refactoring.adaptor;x-internal:=true,
org.eclipse.objectteams.otdt.internal.refactoring.adaptor.extractmethod;x-internal:=true,
org.eclipse.objectteams.otdt.internal.refactoring.adaptor.pullup;x-internal:=true,
diff --git a/plugins/org.eclipse.objectteams.otdt.samples/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otdt.samples/META-INF/MANIFEST.MF
index 5188e8b..fc48b70 100644
--- a/plugins/org.eclipse.objectteams.otdt.samples/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otdt.samples/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.objectteams.otdt.samples;singleton:=true
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.5.0.qualifier
Bundle-Activator: org.eclipse.objectteams.otdt.internal.samples.OTSamplesPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -18,10 +18,10 @@
org.eclipse.debug.core;bundle-version="[3.7.0,4.0.0)",
org.eclipse.jdt.debug.ui;bundle-version="[3.6.0,4.0.0)",
org.eclipse.jdt.core;bundle-version="[3.10.0.v_OTDT_r230,4.0.0)",
- org.eclipse.objectteams.otdt;bundle-version="[2.3.0,3.0.0)",
- org.eclipse.objectteams.otdt.ui;bundle-version="[2.3.0,3.0.0)",
- org.eclipse.objectteams.otdt.ui.help;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.objectteams.otequinox;bundle-version="[2.3.0,3.0.0)"
+ org.eclipse.objectteams.otdt;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.objectteams.otdt.ui;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.objectteams.otdt.ui.help;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.objectteams.otequinox;bundle-version="[2.5.0,3.0.0)"
Export-Package: org.eclipse.objectteams.otdt.internal.samples;x-internal:="true"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.objectteams.otdt.ui.help/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otdt.ui.help/META-INF/MANIFEST.MF
index 82e8712..fc43867 100644
--- a/plugins/org.eclipse.objectteams.otdt.ui.help/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otdt.ui.help/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.objectteams.otdt.ui.help;singleton:=true
-Bundle-Version: 2.4.0.qualifier
+Bundle-Version: 2.5.0.qualifier
Bundle-Activator: org.eclipse.objectteams.otdt.ui.help.OTHelpPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -21,9 +21,9 @@
org.eclipse.jface.text;bundle-version="[3.7.0,4.0.0)",
org.eclipse.jdt.ui;bundle-version="[3.7.0,4.0.0)",
org.eclipse.jdt.core;bundle-version="[3.7.0.v_OTDT_r200,4.0.0)",
- org.eclipse.objectteams.otdt.ui;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.objectteams.otequinox;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.objectteams.otdt.doc;bundle-version="2.2.0"
+ org.eclipse.objectteams.otdt.ui;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.objectteams.otequinox;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.objectteams.otdt.doc;bundle-version="2.4.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ActivationPolicy: lazy
Bundle-Classpath: .
diff --git a/plugins/org.eclipse.objectteams.otequinox.branding/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otequinox.branding/META-INF/MANIFEST.MF
index 1715de3..c1a7af9 100644
--- a/plugins/org.eclipse.objectteams.otequinox.branding/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otequinox.branding/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.objectteams.otequinox.branding;singleton:=true
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.5.0.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
diff --git a/plugins/org.eclipse.objectteams.otequinox.branding/build.properties b/plugins/org.eclipse.objectteams.otequinox.branding/build.properties
index 048d015..30bfd0e 100644
--- a/plugins/org.eclipse.objectteams.otequinox.branding/build.properties
+++ b/plugins/org.eclipse.objectteams.otequinox.branding/build.properties
@@ -6,5 +6,3 @@
icons/,\
plugin.properties,\
about.html
-src.includes = src/
-
diff --git a/plugins/org.eclipse.objectteams.otequinox/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otequinox/META-INF/MANIFEST.MF
index 6bb4d4e..c2485ad 100644
--- a/plugins/org.eclipse.objectteams.otequinox/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otequinox/META-INF/MANIFEST.MF
@@ -8,8 +8,8 @@
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.objectteams.runtime;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
- org.eclipse.objectteams.otre;bundle-version="[2.3.0,3.0.0)",
- org.eclipse.objectteams.otredyn;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.objectteams.otre;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.objectteams.otredyn;bundle-version="[1.2.0,2.0.0)",
org.eclipse.osgi;bundle-version="[3.10.0,4.0.0)",
org.eclipse.jdt.annotation;bundle-version="[1.1.0,2.0.0)";resolution:=optional,
org.objectweb.asm;bundle-version="[5.0.1,6.0.0)"
diff --git a/plugins/org.eclipse.objectteams.otequinox/about.ini b/plugins/org.eclipse.objectteams.otequinox/about.ini
index 8a90e30..b4792e7 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.4.0\n\
+Version: 2.5.0\n\
\n\
Part of the Eclipse Mars Simultaneous Release\n\
\n\
diff --git a/plugins/org.eclipse.objectteams.otequinox/build.properties b/plugins/org.eclipse.objectteams.otequinox/build.properties
index e5ea4de..da7cea0 100644
--- a/plugins/org.eclipse.objectteams.otequinox/build.properties
+++ b/plugins/org.eclipse.objectteams.otequinox/build.properties
@@ -11,8 +11,7 @@
bcelpatch/,\
otequinoxAgent.jar
src.includes = schema/,\
- about.ini,\
- agentSrc/
+ about.ini
javacProjectSettings=true
compilerArg = -annotationpath ${buildDirectory}/plugins/${bundleId}/annotations/plugins${path.separator}\
diff --git a/plugins/org.eclipse.objectteams.otre/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otre/META-INF/MANIFEST.MF
index 55bb238..9157838 100644
--- a/plugins/org.eclipse.objectteams.otre/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otre/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.objectteams.otre
-Bundle-Version: 2.4.0.qualifier
+Bundle-Version: 2.5.0.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Require-Bundle: org.apache.bcel;bundle-version="[5.2.0,5.3.0)",
diff --git a/plugins/org.eclipse.objectteams.otredyn/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otredyn/META-INF/MANIFEST.MF
index 64c045e..621ef01 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.objectteams.otredyn
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Export-Package: org.eclipse.objectteams.otredyn.bytecode,
@@ -13,7 +13,7 @@
org.eclipse.objectteams.otredyn.util
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ClassPath: .
-Require-Bundle: org.eclipse.objectteams.runtime;bundle-version="[2.4.0,3.0.0)",
+Require-Bundle: org.eclipse.objectteams.runtime;bundle-version="[2.5.0,3.0.0)",
org.objectweb.asm;bundle-version="5.0.1",
org.objectweb.asm.tree;bundle-version="5.0.1",
org.objectweb.asm.commons;bundle-version="5.0.1"
diff --git a/plugins/org.eclipse.objectteams.otredyn/src/org/eclipse/objectteams/otredyn/bytecode/asm/CreateCallAllBindingsCallInOrgMethod.java b/plugins/org.eclipse.objectteams.otredyn/src/org/eclipse/objectteams/otredyn/bytecode/asm/CreateCallAllBindingsCallInOrgMethod.java
index b66df32..4521180 100644
--- a/plugins/org.eclipse.objectteams.otredyn/src/org/eclipse/objectteams/otredyn/bytecode/asm/CreateCallAllBindingsCallInOrgMethod.java
+++ b/plugins/org.eclipse.objectteams.otredyn/src/org/eclipse/objectteams/otredyn/bytecode/asm/CreateCallAllBindingsCallInOrgMethod.java
@@ -110,7 +110,7 @@
// this.callAllBindings(boundMethodId, args);
newInstructions.add(new MethodInsnNode(Opcodes.INVOKEVIRTUAL,
this.name, ConstantMembers.callAllBindingsClient.getName(),
- ConstantMembers.callAllBindingsClient.getSignature()));
+ ConstantMembers.callAllBindingsClient.getSignature(), false));
Type returnType = Type.getReturnType(method.desc);
newInstructions
.add(getUnboxingInstructionsForReturnValue(returnType));
diff --git a/plugins/org.eclipse.objectteams.otredyn/src/org/eclipse/objectteams/otredyn/bytecode/asm/CreateDispatchCodeInOrgMethodAdapter.java b/plugins/org.eclipse.objectteams.otredyn/src/org/eclipse/objectteams/otredyn/bytecode/asm/CreateDispatchCodeInOrgMethodAdapter.java
index fe33617..02846b7 100644
--- a/plugins/org.eclipse.objectteams.otredyn/src/org/eclipse/objectteams/otredyn/bytecode/asm/CreateDispatchCodeInOrgMethodAdapter.java
+++ b/plugins/org.eclipse.objectteams.otredyn/src/org/eclipse/objectteams/otredyn/bytecode/asm/CreateDispatchCodeInOrgMethodAdapter.java
@@ -90,7 +90,7 @@
// box the arguments
instructions.add(getBoxingInstructions(args, (method.access & Opcodes.ACC_STATIC) != 0));
//callOrigStatic(boundMethodId, args);
- instructions.add(new MethodInsnNode(Opcodes.INVOKESTATIC, name, ConstantMembers.callOrigStatic.getName(), ConstantMembers.callOrigStatic.getSignature()));
+ instructions.add(new MethodInsnNode(Opcodes.INVOKESTATIC, name, ConstantMembers.callOrigStatic.getName(), ConstantMembers.callOrigStatic.getSignature(), false));
Type returnType = Type.getReturnType(method.desc);
instructions
.add(getUnboxingInstructionsForReturnValue(returnType));
diff --git a/plugins/org.eclipse.objectteams.otredyn/src/org/eclipse/objectteams/otredyn/bytecode/asm/CreateSuperCallInCallOrigAdapter.java b/plugins/org.eclipse.objectteams.otredyn/src/org/eclipse/objectteams/otredyn/bytecode/asm/CreateSuperCallInCallOrigAdapter.java
index 664c677..aec6495 100644
--- a/plugins/org.eclipse.objectteams.otredyn/src/org/eclipse/objectteams/otredyn/bytecode/asm/CreateSuperCallInCallOrigAdapter.java
+++ b/plugins/org.eclipse.objectteams.otredyn/src/org/eclipse/objectteams/otredyn/bytecode/asm/CreateSuperCallInCallOrigAdapter.java
@@ -50,7 +50,7 @@
instructions.add(new MethodInsnNode(Opcodes.INVOKESPECIAL,
superClassName, ConstantMembers.callOrig.getName(),
- ConstantMembers.callOrig.getSignature()));
+ ConstantMembers.callOrig.getSignature(), false));
instructions.add(new InsnNode(Opcodes.ARETURN));
addNewLabelToSwitch(callOrig.instructions, instructions, joinpointId);
callOrig.maxStack = Math.max(callOrig.maxStack, args.length + 1);
diff --git a/plugins/org.eclipse.objectteams.otredyn/src/org/eclipse/objectteams/otredyn/bytecode/asm/CreateSwitchForCallAllBindingsNode.java b/plugins/org.eclipse.objectteams.otredyn/src/org/eclipse/objectteams/otredyn/bytecode/asm/CreateSwitchForCallAllBindingsNode.java
index f8a850a..4c6c844 100644
--- a/plugins/org.eclipse.objectteams.otredyn/src/org/eclipse/objectteams/otredyn/bytecode/asm/CreateSwitchForCallAllBindingsNode.java
+++ b/plugins/org.eclipse.objectteams.otredyn/src/org/eclipse/objectteams/otredyn/bytecode/asm/CreateSwitchForCallAllBindingsNode.java
@@ -65,7 +65,7 @@
}
// return callOrig(boundMethodId, args);
- method.instructions.add(new MethodInsnNode(Opcodes.INVOKEVIRTUAL, name, ConstantMembers.callOrig.getName(), ConstantMembers.callOrig.getSignature()));
+ method.instructions.add(new MethodInsnNode(Opcodes.INVOKEVIRTUAL, name, ConstantMembers.callOrig.getName(), ConstantMembers.callOrig.getSignature(), false));
method.instructions.add(new InsnNode(Opcodes.ARETURN));
}
diff --git a/releng/map/otdt.map.in b/releng/map/otdt.map.in
index 28abe5b..5b85fb9 100644
--- a/releng/map/otdt.map.in
+++ b/releng/map/otdt.map.in
@@ -1,29 +1,29 @@
!*************** OTDT CONTRIBUTION ********************************************************
!-- Don't set version numbers for features, otherwise pdebuild would complain about a non-existent Basedir: --
-feature@org.eclipse.objectteams.otdt=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=features/org.eclipse.objectteams.otdt.feature,tag=branches/sherrmann/otdre
-feature@org.eclipse.objectteams.otdt.source.feature=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=features/org.eclipse.objectteams.otdt.source.feature,tag=branches/sherrmann/otdre
-feature@org.eclipse.objectteams.otdt.core.patch=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=features/org.eclipse.objectteams.otdt.core.patch,tag=branches/sherrmann/otdre
-feature@org.eclipse.objectteams.otequinox=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=features/org.eclipse.objectteams.otequinox.feature,tag=branches/sherrmann/otdre
+feature@org.eclipse.objectteams.otdt=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=features/org.eclipse.objectteams.otdt.feature
+feature@org.eclipse.objectteams.otdt.source.feature=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=features/org.eclipse.objectteams.otdt.source.feature
+feature@org.eclipse.objectteams.otdt.core.patch=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=features/org.eclipse.objectteams.otdt.core.patch
+feature@org.eclipse.objectteams.otequinox=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=features/org.eclipse.objectteams.otequinox.feature
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.12.0.v_OTDT_r250_qualifier=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=org.eclipse.jdt.core,tag=branches/sherrmann/otdre
+plugin@org.eclipse.jdt.core,3.12.0.v_OTDT_r250_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,tag=branches/sherrmann/otdre
+plugin@org.eclipse.objectteams.otdt=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt
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.ui=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.debug.ui,tag=builds/201506091717
-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/sherrmann/otdre
+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
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/201506091717
!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
-plugin@org.eclipse.objectteams.runtime=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.runtime,tag=branches/sherrmann/otdre
-plugin@org.eclipse.objectteams.otre=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otre,tag=branches/sherrmann/otdre
-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/sherrmann/otdre
+plugin@org.eclipse.objectteams.runtime=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.runtime
+plugin@org.eclipse.objectteams.otre=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otre
+plugin@org.eclipse.objectteams.otredyn=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otredyn
!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/sherrmann/otdre
+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
plugin@org.eclipse.objectteams.eclipse.monitor=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.eclipse.monitor,tag=builds/201406101339
@@ -32,15 +32,15 @@
!plugin@org.eclipse.objectteams.otdt.metrics.export=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.metrics.export
!** 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=builds/201406101339
-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/sherrmann/otdre
-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/201506091717
-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/201406101339
-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/201406101339
-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=branches/sherrmann/otdre
-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/201506091717
-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/201406101339
-plugin@org.eclipse.objectteams.otdt.samples=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.samples,tag=builds/201406101339
+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
+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
+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
+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
+plugin@org.eclipse.objectteams.otdt.samples=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.samples
!** Consume BCEL from Orbit: **!
plugin@org.apache.bcel,5.2.0=p2IU,id=org.apache.bcel,version=5.2.0.v201005080400,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20150519210750/repository