Merge branch 'originalMaster'

Conflicts:
	org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/model/TestCaseElement.java
	org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/model/TestElement.java
	org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestViewer.java

org.eclipse.jdt.astview.feature/feature.xml

@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.jdt.astview.feature"
       label="AST View"
-      version="1.1.100.qualifier"
+      version="1.1.9.qualifier"
       provider-name="Eclipse.org">
    <install-handler/>
 
    <description>
-      AST View for JDT 3.7.1, 3.8, and later
+      AST View for JDT 4.4 and later
    </description>
 
    <license url="%licenseURL">
@@ -19,8 +19,8 @@
    </url>
 
    <requires>
-      <import plugin="org.eclipse.jdt.core" version="3.7.1" match="compatible"/>
-      <import plugin="org.eclipse.jdt.ui" version="3.7.1" match="compatible"/>
+      <import plugin="org.eclipse.jdt.core" version="3.9.0" match="compatible"/>
+      <import plugin="org.eclipse.jdt.ui" version="3.9.0" match="compatible"/>
       <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.eclipse.ui.ide"/>
       <import plugin="org.eclipse.ui.views"/>

org.eclipse.jdt.astview.feature/pom.xml

@@ -18,6 +18,6 @@
   </parent>
   <groupId>org.eclipse.jdt.feature</groupId>
   <artifactId>org.eclipse.jdt.astview.feature</artifactId>
-  <version>1.1.100-SNAPSHOT</version>
+  <version>1.1.9-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>

org.eclipse.jdt.astview/META-INF/MANIFEST.MF

@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jdt.astview; singleton:=true
-Bundle-Version: 1.1.8.qualifier
-Eclipse-SourceReferences: scm:git:git://git.eclipse.org/gitroot/jdt/eclipse.jdt.ui.git;path="org.eclipse.jdt.astview";tag=R1_1_8
+Bundle-Version: 1.1.9.qualifier
+Eclipse-SourceReferences: scm:git:git://git.eclipse.org/gitroot/jdt/eclipse.jdt.ui.git;path="org.eclipse.jdt.astview";tag=R4_4
 Bundle-Activator: org.eclipse.jdt.astview.ASTViewPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.jdt.astview;x-internal:=true,
  org.eclipse.jdt.astview.views;x-internal:=true
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.jdt.core;bundle-version="[3.7.1,4.0.0)",
- org.eclipse.jdt.ui;bundle-version="[3.7.1,4.0.0)",
+ org.eclipse.jdt.core;bundle-version="[3.10.0,4.0.0)",
+ org.eclipse.jdt.ui;bundle-version="[3.10.0,4.0.0)",
  org.eclipse.ui.ide,
  org.eclipse.ui.views,
  org.eclipse.jface.text,

org.eclipse.jdt.astview/pom.xml

@@ -18,6 +18,6 @@
   </parent>
   <groupId>org.eclipse.jdt</groupId>
   <artifactId>org.eclipse.jdt.astview</artifactId>
-  <version>1.1.8-SNAPSHOT</version>
+  <version>1.1.9-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>