|
 |
11dc0f |
--- eclipse.pde.ui/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/target/MinimalTargetDefinitionPersistenceTests.java.orig 2016-04-19 20:07:36.947017206 +0100
|
|
|
11dc0f |
+++ eclipse.pde.ui/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/target/MinimalTargetDefinitionPersistenceTests.java 2016-04-19 20:09:59.166077383 +0100
|
|
|
11dc0f |
@@ -76,7 +76,7 @@
|
|
|
11dc0f |
*/
|
|
|
11dc0f |
protected IPath getJdtFeatureLocation() {
|
|
|
11dc0f |
IPath path = new Path(TargetPlatform.getDefaultLocation());
|
|
|
11dc0f |
- path = path.append("features");
|
|
|
11dc0f |
+ path = path.append("droplets").append("eclipse-jdt").append("features");
|
|
|
11dc0f |
File dir = path.toFile();
|
|
|
11dc0f |
assertTrue("Missing features directory", dir.exists() && !dir.isFile());
|
|
|
11dc0f |
String[] files = dir.list();
|
|
|
11dc0f |
diff --git rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java
|
|
|
11dc0f |
index f1f38f0..f9111e6 100644
|
|
|
11dc0f |
--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java
|
|
|
11dc0f |
+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java
|
|
|
11dc0f |
@@ -217,7 +217,7 @@
|
|
|
11dc0f |
if (parent != null) {
|
|
|
11dc0f |
File[] children = parent.listFiles((FileFilter) pathname -> {
|
|
|
11dc0f |
String name = pathname.getName();
|
|
|
11dc0f |
- return name.startsWith("eclipse-platform-");
|
|
|
11dc0f |
+ return name.startsWith("eclipse-SDK-");
|
|
|
11dc0f |
});
|
|
|
11dc0f |
if (children != null && children.length == 1)
|
|
|
11dc0f |
file = children[0];
|
|
|
11dc0f |
diff --git eclipse.jdt.core/org.eclipse.jdt.apt.pluggable.tests/build.properties eclipse.jdt.core/org.eclipse.jdt.apt.pluggable.tests/build.properties
|
|
|
11dc0f |
index 376daa6..1742a8d 100644
|
|
|
11dc0f |
--- eclipse.jdt.core/org.eclipse.jdt.apt.pluggable.tests/build.properties
|
|
|
11dc0f |
+++ eclipse.jdt.core/org.eclipse.jdt.apt.pluggable.tests/build.properties
|
|
|
11dc0f |
@@ -17,6 +17,7 @@ bin.includes = .,\
|
|
|
11dc0f |
resources/,\
|
|
|
11dc0f |
lib/
|
|
|
11dc0f |
src.includes = about.html
|
|
|
11dc0f |
-jars.compile.order = .
|
|
|
11dc0f |
+jars.compile.order = .,\
|
|
|
11dc0f |
+ lib/annotations.jar
|
|
|
11dc0f |
source.. = src/
|
|
|
11dc0f |
-output.. = bin/
|
|
|
11dc0f |
+source.lib/annotations.jar = src/
|
|
|
11dc0f |
diff --git eclipse.jdt.core/org.eclipse.jdt.apt.tests/build.properties eclipse.jdt.core/org.eclipse.jdt.apt.tests/build.properties
|
|
|
11dc0f |
index f34ae40..0f9877d 100644
|
|
|
11dc0f |
--- eclipse.jdt.core/org.eclipse.jdt.apt.tests/build.properties
|
|
|
11dc0f |
+++ eclipse.jdt.core/org.eclipse.jdt.apt.tests/build.properties
|
|
|
11dc0f |
@@ -24,4 +24,6 @@ bin.includes = plugin.xml,\
|
|
|
11dc0f |
plugin.properties
|
|
|
11dc0f |
src.includes = about.html
|
|
|
11dc0f |
src.excludes = src-resources/
|
|
|
11dc0f |
-jars.compile.order = aptext.jar,apt.jar,.
|
|
|
11dc0f |
+jars.compile.order = aptext.jar,apt.jar,.,\
|
|
|
11dc0f |
+ resources/question.jar
|
|
|
11dc0f |
+source.resources/question.jar = src-resources/
|
|
|
11dc0f |
diff --git eclipse.jdt.core/org.eclipse.jdt.compiler.apt.tests/build.properties eclipse.jdt.core/org.eclipse.jdt.compiler.apt.tests/build.properties
|
|
|
11dc0f |
index bc8963d..fbe4da3 100644
|
|
|
11dc0f |
--- eclipse.jdt.core/org.eclipse.jdt.compiler.apt.tests/build.properties
|
|
|
11dc0f |
+++ eclipse.jdt.core/org.eclipse.jdt.compiler.apt.tests/build.properties
|
|
|
11dc0f |
@@ -25,3 +25,6 @@
|
|
|
11dc0f |
src.includes = about.html
|
|
|
11dc0f |
compilerArg=-proc:none
|
|
|
11dc0f |
jars.extra.classpath = lib/java10api.jar
|
|
|
11dc0f |
+source.lib/apttestprocessors.jar = processors/
|
|
|
11dc0f |
+jars.compile.order = lib/apttestprocessors.jar,\
|
|
|
11dc0f |
+ .
|
|
|
11dc0f |
--- eclipse.platform/ant/org.eclipse.ant.tests.ui/build.properties.orig 2016-03-24 14:25:47.076289150 +0000
|
|
|
11dc0f |
+++ eclipse.platform/ant/org.eclipse.ant.tests.ui/build.properties 2016-03-24 14:26:39.528660802 +0000
|
|
|
11dc0f |
@@ -25,6 +25,8 @@
|
|
|
11dc0f |
Ant Tests/
|
|
|
11dc0f |
|
|
|
11dc0f |
source.lib/antUITestsSupport.jar = test support/
|
|
|
11dc0f |
-jars.compile.order=anttestsui.jar,lib/antUITestsSupport.jar
|
|
|
11dc0f |
+source.testbuildfiles/antUITestsSupport.jar = test support/
|
|
|
11dc0f |
+jars.compile.order=anttestsui.jar,lib/antUITestsSupport.jar,testbuildfiles/antUITestsSupport.jar
|
|
|
11dc0f |
output.lib/antUITestsSupport.jar = test_support_bin/
|
|
|
11dc0f |
+output.testbuildfiles/antUITestsSupport.jar = test_support_bin/
|
|
|
11dc0f |
output.anttestsui.jar = bin/
|
|
|
11dc0f |
--- eclipse.jdt.ui/org.eclipse.jdt.ui.tests/build.properties.orig 2016-03-25 15:09:40.557786910 +0000
|
|
|
11dc0f |
+++ eclipse.jdt.ui/org.eclipse.jdt.ui.tests/build.properties 2016-03-25 15:12:08.476059326 +0000
|
|
|
11dc0f |
@@ -22,3 +22,5 @@
|
|
|
11dc0f |
leaks/,\
|
|
|
11dc0f |
performance/
|
|
|
11dc0f |
javacWarnings..=-raw,-unchecked
|
|
|
11dc0f |
+source.testresources/nls.jar = nls/
|
|
|
11dc0f |
+jars.compile.order = .,testresources/nls.jar
|
|
|
11dc0f |
--- /dev/null 1970-01-01 01:00:00.000000000 +0100
|
|
|
11dc0f |
+++ eclipse.jdt.ui/org.eclipse.jdt.ui.tests/nls/pkg/Client.java 2004-11-12 14:37:36.000000000 +0000
|
|
|
11dc0f |
@@ -0,0 +1,25 @@
|
|
|
11dc0f |
+/*******************************************************************************
|
|
|
11dc0f |
+ * Copyright (c) 2000, 2004 IBM Corporation and others.
|
|
|
11dc0f |
+ * All rights reserved. This program and the accompanying materials
|
|
|
11dc0f |
+ * are made available under the terms of the Common Public License v1.0
|
|
|
11dc0f |
+ * which accompanies this distribution, and is available at
|
|
|
11dc0f |
+ * http://www.eclipse.org/legal/cpl-v10.html
|
|
|
11dc0f |
+ *
|
|
|
11dc0f |
+ * Contributors:
|
|
|
11dc0f |
+ * IBM Corporation - initial API and implementation
|
|
|
11dc0f |
+ *******************************************************************************/
|
|
|
11dc0f |
+package pkg;
|
|
|
11dc0f |
+
|
|
|
11dc0f |
+public class Client {
|
|
|
11dc0f |
+
|
|
|
11dc0f |
+ public String s;
|
|
|
11dc0f |
+
|
|
|
11dc0f |
+ {
|
|
|
11dc0f |
+ s= Messages.getString("test");
|
|
|
11dc0f |
+ s= Messages.getString("test_undefined");
|
|
|
11dc0f |
+ s= Messages.getString("duplicate");
|
|
|
11dc0f |
+ s= Messages.getString("test.long.key");
|
|
|
11dc0f |
+ s= Messages.getString("SearchResultView.removed_resource");
|
|
|
11dc0f |
+ }
|
|
|
11dc0f |
+
|
|
|
11dc0f |
+}
|
|
|
11dc0f |
--- /dev/null 1970-01-01 01:00:00.000000000 +0100
|
|
|
11dc0f |
+++ eclipse.jdt.ui/org.eclipse.jdt.ui.tests/nls/pkg/Messages.java 2004-11-12 14:37:28.000000000 +0000
|
|
|
11dc0f |
@@ -0,0 +1,58 @@
|
|
|
11dc0f |
+/*******************************************************************************
|
|
|
11dc0f |
+ * Copyright (c) 2000, 2004 IBM Corporation and others.
|
|
|
11dc0f |
+ * All rights reserved. This program and the accompanying materials
|
|
|
11dc0f |
+ * are made available under the terms of the Common Public License v1.0
|
|
|
11dc0f |
+ * which accompanies this distribution, and is available at
|
|
|
11dc0f |
+ * http://www.eclipse.org/legal/cpl-v10.html
|
|
|
11dc0f |
+ *
|
|
|
11dc0f |
+ * Contributors:
|
|
|
11dc0f |
+ * IBM Corporation - initial API and implementation
|
|
|
11dc0f |
+ *******************************************************************************/
|
|
|
11dc0f |
+package pkg;
|
|
|
11dc0f |
+
|
|
|
11dc0f |
+import java.text.MessageFormat;
|
|
|
11dc0f |
+import java.util.MissingResourceException;
|
|
|
11dc0f |
+import java.util.ResourceBundle;
|
|
|
11dc0f |
+
|
|
|
11dc0f |
+public class Messages extends Object {
|
|
|
11dc0f |
+ private static final String RESOURCE_BUNDLE = Messages.class.getName();
|
|
|
11dc0f |
+ private static ResourceBundle fgResourceBundle = ResourceBundle.getBundle(RESOURCE_BUNDLE);
|
|
|
11dc0f |
+
|
|
|
11dc0f |
+ private Messages() {}
|
|
|
11dc0f |
+
|
|
|
11dc0f |
+ /**
|
|
|
11dc0f |
+ * Gets a string from the resource bundle and formats it with the argument
|
|
|
11dc0f |
+ *
|
|
|
11dc0f |
+ * @param key the string used to get the bundle value, must not be null
|
|
|
11dc0f |
+ */
|
|
|
11dc0f |
+ public static String getFormattedString(String key, Object arg) {
|
|
|
11dc0f |
+ String format = null;
|
|
|
11dc0f |
+
|
|
|
11dc0f |
+ try {
|
|
|
11dc0f |
+ format = fgResourceBundle.getString(key);
|
|
|
11dc0f |
+ } catch (MissingResourceException e) {
|
|
|
11dc0f |
+ return "!" + key + "!"; //$NON-NLS-2$ //$NON-NLS-1$
|
|
|
11dc0f |
+ }
|
|
|
11dc0f |
+
|
|
|
11dc0f |
+ if (arg == null) {
|
|
|
11dc0f |
+ arg = ""; //$NON-NLS-1$
|
|
|
11dc0f |
+ }
|
|
|
11dc0f |
+
|
|
|
11dc0f |
+ return MessageFormat.format(format, new Object[] { arg });
|
|
|
11dc0f |
+ }
|
|
|
11dc0f |
+
|
|
|
11dc0f |
+ /**
|
|
|
11dc0f |
+ * Gets a string from the resource bundle and formats it with arguments
|
|
|
11dc0f |
+ */
|
|
|
11dc0f |
+ public static String getFormattedString(String key, String[] args) {
|
|
|
11dc0f |
+ return MessageFormat.format(fgResourceBundle.getString(key), args);
|
|
|
11dc0f |
+ }
|
|
|
11dc0f |
+
|
|
|
11dc0f |
+ public static String getString(String key) {
|
|
|
11dc0f |
+ try {
|
|
|
11dc0f |
+ return fgResourceBundle.getString(key);
|
|
|
11dc0f |
+ } catch (MissingResourceException e) {
|
|
|
11dc0f |
+ return "!" + key + "!"; //$NON-NLS-2$ //$NON-NLS-1$
|
|
|
11dc0f |
+ }
|
|
|
11dc0f |
+ }
|
|
|
11dc0f |
+}
|
|
|
11dc0f |
--- /dev/null 1970-01-01 01:00:00.000000000 +0100
|
|
|
11dc0f |
+++ eclipse.jdt.ui/org.eclipse.jdt.ui.tests/nls/pkg/Messages.properties 2004-11-12 14:38:06.000000000 +0000
|
|
|
11dc0f |
@@ -0,0 +1,15 @@
|
|
|
11dc0f |
+###############################################################################
|
|
|
11dc0f |
+# Copyright (c) 2000, 2004 IBM Corporation and others.
|
|
|
11dc0f |
+# All rights reserved. This program and the accompanying materials
|
|
|
11dc0f |
+# are made available under the terms of the Common Public License v1.0
|
|
|
11dc0f |
+# which accompanies this distribution, and is available at
|
|
|
11dc0f |
+# http://www.eclipse.org/legal/cpl-v10.html
|
|
|
11dc0f |
+#
|
|
|
11dc0f |
+# Contributors:
|
|
|
11dc0f |
+# IBM Corporation - initial API and implementation
|
|
|
11dc0f |
+###############################################################################
|
|
|
11dc0f |
+test= Hello World
|
|
|
11dc0f |
+duplicate= Duplicate 1
|
|
|
11dc0f |
+test.long.key= Hello World Long
|
|
|
11dc0f |
+duplicate= Duplicate 2
|
|
|
11dc0f |
+SearchResultView.removed_resource= <removed resource>
|
|
|
11dc0f |
--- eclipse.platform/ant/org.eclipse.ant.tests.core/build.properties.orig 2017-03-03 14:20:53.868573338 +0000
|
|
|
11dc0f |
+++ eclipse.platform/ant/org.eclipse.ant.tests.core/build.properties 2017-03-06 14:26:42.382365639 +0000
|
|
|
11dc0f |
@@ -23,6 +23,8 @@
|
|
|
11dc0f |
source.anttestscore.jar = test plugin/,\
|
|
|
11dc0f |
tests/
|
|
|
11dc0f |
source.lib/antTestsSupport.jar = test support/
|
|
|
11dc0f |
-jars.compile.order=anttestscore.jar,lib/antTestsSupport.jar
|
|
|
11dc0f |
+source.testlib/classpathOrdering1.jar = testlib_src/classpathOrdering1/
|
|
|
11dc0f |
+source.testlib/classpathOrdering2.jar = testlib_src/classpathOrdering2/
|
|
|
11dc0f |
+jars.compile.order=anttestscore.jar,lib/antTestsSupport.jar,testlib/classpathOrdering1.jar,testlib/classpathOrdering2.jar
|
|
|
11dc0f |
output.lib/antTestsSupport.jar = test_support_bin/
|
|
|
11dc0f |
output.anttestscore.jar = bin/
|
|
|
11dc0f |
--- /dev/null 2017-02-12 18:27:14.283389371 +0000
|
|
|
11dc0f |
+++ eclipse.platform/ant/org.eclipse.ant.tests.core/testlib_src/classpathOrdering1/ClasspathOrdering.java 2017-03-06 14:28:57.742879825 +0000
|
|
|
11dc0f |
@@ -0,0 +1,10 @@
|
|
|
11dc0f |
+import java.io.PrintStream;
|
|
|
11dc0f |
+
|
|
|
11dc0f |
+public class ClasspathOrdering
|
|
|
11dc0f |
+{
|
|
|
11dc0f |
+ public static void main(String[] args)
|
|
|
11dc0f |
+ {
|
|
|
11dc0f |
+ System.out.println("classpathOrdering1");
|
|
|
11dc0f |
+ }
|
|
|
11dc0f |
+}
|
|
|
11dc0f |
+
|
|
|
11dc0f |
--- /dev/null 2017-02-12 18:27:14.283389371 +0000
|
|
|
11dc0f |
+++ eclipse.platform/ant/org.eclipse.ant.tests.core/testlib_src/classpathOrdering2/ClasspathOrdering.java 2017-03-06 14:29:45.759352762 +0000
|
|
|
11dc0f |
@@ -0,0 +1,10 @@
|
|
|
11dc0f |
+import java.io.PrintStream;
|
|
|
11dc0f |
+
|
|
|
11dc0f |
+public class ClasspathOrdering
|
|
|
11dc0f |
+{
|
|
|
11dc0f |
+ public static void main(String[] args)
|
|
|
11dc0f |
+ {
|
|
|
11dc0f |
+ System.out.println("classpathOrdering2");
|
|
|
11dc0f |
+ }
|
|
|
11dc0f |
+}
|
|
|
11dc0f |
+
|
|
|
11dc0f |
--- eclipse.pde.build/org.eclipse.pde.build.tests/test.xml.orig 2017-04-28 11:49:47.046123546 +0100
|
|
|
11dc0f |
+++ eclipse.pde.build/org.eclipse.pde.build.tests/test.xml 2017-04-28 12:05:11.947521737 +0100
|
|
|
11dc0f |
@@ -156,13 +156,6 @@
|
|
|
11dc0f |
id="org.eclipse.jdt.source.feature.group"
|
|
|
11dc0f |
version="" />
|
|
|
11dc0f |
|
|
|
11dc0f |
- id="org.eclipse.rcp.configuration.feature.group"
|
|
|
11dc0f |
- version="" />
|
|
|
11dc0f |
-
|
|
|
11dc0f |
-
|
|
|
11dc0f |
- id="org.eclipse.equinox.executable"
|
|
|
11dc0f |
- version="" />
|
|
|
11dc0f |
-
|
|
|
11dc0f |
id="org.eclipse.e4.rcp.feature.group"
|
|
|
11dc0f |
version="" />
|
|
|
11dc0f |
|
|
|
11dc0f |
--- eclipse.jdt.core/org.eclipse.jdt.core.tests.builder/pom.xml.orig 2019-03-11 12:52:52.879124384 +0000
|
|
|
11dc0f |
+++ eclipse.jdt.core/org.eclipse.jdt.core.tests.builder/pom.xml 2019-03-11 12:54:16.445849939 +0000
|
|
|
11dc0f |
@@ -39,7 +39,22 @@
|
|
|
11dc0f |
</includes>
|
|
|
11dc0f |
<argLine>${tycho.surefire.argLine}</argLine>
|
|
|
11dc0f |
</configuration>
|
|
|
11dc0f |
- </plugin>
|
|
|
11dc0f |
+ </plugin>
|
|
|
11dc0f |
+ <plugin>
|
|
|
11dc0f |
+ <groupId>org.eclipse.tycho</groupId>
|
|
|
11dc0f |
+ <artifactId>target-platform-configuration</artifactId>
|
|
|
11dc0f |
+ <configuration>
|
|
|
11dc0f |
+ <dependency-resolution>
|
|
|
11dc0f |
+ <extraRequirements>
|
|
|
11dc0f |
+ <requirement>
|
|
|
11dc0f |
+ <type>eclipse-plugin</type>
|
|
|
11dc0f |
+ <id>org.eclipse.jdt.annotation</id>
|
|
|
11dc0f |
+ <versionRange>0.0.0</versionRange>
|
|
|
11dc0f |
+ </requirement>
|
|
|
11dc0f |
+ </extraRequirements>
|
|
|
11dc0f |
+ </dependency-resolution>
|
|
|
11dc0f |
+ </configuration>
|
|
|
11dc0f |
+ </plugin>
|
|
|
11dc0f |
</plugins>
|
|
|
11dc0f |
</build>
|
|
|
11dc0f |
|