Merge branch 'master' into use-built-artifacts

Author: HannesWell

eclipse-platform-parent/pom.xml

@@ -902,6 +902,35 @@
         <comparator.repo>https://download.eclipse.org/eclipse/updates/${releaseVersion}-Y-builds</comparator.repo>
       </properties>
     </profile>
+    <profile>
+      <id>skip-baseline-comparision-of-tests</id>
+      <activation>
+        <property>
+          <name>packaging</name>
+          <value>eclipse-test-plugin</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.eclipse.tycho.extras</groupId>
+            <artifactId>tycho-p2-extras-plugin</artifactId>
+            <version>${tycho.version}</version>
+            <executions>
+              <execution>
+                <id>compare-attached-artifacts-with-release</id>
+                <goals>
+                  <goal>compare-version-with-baselines</goal>
+                </goals>
+                <configuration>
+                  <skip>true</skip>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
     <profile>
       <id>eclipse-sign</id>
       <build>

eclipse.jdt.debug

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.test; singleton:=true
-Bundle-Version: 3.6.500.qualifier
+Bundle-Version: 3.6.600.qualifier
 Eclipse-BundleShape: dir
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin

eclipse.jdt.ui

@@ -20,5 +20,6 @@ bin.includes = .,\
 src.includes = about.html
 source.. = src/
 
-# Maven/Tycho pom model adjustments
+# Maven/Tycho POM adjustments
+pom.model.packaging = eclipse-plugin
 pom.model.property.defaultSigning-excludeInnerJars = true

eclipse.platform.releng/bundles/org.eclipse.test/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.test"
       label="%featureName"
-      version="3.9.600.qualifier"
+      version="3.9.700.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
@@ -47,4 +47,8 @@
          id="org.eclipse.core.tests.harness"
          version="0.0.0"/>
 
+   <plugin
+         id="org.eclipse.ui.tests.harness"
+         version="0.0.0"/>
+
 </feature>

eclipse.platform.releng/bundles/org.eclipse.test/build.properties

@@ -46,6 +46,18 @@
    <iu id = "org.eclipse.platform.ide">
      <category name="org.eclipse.platform.ide.categoryIU"/>
    </iu>
+   <bundle id="org.eclipse.jdt.core.tests.builder">
+      <category name="org.eclipse.releng.testsIU"/>
+   </bundle>
+   <bundle id="org.eclipse.text.tests">
+      <category name="org.eclipse.releng.testsIU"/>
+   </bundle>
+   <bundle id="org.eclipse.jface.text.tests">
+      <category name="org.eclipse.releng.testsIU"/>
+   </bundle>
+   <bundle id="org.eclipse.core.filebuffers.tests">
+      <category name="org.eclipse.releng.testsIU"/>
+   </bundle>
    <category-def name="org.eclipse.equinox.target.categoryIU" label="Equinox Target Components">
       <description>
          Features especially useful to install as PDE runtime targets.