diff options
author | Pascal Rapicault | 2008-12-22 15:30:52 +0000 |
---|---|---|
committer | Pascal Rapicault | 2008-12-22 15:30:52 +0000 |
commit | 6015a8a074176483727d1ca929eebb590ea26039 (patch) | |
tree | 1de3549b65806c93ccb9de4b1df03ff7b5255231 /bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/spi/p2/publisher/PublisherHelper.java | |
parent | dafd36e0149a3be144a51e77ae148beb87224021 (diff) | |
download | rt.equinox.p2-6015a8a074176483727d1ca929eebb590ea26039.tar.gz rt.equinox.p2-6015a8a074176483727d1ca929eebb590ea26039.tar.xz rt.equinox.p2-6015a8a074176483727d1ca929eebb590ea26039.zip |
Bug 233699 - Add support for version types other than OSGipost_version_2008
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/spi/p2/publisher/PublisherHelper.java')
-rw-r--r-- | bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/spi/p2/publisher/PublisherHelper.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/spi/p2/publisher/PublisherHelper.java b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/spi/p2/publisher/PublisherHelper.java index 3727c0c1f..e827aa1f8 100644 --- a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/spi/p2/publisher/PublisherHelper.java +++ b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/spi/p2/publisher/PublisherHelper.java @@ -20,15 +20,15 @@ import org.eclipse.equinox.internal.p2.metadata.ArtifactKey; import org.eclipse.equinox.internal.p2.metadata.InstallableUnit; import org.eclipse.equinox.internal.provisional.p2.artifact.repository.ArtifactDescriptor; import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactDescriptor; +import org.eclipse.equinox.internal.provisional.p2.core.Version; +import org.eclipse.equinox.internal.provisional.p2.core.VersionRange; import org.eclipse.equinox.internal.provisional.p2.metadata.*; import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitFragmentDescription; import org.eclipse.equinox.p2.publisher.IPublisherInfo; import org.eclipse.equinox.p2.publisher.PublisherInfo; import org.eclipse.equinox.p2.publisher.eclipse.*; import org.eclipse.osgi.service.resolver.BundleDescription; -import org.eclipse.osgi.service.resolver.VersionRange; import org.osgi.framework.Constants; -import org.osgi.framework.Version; /** * This class was originally the MetadataGeneratorHelper from the Generator. @@ -211,7 +211,7 @@ public class PublisherHelper { ArrayList iusCreated = new ArrayList(1); IPublisherInfo info = new PublisherInfo(); String shape = isFolderPlugin ? IBundleShapeAdvice.DIR : IBundleShapeAdvice.JAR; - info.addAdvice(new BundleShapeAdvice(bd.getSymbolicName(), bd.getVersion(), shape)); + info.addAdvice(new BundleShapeAdvice(bd.getSymbolicName(), Version.fromOSGiVersion(bd.getVersion()), shape)); IInstallableUnit iu = BundlesAction.createBundleIU(bd, key, info); addExtraProperties(iu, extraProperties); iusCreated.add(iu); |