Skip to content
Commits on Source (4)
Expand all Show whitespace changes
Inline Side-by-side
bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/pom.xml
View file @ 0eefe855
......@@ -14,7 +14,7 @@
<parent>
<artifactId>launcher-binary-parent</artifactId>
<groupId>org.eclipse.equinox.framework</groupId>
<version>4.11.0-SNAPSHOT</version>
<version>4.12.0-SNAPSHOT</version>
<relativePath>../../launcher-binary-parent</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
......
bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/pom.xml
View file @ 0eefe855
......@@ -14,7 +14,7 @@
<parent>
<artifactId>launcher-binary-parent</artifactId>
<groupId>org.eclipse.equinox.framework</groupId>
<version>4.11.0-SNAPSHOT</version>
<version>4.12.0-SNAPSHOT</version>
<relativePath>../../launcher-binary-parent</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
......
bundles/org.eclipse.equinox.launcher.gtk.linux.arm/pom.xml
View file @ 0eefe855
......@@ -14,7 +14,7 @@
<parent>
<artifactId>launcher-binary-parent</artifactId>
<groupId>org.eclipse.equinox.framework</groupId>
<version>4.11.0-SNAPSHOT</version>
<version>4.12.0-SNAPSHOT</version>
<relativePath>../../launcher-binary-parent</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
......
bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/pom.xml
View file @ 0eefe855
......@@ -14,7 +14,7 @@
<parent>
<artifactId>launcher-binary-parent</artifactId>
<groupId>org.eclipse.equinox.framework</groupId>
<version>4.11.0-SNAPSHOT</version>
<version>4.12.0-SNAPSHOT</version>
<relativePath>../../launcher-binary-parent</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
......
bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml
View file @ 0eefe855
......@@ -14,7 +14,7 @@
<parent>
<artifactId>launcher-binary-parent</artifactId>
<groupId>org.eclipse.equinox.framework</groupId>
<version>4.11.0-SNAPSHOT</version>
<version>4.12.0-SNAPSHOT</version>
<relativePath>../../launcher-binary-parent</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
......
bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml
View file @ 0eefe855
......@@ -14,7 +14,7 @@
<parent>
<artifactId>launcher-binary-parent</artifactId>
<groupId>org.eclipse.equinox.framework</groupId>
<version>4.11.0-SNAPSHOT</version>
<version>4.12.0-SNAPSHOT</version>
<relativePath>../../launcher-binary-parent</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
......
bundles/org.eclipse.equinox.launcher.gtk.linux.x86/pom.xml
View file @ 0eefe855
......@@ -14,7 +14,7 @@
<parent>
<artifactId>launcher-binary-parent</artifactId>
<groupId>org.eclipse.equinox.framework</groupId>
<version>4.11.0-SNAPSHOT</version>
<version>4.12.0-SNAPSHOT</version>
<relativePath>../../launcher-binary-parent</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
......
bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml
View file @ 0eefe855
......@@ -14,7 +14,7 @@
<parent>
<artifactId>launcher-binary-parent</artifactId>
<groupId>org.eclipse.equinox.framework</groupId>
<version>4.11.0-SNAPSHOT</version>
<version>4.12.0-SNAPSHOT</version>
<relativePath>../../launcher-binary-parent</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
......
bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml
View file @ 0eefe855
......@@ -14,7 +14,7 @@
<parent>
<artifactId>launcher-binary-parent</artifactId>
<groupId>org.eclipse.equinox.framework</groupId>
<version>4.11.0-SNAPSHOT</version>
<version>4.12.0-SNAPSHOT</version>
<relativePath>../../launcher-binary-parent</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
......
bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml
View file @ 0eefe855
......@@ -14,7 +14,7 @@
<parent>
<artifactId>launcher-binary-parent</artifactId>
<groupId>org.eclipse.equinox.framework</groupId>
<version>4.11.0-SNAPSHOT</version>
<version>4.12.0-SNAPSHOT</version>
<relativePath>../../launcher-binary-parent</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
......
bundles/org.eclipse.equinox.launcher/META-INF/MANIFEST.MF
View file @ 0eefe855
......@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.equinox.launcher;singleton:=true
Bundle-Version: 1.5.300.qualifier
Bundle-Version: 1.5.400.qualifier
Main-Class: org.eclipse.equinox.launcher.Main
Bundle-ClassPath: .
Bundle-Vendor: %providerName
......
bundles/org.eclipse.equinox.launcher/pom.xml
View file @ 0eefe855
......@@ -14,11 +14,11 @@
<parent>
<artifactId>rt.equinox.framework</artifactId>
<groupId>org.eclipse.equinox.framework</groupId>
<version>4.11.0-SNAPSHOT</version>
<version>4.12.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.launcher</artifactId>
<version>1.5.300-SNAPSHOT</version>
<version>1.5.400-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/WebStartMain.java
View file @ 0eefe855
......@@ -236,14 +236,11 @@ public class WebStartMain extends Main {
try {
nameField.setAccessible(true);
return (String) nameField.get(jarFile);
} catch (SecurityException e) {
} catch (SecurityException | IllegalArgumentException | IllegalAccessException e) {
// Don't have permissions, ignore
} catch (IllegalArgumentException e) {
// Shouldn't happen
} catch (IllegalAccessException e) {
// or
// Shouldn't happen
}
return null;
}
......
bundles/org.eclipse.osgi.compatibility.state/META-INF/MANIFEST.MF
View file @ 0eefe855
......@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.osgi.compatibility.state
Bundle-Version: 1.1.400.qualifier
Bundle-Version: 1.1.500.qualifier
ExtensionBundle-Activator: org.eclipse.osgi.compatibility.state.Activator
Fragment-Host: org.eclipse.osgi;bundle-version="3.12.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
......
bundles/org.eclipse.osgi.compatibility.state/pom.xml
View file @ 0eefe855
......@@ -14,11 +14,11 @@
<parent>
<artifactId>rt.equinox.framework</artifactId>
<groupId>org.eclipse.equinox.framework</groupId>
<version>4.11.0-SNAPSHOT</version>
<version>4.12.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.osgi</groupId>
<artifactId>org.eclipse.osgi.compatibility.state</artifactId>
<version>1.1.400-SNAPSHOT</version>
<version>1.1.500-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/BundleConstraint.java
View file @ 0eefe855
......@@ -23,6 +23,7 @@ public class BundleConstraint extends ResolverConstraint {
super(bundle, bundleConstraint);
}
@Override
boolean isOptional() {
if (constraint instanceof HostSpecification)
return false;
......
bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/GenericCapability.java
View file @ 0eefe855
......@@ -33,6 +33,7 @@ public class GenericCapability extends VersionSupplier {
effective = effectiveDirective == null || Constants.EFFECTIVE_RESOLVE.equals(effectiveDirective) || (Constants.EFFECTIVE_ACTIVE.equals(effectiveDirective) && developmentMode);
}
@Override
public BundleDescription getBundleDescription() {
return getBaseDescription().getSupplier();
}
......@@ -41,6 +42,7 @@ public class GenericCapability extends VersionSupplier {
return (GenericDescription) getBaseDescription();
}
@Override
public ResolverBundle getResolverBundle() {
return resolverBundle;
}
......
bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/GenericConstraint.java
View file @ 0eefe855
......@@ -30,6 +30,7 @@ public class GenericConstraint extends ResolverConstraint {
multiple = (constraint.getResolution() & GenericSpecification.RESOLUTION_MULTIPLE) != 0;
}
@Override
boolean isOptional() {
return (((GenericSpecification) constraint).getResolution() & GenericSpecification.RESOLUTION_OPTIONAL) != 0;
}
......
bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverBundle.java
View file @ 0eefe855
......@@ -281,10 +281,12 @@ public class ResolverBundle extends VersionSupplier implements Comparable<Resolv
return null;
}
@Override
public BundleDescription getBundleDescription() {
return (BundleDescription) getBaseDescription();
}
@Override
public ResolverBundle getResolverBundle() {
return this;
}
......@@ -299,6 +301,7 @@ public class ResolverBundle extends VersionSupplier implements Comparable<Resolv
return null;
}
@Override
public String toString() {
return "[" + getBundleDescription() + "]"; //$NON-NLS-1$ //$NON-NLS-2$
}
......@@ -671,6 +674,7 @@ public class ResolverBundle extends VersionSupplier implements Comparable<Resolv
* If the other BSN is null then -1 is returned
* otherwise String.compareTo is used
*/
@Override
public int compareTo(ResolverBundle o) {
String bsn = getName();
String otherBsn = o.getName();
......