diff options
Diffstat (limited to 'java/eclipse/files')
-rw-r--r-- | java/eclipse/files/patch-eclipse-platform-parent | 18 | ||||
-rw-r--r-- | java/eclipse/files/patch-eclipse.pde.ui | 4 | ||||
-rw-r--r-- | java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder | 51 | ||||
-rw-r--r-- | java/eclipse/files/patch-eclipse.platform.swt.binaries | 12 | ||||
-rw-r--r-- | java/eclipse/files/patch-eclipse.platform.ua | 2 | ||||
-rw-r--r-- | java/eclipse/files/patch-rt.equinox.bundles | 2 | ||||
-rw-r--r-- | java/eclipse/files/patch-rt.equinox.framework | 14 |
7 files changed, 26 insertions, 77 deletions
diff --git a/java/eclipse/files/patch-eclipse-platform-parent b/java/eclipse/files/patch-eclipse-platform-parent index 674913b6dd17..5a327947c269 100644 --- a/java/eclipse/files/patch-eclipse-platform-parent +++ b/java/eclipse/files/patch-eclipse-platform-parent @@ -1,19 +1,19 @@ diff -ru eclipse-platform-parent/pom.xml eclipse-platform-parent/pom.xml --- eclipse-platform-parent/pom.xml 0000-00-00 00:00:00.000000000 +0000 +++ eclipse-platform-parent/pom.xml 0000-00-00 00:00:00.000000000 +0000 -@@ -89,9 +89,9 @@ +@@ -80,9 +80,9 @@ 'eclipiserun-repo' repository, such as for computing .api-descriptions and generating API Tools reports. --> -- <eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.15-I-builds/</eclipserun-repo> -+ <eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.15/</eclipserun-repo> +- <eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.16-I-builds/</eclipserun-repo> ++ <eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.16/</eclipserun-repo> -- <comparator.repo>https://download.eclipse.org/eclipse/updates/4.15-I-builds</comparator.repo> -+ <comparator.repo>https://download.eclipse.org/eclipse/updates/4.15</comparator.repo> +- <comparator.repo>https://download.eclipse.org/eclipse/updates/4.16-I-builds</comparator.repo> ++ <comparator.repo>https://download.eclipse.org/eclipse/updates/4.16</comparator.repo> <!-- NOTE: this EMF and ECF URL must match exactly what is in the eclipse-sdk-prereqs.target file. -@@ -263,14 +263,14 @@ +@@ -254,14 +254,14 @@ </target> <environments> <environment> @@ -32,12 +32,12 @@ diff -ru eclipse-platform-parent/pom.xml eclipse-platform-parent/pom.xml </environment> <environment> <os>win32</os> -@@ -635,7 +635,7 @@ +@@ -626,7 +626,7 @@ For maintenance streams should always be "M-builds". Ideally, this value would be provided by the environment, see bug 489789. --> -- <eclipse-p2-repo.url>https://download.eclipse.org/eclipse/updates/4.15-I-builds</eclipse-p2-repo.url> -+ <eclipse-p2-repo.url>https://download.eclipse.org/eclipse/updates/4.15</eclipse-p2-repo.url> +- <eclipse-p2-repo.url>https://download.eclipse.org/eclipse/updates/4.16-I-builds</eclipse-p2-repo.url> ++ <eclipse-p2-repo.url>https://download.eclipse.org/eclipse/updates/4.16</eclipse-p2-repo.url> </properties> <repositories> <repository> diff --git a/java/eclipse/files/patch-eclipse.pde.ui b/java/eclipse/files/patch-eclipse.pde.ui index 89a9278f1b7c..47fcce88f175 100644 --- a/java/eclipse/files/patch-eclipse.pde.ui +++ b/java/eclipse/files/patch-eclipse.pde.ui @@ -1,7 +1,7 @@ diff -ru eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/$pluginId$.product eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/$pluginId$.product --- eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/$pluginId$.product 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/$pluginId$.product 0000-00-00 00:00:00.000000000 +0000 -@@ -81,8 +81,8 @@ +@@ -80,8 +80,8 @@ <plugin id="org.eclipse.osgi.util"/> <plugin id="org.eclipse.swt"/> <plugin id="org.eclipse.swt.cocoa.macosx.x86_64" fragment="true"/> @@ -10,5 +10,5 @@ diff -ru eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Applicat + <plugin id="org.eclipse.swt.gtk.freebsd.powerpc64" fragment="true"/> + <plugin id="org.eclipse.swt.gtk.freebsd.amd64" fragment="true"/> <plugin id="org.eclipse.swt.win32.win32.x86_64" fragment="true"/> + <plugin id="org.eclipse.urischeme"/> <plugin id="org.w3c.css.sac"/> - <plugin id="org.w3c.dom.events"/> diff --git a/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder b/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder index f1174d3f2585..88add425c2be 100644 --- a/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder +++ b/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder @@ -1,22 +1,3 @@ -diff -ru eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml ---- eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml 0000-00-00 00:00:00.000000000 +0000 -@@ -111,7 +111,7 @@ - --> - <property - name="platformFile" -- value="eclipse-platform-${eclispeBaseLabel}-linux-gtk-x86_64.tar.gz" /> -+ value="eclipse-platform-${eclispeBaseLabel}-freebsd-gtk-amd64.tar.gz" /> - - <!-- the following setting is just to make sure we have a reasonable "fallback" value, such as when - using this script on Hudson to do "clean up" of repositories. Should change it to "well known" version, -@@ -308,4 +308,4 @@ - file="${settingsDir}/org.eclipse.core.net.prefs" /> - </target> - --</project> -\ No newline at end of file -+</project> diff -ru eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml --- eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml 0000-00-00 00:00:00.000000000 +0000 @@ -86,38 +67,6 @@ diff -ru eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml </environment> <environment> <os>win32</os> -diff -ru eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties ---- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties 0000-00-00 00:00:00.000000000 +0000 -@@ -1,11 +1,11 @@ - #Properties required by equinox p2 tests - # Version from .../eclipse-junit-tests/src/main/resources/ - --org.eclipse.equinox.p2.reconciler.tests.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-${buildId}-linux-gtk-x86_64.tar.gz -+org.eclipse.equinox.p2.reconciler.tests.platform.archive.freebsd-amd64=\${basedir}/eclipse-platform-${buildId}-freebsd-gtk-amd64.tar.gz - org.eclipse.equinox.p2.reconciler.tests.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-${buildId}-win32-x86_64.zip - org.eclipse.equinox.p2.reconciler.tests.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-${buildId}-macosx-cocoa-x86_64.tar.gz - --org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.14-linux-gtk-x86_64.tar.gz -+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.freebsd-amd64=\${basedir}/eclipse-platform-4.14-freebsd-gtk-amd64.tar.gz - org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.14-win32-x86_64.zip - org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.14-macosx-cocoa-x86_64.tar.gz - -diff -ru eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh ---- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh 0000-00-00 00:00:00.000000000 +0000 -+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh 0000-00-00 00:00:00.000000000 +0000 -@@ -7,9 +7,9 @@ - - - mkdir -p workarea/${buildId}/eclipse-testing --cp /home/files/buildzips/oxygen/R/R-4.14-201912100610/eclipse-platform-4.14-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/ -+cp /home/files/buildzips/oxygen/R/R-4.14-201912100610/eclipse-platform-4.14-freebsd-gtk-amd64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/ - --cp /home/files/buildzips/oxygen/R/R-4.14-201912100610/eclipse-SDK-4.14-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/ -+cp /home/files/buildzips/oxygen/R/R-4.14-201912100610/eclipse-SDK-4.14-freebsd-gtk-amd64.tar.gz ./workarea/${buildId}/eclipse-testing/ - - cp eclipse-junit-tests-${buildId}.zip workarea/${buildId}/eclipse-testing/ - diff -ru eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml --- eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml 0000-00-00 00:00:00.000000000 +0000 diff --git a/java/eclipse/files/patch-eclipse.platform.swt.binaries b/java/eclipse/files/patch-eclipse.platform.swt.binaries index 24771f048882..84ffbaee5e90 100644 --- a/java/eclipse/files/patch-eclipse.platform.swt.binaries +++ b/java/eclipse/files/patch-eclipse.platform.swt.binaries @@ -7,7 +7,7 @@ diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch Bundle-Vendor: %providerName -Bundle-SymbolicName: org.eclipse.swt.gtk.linux.aarch64; singleton:=true +Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.aarch64; singleton:=true - Bundle-Version: 3.109.0.qualifier + Bundle-Version: 3.114.100.qualifier Bundle-ManifestVersion: 2 Bundle-Localization: fragment @@ -26,8 +26,8 @@ @@ -45,7 +45,7 @@ diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch <groupId>org.eclipse.swt</groupId> - <artifactId>org.eclipse.swt.gtk.linux.aarch64</artifactId> + <artifactId>org.eclipse.swt.gtk.freebsd.aarch64</artifactId> - <version>3.109.0-SNAPSHOT</version> + <version>3.114.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <properties> @@ -83,7 +83,7 @@ diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64 Bundle-Vendor: %providerName -Bundle-SymbolicName: org.eclipse.swt.gtk.linux.x86_64; singleton:=true +Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.amd64; singleton:=true - Bundle-Version: 3.114.0.qualifier + Bundle-Version: 3.114.100.qualifier Bundle-ManifestVersion: 2 Bundle-Localization: fragment @@ -26,8 +26,8 @@ @@ -141,7 +141,7 @@ diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64 <groupId>org.eclipse.swt</groupId> - <artifactId>org.eclipse.swt.gtk.linux.x86_64</artifactId> + <artifactId>org.eclipse.swt.gtk.freebsd.amd64</artifactId> - <version>3.114.0-SNAPSHOT</version> + <version>3.114.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <properties> @@ -171,7 +171,7 @@ diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.power Bundle-Vendor: %providerName -Bundle-SymbolicName: org.eclipse.swt.gtk.linux.ppc64le;singleton:=true +Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.powerpc64;singleton:=true - Bundle-Version: 3.114.0.qualifier + Bundle-Version: 3.114.100.qualifier Bundle-ManifestVersion: 2 Bundle-Localization: fragment @@ -26,8 +26,8 @@ @@ -212,7 +212,7 @@ diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.power <groupId>org.eclipse.swt</groupId> - <artifactId>org.eclipse.swt.gtk.linux.ppc64le</artifactId> + <artifactId>org.eclipse.swt.gtk.freebsd.powerpc64</artifactId> - <version>3.114.0-SNAPSHOT</version> + <version>3.114.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <properties> diff --git a/java/eclipse/files/patch-eclipse.platform.ua b/java/eclipse/files/patch-eclipse.platform.ua index 8254318a47c3..2c773ef28225 100644 --- a/java/eclipse/files/patch-eclipse.platform.ua +++ b/java/eclipse/files/patch-eclipse.platform.ua @@ -43,7 +43,7 @@ diff -ru eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal diff -ru eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserManager.java eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserManager.java --- eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserManager.java 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserManager.java 0000-00-00 00:00:00.000000000 +0000 -@@ -102,6 +102,7 @@ +@@ -103,6 +103,7 @@ setDefaultBrowserID(BROWSER_ID_SYSTEM); } else if (Constants.OS_AIX.equalsIgnoreCase(os) || (Constants.OS_HPUX.equalsIgnoreCase(os)) diff --git a/java/eclipse/files/patch-rt.equinox.bundles b/java/eclipse/files/patch-rt.equinox.bundles index af6a5bbaad4b..83e3118cbced 100644 --- a/java/eclipse/files/patch-rt.equinox.bundles +++ b/java/eclipse/files/patch-rt.equinox.bundles @@ -162,7 +162,7 @@ diff -ru rt.equinox.bundles/features/org.eclipse.equinox.core.sdk/feature.xml rt diff -ru rt.equinox.bundles/pom.xml rt.equinox.bundles/pom.xml --- rt.equinox.bundles/pom.xml 0000-00-00 00:00:00.000000000 +0000 +++ rt.equinox.bundles/pom.xml 0000-00-00 00:00:00.000000000 +0000 -@@ -89,7 +89,7 @@ +@@ -84,7 +84,7 @@ <module>bundles/org.eclipse.equinox.security</module> <module>bundles/org.eclipse.equinox.security.macosx</module> <module>bundles/org.eclipse.equinox.security.win32.x86_64</module> diff --git a/java/eclipse/files/patch-rt.equinox.framework b/java/eclipse/files/patch-rt.equinox.framework index eaeb865b26ae..bf92c27a2f01 100644 --- a/java/eclipse/files/patch-rt.equinox.framework +++ b/java/eclipse/files/patch-rt.equinox.framework @@ -7,8 +7,8 @@ diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.a Bundle-Vendor: %providerName -Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.aarch64;singleton:=true +Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.aarch64;singleton:=true - Bundle-Version: 1.1.1100.qualifier - Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.5.0)" + Bundle-Version: 1.1.1200.qualifier + Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.6.0)" -Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=aarch64)) -Bundle-Localization: launcher.gtk.linux.aarch64 +Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=aarch64)) @@ -23,7 +23,7 @@ diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.a <groupId>org.eclipse.equinox</groupId> - <artifactId>org.eclipse.equinox.launcher.gtk.linux.aarch64</artifactId> + <artifactId>org.eclipse.equinox.launcher.gtk.freebsd.aarch64</artifactId> - <version>1.1.1100-SNAPSHOT</version> + <version>1.1.1200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <properties> @@ -52,7 +52,7 @@ diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.a Bundle-Vendor: %providerName -Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.x86_64;singleton:=true +Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.amd64;singleton:=true - Bundle-Version: 1.1.1100.qualifier + Bundle-Version: 1.1.1200.qualifier Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.6.0)" -Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86_64)) -Bundle-Localization: launcher.gtk.linux.x86_64 @@ -78,7 +78,7 @@ diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.a <groupId>org.eclipse.equinox</groupId> - <artifactId>org.eclipse.equinox.launcher.gtk.linux.x86_64</artifactId> + <artifactId>org.eclipse.equinox.launcher.gtk.freebsd.amd64</artifactId> - <version>1.1.1100-SNAPSHOT</version> + <version>1.1.1200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <properties> @@ -110,7 +110,7 @@ diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.p Bundle-Vendor: %providerName -Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.ppc64le;singleton:=true +Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.powerpc64;singleton:=true - Bundle-Version: 1.1.1100.qualifier + Bundle-Version: 1.1.1200.qualifier Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.6.0)" -Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=ppc64le)) -Bundle-Localization: launcher.gtk.linux.ppc64le @@ -126,7 +126,7 @@ diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.p <groupId>org.eclipse.equinox</groupId> - <artifactId>org.eclipse.equinox.launcher.gtk.linux.ppc64le</artifactId> + <artifactId>org.eclipse.equinox.launcher.gtk.freebsd.powerpc64</artifactId> - <version>1.1.1100-SNAPSHOT</version> + <version>1.1.1200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <properties> |