Skip to content
Commits on Source (3)
......@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
<version>4.11.0-SNAPSHOT</version>
<version>4.12.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
......
......@@ -4,7 +4,7 @@
<parent>
<artifactId>org.eclipse.equinox.p2.tests-parent</artifactId>
<groupId>org.eclipse</groupId>
<version>4.11.0-SNAPSHOT</version>
<version>4.12.0-SNAPSHOT</version>
<relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2.tests-parent</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
......
......@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.equinox.frameworkadmin;singleton:=true
Bundle-Version: 2.1.200.qualifier
Bundle-Version: 2.1.300.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Import-Package: org.eclipse.osgi.service.pluginconversion;version="1.0.0",
......
......@@ -4,11 +4,11 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
<version>4.11.0-SNAPSHOT</version>
<version>4.12.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.frameworkadmin</artifactId>
<version>2.1.200-SNAPSHOT</version>
<version>2.1.300-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
......@@ -192,9 +192,10 @@ public class BundleInfo {
}
/**
* Set the bundle id
* Set the bundle id.
*
* @param bundleId
* The bundle id.
*/
public void setBundleId(long bundleId) {
this.bundleId = bundleId;
......@@ -215,6 +216,7 @@ public class BundleInfo {
* Set the location for this bundle.
*
* @param location
* The location of the bundle.
*/
public void setLocation(URI location) {
this.location = location;
......@@ -224,6 +226,7 @@ public class BundleInfo {
* Set the manifest for this bundle
*
* @param manifest
* The manifest.
*/
public void setManifest(String manifest) {
this.manifest = manifest;
......@@ -233,6 +236,7 @@ public class BundleInfo {
* Set whether or not this bundle should be started
*
* @param markedAsStarted
* Whether the bundle should be started.
*/
public void setMarkedAsStarted(boolean markedAsStarted) {
this.markedAsStarted = markedAsStarted;
......@@ -242,6 +246,7 @@ public class BundleInfo {
* Set whether or not the bundle is resolved
*
* @param resolved
* If the bundle is resolved or not.
*/
public void setResolved(boolean resolved) {
this.resolved = resolved;
......@@ -251,7 +256,7 @@ public class BundleInfo {
* Set the start level.
*
* @param level
* if a value < 0 is passed, the start level will be set to
* if a value &lt; 0 is passed, the start level will be set to
* {@link #NO_LEVEL}
*/
public void setStartLevel(int level) {
......@@ -262,6 +267,7 @@ public class BundleInfo {
* Set the Bundle-SymbolicName
*
* @param symbolicName
* The Bundle-SymbolicName.
*/
public void setSymbolicName(String symbolicName) {
this.symbolicName = symbolicName;
......@@ -271,6 +277,7 @@ public class BundleInfo {
* Set the version, should be a valid {@link Version} string
*
* @param value
* The version. A valid {@link Version} string.
*/
public void setVersion(String value) {
if (value == null)
......@@ -283,6 +290,7 @@ public class BundleInfo {
* Set the host if this bundle is a fragment
*
* @param fragmentHost
* The host for this fragment.
*/
public void setFragmentHost(String fragmentHost) {
this.fragmentHost = fragmentHost;
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
<version>4.11.0-SNAPSHOT</version>
<version>4.12.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
<version>4.11.0-SNAPSHOT</version>
<version>4.12.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
......
......@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.equinox.p2.artifact.repository;singleton:=true
Bundle-Version: 1.3.0.qualifier
Bundle-Version: 1.3.100.qualifier
Bundle-Activator: org.eclipse.equinox.internal.p2.artifact.repository.Activator
Bundle-Vendor: %providerName
Bundle-Localization: plugin
......
......@@ -4,11 +4,11 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
<version>4.11.0-SNAPSHOT</version>
<version>4.12.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.p2.artifact.repository</artifactId>
<version>1.3.0-SNAPSHOT</version>
<version>1.3.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
......@@ -31,7 +31,6 @@ import org.eclipse.osgi.util.NLS;
public class ChecksumUtilities {
private static final String ARTIFACT_CHECKSUMS_POINT = "org.eclipse.equinox.p2.artifact.repository.artifactChecksums"; //$NON-NLS-1$
private static final String MD5_MESSAGE_DIGEST = "MD5"; //$NON-NLS-1$
/**
* Instances of checksum verifiers applicable for the artifact descriptor
......@@ -96,12 +95,6 @@ public class ChecksumUtilities {
checksum.ifPresent(c -> checksums.put(id, c));
}
boolean doNotSkipMd5 = !checksumsToSkip.contains(ChecksumHelper.MD5);
if (doNotSkipMd5) {
Optional<String> md5 = calculateChecksum(pathOnDisk, status, ChecksumHelper.MD5, MD5_MESSAGE_DIGEST);
md5.ifPresent(c -> checksums.put(ChecksumHelper.MD5, c));
}
return status;
}
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
<version>4.11.0-SNAPSHOT</version>
<version>4.12.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
<version>4.11.0-SNAPSHOT</version>
<version>4.12.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
<version>4.11.0-SNAPSHOT</version>
<version>4.12.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
<version>4.11.0-SNAPSHOT</version>
<version>4.12.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
<version>4.11.0-SNAPSHOT</version>
<version>4.12.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
......
......@@ -14,7 +14,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
<version>4.11.0-SNAPSHOT</version>
<version>4.12.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
<version>4.11.0-SNAPSHOT</version>
<version>4.12.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
......
......@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.equinox.p2.engine;singleton:=true
Bundle-Version: 2.6.200.qualifier
Bundle-Version: 2.6.300.qualifier
Bundle-Activator: org.eclipse.equinox.internal.p2.engine.EngineActivator
Bundle-Vendor: %providerName
Bundle-Localization: plugin
......
......@@ -4,11 +4,11 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
<version>4.11.0-SNAPSHOT</version>
<version>4.12.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.p2.engine</artifactId>
<version>2.6.200-SNAPSHOT</version>
<version>2.6.300-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
......@@ -173,7 +173,7 @@ public interface IProfile extends IQueryable<IInstallableUnit> {
public static final String STATE_SHARED_INSTALL_VALUE_NEW = "new"; //$NON-NLS-1$
/**
* Profile property constant for additional parameters of the downloading stats(e.g., package=jee&os=linux).
* Profile property constant for additional parameters of the downloading stats(e.g., package=jee&amp;os=linux).
* @since 2.2
*/
public static final String PROP_STATS_PARAMETERS = "org.eclipse.equinox.p2.stats.parameters"; //$NON-NLS-1$
......@@ -230,7 +230,7 @@ public interface IProfile extends IQueryable<IInstallableUnit> {
* Returns the installable units in this profile that match the given query. In a shared
* install, this will include both the installable units in the shared base location, and in
* the current user's private install area.
* @param query
* @param query The query to use for matching.
* @param monitor a progress monitor, or <code>null</code> if progress
* reporting is not desired
* @return The installable units that match the given query
......