Skip to content
This repository has been archived by the owner on Dec 20, 2022. It is now read-only.

Commit

Permalink
Eclipse Upgrade to 4.13
Browse files Browse the repository at this point in the history
  • Loading branch information
@StefanFranzWeiser
StefanFranzWeiser committed Oct 16, 2019
1 parent 8923c03 commit aa9feaa
Show file tree
Hide file tree
Showing 4 changed files with 59 additions and 55 deletions.
2 changes: 1 addition & 1 deletion bundles/org.aposin.mergeprocessor/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<properties>
<version-commons-io>2.6</version-commons-io>
<version-commons-lang3>3.9</version-commons-lang3>
<version-commons-collections4>4.3</version-commons-collections4>
<version-commons-collections4>4.4</version-commons-collections4>
<version-h2>1.4.199</version-h2>
</properties>

Expand Down
12 changes: 0 additions & 12 deletions bundles/org.aposin.mergeprocessor/src/org/aposin/mergeprocessor/application/Activator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package org.aposin.mergeprocessor.application;

import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;

Expand Down Expand Up @@ -58,15 +57,4 @@ public void stop(BundleContext context) throws Exception {
public static Activator getDefault() {
return plugin;
}

/**
* Returns an image descriptor for the image file at the given plug-in relative
* path
*
* @param path the path
* @return the image descriptor
*/
public static ImageDescriptor getImageDescriptor(String path) {
return imageDescriptorFromPlugin(PLUGIN_ID, path);
}
}
16 changes: 16 additions & 0 deletions features/org.aposin.mergeprocessor.thirdparty.feature/feature.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,20 @@
version="0.0.0"
unpack="false"/>

<!-- After Eclipse upgrade 4.13 jface.text is missing in the product. This may be fixed in the future.
see https://bugs.eclipse.org/bugs/show_bug.cgi?id=552134-->
<plugin
id="org.eclipse.jface.text"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="org.eclipse.text"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

</feature>
84 changes: 42 additions & 42 deletions ....aposin.mergeprocessor.targetdefinition/org.aposin.mergeprocessor.targetdefinition.target
View file
Original file line number Diff line number Diff line change
@@ -1,43 +1,43 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="MergeProcessor" sequenceNumber="146">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.e4.rcp.feature.group" version="1.6.400.v20190305-0602"/>
<unit id="org.eclipse.e4.rcp.source.feature.group" version="1.6.400.v20190305-0602"/>
<unit id="org.eclipse.emf.common.feature.group" version="2.15.0.v20181220-0846"/>
<unit id="org.eclipse.emf.ecore.feature.group" version="2.17.0.v20190116-0940"/>
<unit id="org.eclipse.equinox.executable.feature.group" version="3.8.300.v20190213-1655"/>
<unit id="org.eclipse.platform.feature.group" version="4.11.0.v20190307-0500"/>
<unit id="org.eclipse.platform.sdk" version="4.11.0.I20190307-0500"/>
<unit id="org.eclipse.platform.source.feature.group" version="4.11.0.v20190307-0500"/>
<unit id="org.eclipse.rcp.feature.group" version="4.11.0.v20190307-0500"/>
<unit id="org.eclipse.rcp.source.feature.group" version="4.11.0.v20190307-0500"/>
<repository location="https://download.eclipse.org/eclipse/updates/4.11/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
<unit id="com.google.guava.source" version="21.0.0.v20170206-1425"/>
<unit id="javax.xml.bind" version="2.2.0.v201105210648"/>
<unit id="org.junit.jupiter.api" version="5.4.0.v20190212-2109"/>
<unit id="org.junit.jupiter.api.source" version="5.4.0.v20190212-2109"/>
<unit id="org.junit.jupiter.engine" version="5.4.0.v20190212-2109"/>
<unit id="org.junit.jupiter.engine.source" version="5.4.0.v20190212-2109"/>
<unit id="org.junit.platform.commons" version="1.4.0.v20190212-2109"/>
<unit id="org.junit.platform.commons.source" version="1.4.0.v20190212-2109"/>
<unit id="org.junit.platform.engine" version="1.4.0.v20190212-2109"/>
<unit id="org.junit.platform.engine.source" version="1.4.0.v20190212-2109"/>
<unit id="org.junit.platform.launcher" version="1.4.0.v20190212-2109"/>
<unit id="org.junit.platform.launcher.source" version="1.4.0.v20190212-2109"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20190226160451/repository/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.jgit.feature.group" version="5.3.0.201903130848-r"/>
<unit id="org.eclipse.jgit.source.feature.group" version="5.3.0.201903130848-r"/>
<repository location="https://download.eclipse.org/egit/updates-5.3/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.tigris.subversion.subclipse.feature.group" version="4.2.4.201804261743"/>
<repository location="https://dl.bintray.com/subclipse/releases/subclipse/4.2.4/"/>
</location>
</locations>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="MergeProcessor" sequenceNumber="146">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.tigris.subversion.subclipse.feature.group" version="4.2.4.201804261743"/>
<repository location="https://dl.bintray.com/subclipse/releases/subclipse/4.2.4/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.e4.rcp.feature.group" version="1.6.600.v20190907-0426"/>
<unit id="org.eclipse.e4.rcp.source.feature.group" version="1.6.600.v20190907-0426"/>
<unit id="org.eclipse.emf.common.feature.group" version="2.16.0.v20190625-1131"/>
<unit id="org.eclipse.emf.ecore.feature.group" version="2.18.0.v20190528-0845"/>
<unit id="org.eclipse.equinox.executable.feature.group" version="3.8.500.v20190907-0428"/>
<unit id="org.eclipse.platform.ide" version="4.13.0.I20190916-1045"/>
<unit id="org.eclipse.platform.sdk" version="4.13.0.I20190916-1045"/>
<unit id="org.eclipse.rcp.feature.group" version="4.13.0.v20190916-1045"/>
<unit id="org.eclipse.rcp.source.feature.group" version="4.13.0.v20190916-1045"/>
<repository location="https://download.eclipse.org/eclipse/updates/4.13/"/>
<unit id="org.eclipse.platform.source.feature.group" version="4.13.0.v20190916-1323"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.jgit.feature.group" version="5.5.1.201910021850-r"/>
<unit id="org.eclipse.jgit.source.feature.group" version="5.5.1.201910021850-r"/>
<repository location="https://download.eclipse.org/egit/updates-5.5.1/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.guava" version="27.1.0.v20190517-1946"/>
<unit id="com.google.guava.source" version="27.1.0.v20190517-1946"/>
<unit id="javax.xml.bind" version="2.2.0.v201105210648"/>
<unit id="org.junit.jupiter.api" version="5.5.1.v20190826-0900"/>
<unit id="org.junit.jupiter.api.source" version="5.5.1.v20190826-0900"/>
<unit id="org.junit.jupiter.engine" version="5.5.1.v20190826-0900"/>
<unit id="org.junit.jupiter.engine.source" version="5.5.1.v20190826-0900"/>
<unit id="org.junit.platform.commons" version="1.5.1.v20190826-0900"/>
<unit id="org.junit.platform.commons.source" version="1.5.1.v20190826-0900"/>
<unit id="org.junit.platform.engine" version="1.5.1.v20190826-0900"/>
<unit id="org.junit.platform.engine.source" version="1.5.1.v20190826-0900"/>
<unit id="org.junit.platform.launcher" version="1.5.1.v20190826-0900"/>
<unit id="org.junit.platform.launcher.source" version="1.5.1.v20190826-0900"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20190827152740/repository"/>
</location>
</locations>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
</target>

0 comments on commit aa9feaa

Please sign in to comment.