diff options
14 files changed, 71 insertions, 29 deletions
diff --git a/bundles/org.eclipse.equinox.p2.director/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.director/META-INF/MANIFEST.MF index f9d9aae1a..6a44932cf 100644 --- a/bundles/org.eclipse.equinox.p2.director/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.director/META-INF/MANIFEST.MF @@ -27,9 +27,7 @@ Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.3.0,4.0.0)", org.eclipse.equinox.p2.metadata;bundle-version="[2.0.0,3.0.0)", org.sat4j.pb;bundle-version="[2.3.3,3.0.0)", org.sat4j.core;bundle-version="[2.3.3,3.0.0)" -Bundle-RequiredExecutionEnvironment: J2SE-1.5, - J2SE-1.4, - CDC-1.1/Foundation-1.1 +Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ActivationPolicy: lazy Service-Component: OSGI-INF/director.xml, OSGI-INF/planner.xml Import-Package: org.eclipse.equinox.internal.p2.core.helpers, diff --git a/bundles/org.eclipse.equinox.p2.metadata/.settings/.api_filters b/bundles/org.eclipse.equinox.p2.metadata/.settings/.api_filters index 088788964..79d7d975c 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/.settings/.api_filters +++ b/bundles/org.eclipse.equinox.p2.metadata/.settings/.api_filters @@ -7,6 +7,28 @@ <message_argument value="2.1.0"/>
</message_arguments>
</filter>
+ <filter id="923795461">
+ <message_arguments>
+ <message_argument value="2.2.0"/>
+ <message_argument value="2.1.0"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="src/org/eclipse/equinox/p2/metadata/IInstallableUnitPatch.java" type="org.eclipse.equinox.p2.metadata.IInstallableUnitPatch">
+ <filter comment="API tools can't handle @noreference methods" id="1211105284">
+ <message_arguments>
+ <message_argument value="getApplicabilityScope()"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="src/org/eclipse/equinox/p2/metadata/IRequirement.java" type="org.eclipse.equinox.p2.metadata.IRequirement">
+ <filter comment="API tools can't handle @noreference methods" id="1209008130">
+ <message_arguments>
+ <message_argument value="2.0"/>
+ <message_argument value="2.2"/>
+ <message_argument value="getFilter()"/>
+ </message_arguments>
+ </filter>
</resource>
<resource path="src/org/eclipse/equinox/p2/query/CompoundQueryable.java" type="org.eclipse.equinox.p2.query.CompoundQueryable">
<filter id="576720909">
diff --git a/bundles/org.eclipse.equinox.p2.metadata/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.equinox.p2.metadata/.settings/org.eclipse.jdt.core.prefs index 1ffc4aa80..c3ef81970 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/org.eclipse.equinox.p2.metadata/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,3 @@ -#Mon Dec 21 22:17:52 CET 2009 eclipse.preferences.version=1 org.eclipse.jdt.core.builder.cleanOutputFolder=clean org.eclipse.jdt.core.builder.duplicateResourceTask=warning @@ -9,7 +8,7 @@ org.eclipse.jdt.core.circularClasspath=error org.eclipse.jdt.core.classpath.exclusionPatterns=enabled org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=jsr14 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.debug.lineNumber=generate diff --git a/bundles/org.eclipse.equinox.p2.metadata/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.metadata/META-INF/MANIFEST.MF index a4cd29957..292423847 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.metadata/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.equinox.p2.metadata;singleton:=true -Bundle-Version: 2.1.100.qualifier +Bundle-Version: 2.2.0.qualifier Bundle-Activator: org.eclipse.equinox.internal.p2.metadata.MetadataActivator Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -87,6 +87,4 @@ Import-Package: org.eclipse.osgi.service.localization;version="1.0.0", org.eclipse.osgi.util, org.osgi.framework;version="1.6.0" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5, - J2SE-1.4, - CDC-1.1/Foundation-1.1 +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/bundles/org.eclipse.equinox.p2.metadata/pom.xml b/bundles/org.eclipse.equinox.p2.metadata/pom.xml index 48b4f89a3..8f004c2a5 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/pom.xml +++ b/bundles/org.eclipse.equinox.p2.metadata/pom.xml @@ -9,6 +9,6 @@ </parent> <groupId>org.eclipse.equinox</groupId> <artifactId>org.eclipse.equinox.p2.metadata</artifactId> - <version>2.1.100-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.equinox.p2.operations/.settings/.api_filters b/bundles/org.eclipse.equinox.p2.operations/.settings/.api_filters index 056afbd99..0245801b4 100644 --- a/bundles/org.eclipse.equinox.p2.operations/.settings/.api_filters +++ b/bundles/org.eclipse.equinox.p2.operations/.settings/.api_filters @@ -1,11 +1,19 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<component id="org.eclipse.equinox.p2.operations" version="2"> - <resource path="src/org/eclipse/equinox/p2/operations/ProfileChangeOperation.java" type="org.eclipse.equinox.p2.operations.ProfileChangeOperation"> - <filter id="338792546"> - <message_arguments> - <message_argument value="org.eclipse.equinox.p2.operations.ProfileChangeOperation"/> - <message_argument value="getProfileChangeRequest()"/> - </message_arguments> - </filter> - </resource> -</component> +<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.equinox.p2.operations" version="2">
+ <resource path="META-INF/MANIFEST.MF">
+ <filter id="923795461">
+ <message_arguments>
+ <message_argument value="2.3.0"/>
+ <message_argument value="2.2.0"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="src/org/eclipse/equinox/p2/operations/ProfileChangeOperation.java" type="org.eclipse.equinox.p2.operations.ProfileChangeOperation">
+ <filter id="338792546">
+ <message_arguments>
+ <message_argument value="org.eclipse.equinox.p2.operations.ProfileChangeOperation"/>
+ <message_argument value="getProfileChangeRequest()"/>
+ </message_arguments>
+ </filter>
+ </resource>
+</component>
diff --git a/bundles/org.eclipse.equinox.p2.operations/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.equinox.p2.operations/.settings/org.eclipse.jdt.core.prefs index 69f49b645..449cf187f 100644 --- a/bundles/org.eclipse.equinox.p2.operations/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/org.eclipse.equinox.p2.operations/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,3 @@ -#Tue Dec 29 23:18:33 CET 2009 eclipse.preferences.version=1 org.eclipse.jdt.core.builder.cleanOutputFolder=clean org.eclipse.jdt.core.builder.duplicateResourceTask=warning @@ -8,7 +7,7 @@ org.eclipse.jdt.core.circularClasspath=error org.eclipse.jdt.core.classpath.exclusionPatterns=enabled org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=jsr14 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.debug.lineNumber=generate diff --git a/bundles/org.eclipse.equinox.p2.operations/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.operations/META-INF/MANIFEST.MF index a585e4215..322a1a4fb 100644 --- a/bundles/org.eclipse.equinox.p2.operations/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.operations/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.equinox.p2.operations;singleton:=true -Bundle-Version: 2.2.100.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-Activator: org.eclipse.equinox.internal.p2.operations.Activator Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -10,9 +10,7 @@ Export-Package: org.eclipse.equinox.internal.p2.operations;x-friends:="org.eclip org.eclipse.equinox.p2.operations;version="2.0.0" Require-Bundle: org.eclipse.equinox.common;bundle-version="3.6.0", org.eclipse.core.jobs;bundle-version="3.5.0" -Bundle-RequiredExecutionEnvironment: J2SE-1.5, - J2SE-1.4, - CDC-1.1/Foundation-1.1 +Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ActivationPolicy: lazy Import-Package: org.eclipse.equinox.internal.p2.core.helpers, org.eclipse.equinox.internal.p2.director, diff --git a/bundles/org.eclipse.equinox.p2.operations/pom.xml b/bundles/org.eclipse.equinox.p2.operations/pom.xml index 1dbb423bf..92e412e29 100644 --- a/bundles/org.eclipse.equinox.p2.operations/pom.xml +++ b/bundles/org.eclipse.equinox.p2.operations/pom.xml @@ -19,6 +19,6 @@ </parent> <groupId>org.eclipse.equinox</groupId> <artifactId>org.eclipse.equinox.p2.operations</artifactId> - <version>2.2.100-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/p2/operations/RemediationOperation.java b/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/p2/operations/RemediationOperation.java index 089e9bfa7..bc021b4ec 100644 --- a/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/p2/operations/RemediationOperation.java +++ b/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/p2/operations/RemediationOperation.java @@ -20,6 +20,9 @@ import org.eclipse.equinox.p2.planner.IPlanner; import org.eclipse.equinox.p2.planner.IProfileChangeRequest; //TODO Javadoc +/** + * @since 2.3 + */ public class RemediationOperation extends ProfileChangeOperation { private static int ZERO_WEIGHT = 0; diff --git a/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/p2/operations/Remedy.java b/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/p2/operations/Remedy.java index 15f2a065c..54400ebcf 100644 --- a/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/p2/operations/Remedy.java +++ b/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/p2/operations/Remedy.java @@ -13,6 +13,9 @@ package org.eclipse.equinox.p2.operations; import org.eclipse.equinox.internal.p2.director.ProfileChangeRequest; //TODO Javadoc +/** + * @since 2.3 + */ public class Remedy { private RemedyConfig config; diff --git a/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/p2/operations/RemedyConfig.java b/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/p2/operations/RemedyConfig.java index d19ca65ca..5c83fa24b 100644 --- a/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/p2/operations/RemedyConfig.java +++ b/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/p2/operations/RemedyConfig.java @@ -14,6 +14,9 @@ import java.util.ArrayList; import java.util.Collection; //TODO Javadoc +/** + * @since 2.3 + */ public class RemedyConfig { public boolean allowInstalledUpdate = false; diff --git a/bundles/org.eclipse.equinox.p2.ui/.settings/.api_filters b/bundles/org.eclipse.equinox.p2.ui/.settings/.api_filters new file mode 100644 index 000000000..4b14445f4 --- /dev/null +++ b/bundles/org.eclipse.equinox.p2.ui/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.equinox.p2.ui" version="2">
+ <resource path="src/org/eclipse/equinox/p2/ui/ProvisioningUI.java" type="org.eclipse.equinox.p2.ui.ProvisioningUI">
+ <filter id="338792546">
+ <message_arguments>
+ <message_argument value="org.eclipse.equinox.p2.ui.ProvisioningUI"/>
+ <message_argument value="getRelaxedUpdateOperation(ProvisioningContext)"/>
+ </message_arguments>
+ </filter>
+ </resource>
+</component>
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/ProvisioningUI.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/ProvisioningUI.java index 6b05df26b..670b753e7 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/ProvisioningUI.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/ProvisioningUI.java @@ -45,7 +45,6 @@ import org.eclipse.ui.dialogs.PreferencesUtil; * provisioning UI. * * @since 2.0 - * */ public class ProvisioningUI { @@ -242,6 +241,7 @@ public class ProvisioningUI { * an in-memory repository reference to the wizard. * * @return the wizard return code + * @since 2.3 */ public int openUpdateWizard(boolean skipSelectionsPage, UpdateOperation operation, RemediationOperation remediationOperation, LoadMetadataRepositoryJob job) { if (getPolicy().getUpdateWizardStyle() == Policy.UPDATE_STYLE_SINGLE_IUS && UpdateSingleIUWizard.validFor(operation)) { |