Permalink
Browse files

Peter moved the Version class. Thanks a bunch!

  • Loading branch information...
njbartlett committed Jul 26, 2012
1 parent e88b538 commit e6d425911b8342c938fc806f7fa5f0e7712a9384
@@ -37,7 +37,7 @@
import aQute.bnd.build.Workspace;
import aQute.bnd.osgi.Processor;
-import aQute.bnd.osgi.Version;
+import aQute.bnd.version.Version;
import bndtools.api.ILogger;
import bndtools.services.WorkspaceURLStreamHandlerService;
@@ -12,7 +12,7 @@
import org.eclipse.core.runtime.IPath;
-import aQute.bnd.osgi.Version;
+import aQute.bnd.version.Version;
/**
* <p>
@@ -74,7 +74,7 @@
import aQute.bnd.build.model.clauses.ExportedPackage;
import aQute.bnd.build.model.clauses.ServiceComponent;
import aQute.bnd.header.Attrs;
-import aQute.bnd.osgi.Version;
+import aQute.bnd.version.Version;
import bndtools.BndConstants;
import bndtools.Logger;
import bndtools.Plugin;
@@ -2,7 +2,7 @@
import java.net.URL;
-import aQute.bnd.osgi.Version;
+import aQute.bnd.version.Version;
class OSGiFramework {
@@ -13,9 +13,9 @@
import org.osgi.framework.Bundle;
import aQute.bnd.build.Workspace;
-import aQute.bnd.osgi.Version;
import aQute.bnd.service.RepositoryPlugin;
import aQute.bnd.service.RepositoryPlugin.Strategy;
+import aQute.bnd.version.Version;
import bndtools.Logger;
import bndtools.Plugin;
import bndtools.api.ILogger;
@@ -66,9 +66,9 @@
import aQute.bnd.build.model.BndEditModel;
import aQute.bnd.build.model.clauses.VersionedClause;
import aQute.bnd.osgi.Constants;
-import aQute.bnd.osgi.Version;
import aQute.bnd.osgi.resource.CapReqBuilder;
import aQute.bnd.osgi.resource.Filters;
+import aQute.bnd.version.Version;
import aQute.libg.filters.AndFilter;
import aQute.libg.filters.Filter;
import aQute.libg.filters.LiteralFilter;
@@ -9,8 +9,8 @@
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.Path;
-import aQute.bnd.osgi.Version;
import aQute.bnd.service.RepositoryPlugin.Strategy;
+import aQute.bnd.version.Version;
import bndtools.Logger;
import bndtools.api.ILogger;
@@ -15,10 +15,10 @@
import aQute.bnd.build.Project;
import aQute.bnd.build.Workspace;
import aQute.bnd.osgi.Builder;
-import aQute.bnd.osgi.Version;
import aQute.bnd.service.IndexProvider;
import aQute.bnd.service.RepositoryPlugin;
import aQute.bnd.service.ResolutionPhase;
+import aQute.bnd.version.Version;
import bndtools.Logger;
import bndtools.api.ILogger;
@@ -44,8 +44,8 @@
import aQute.bnd.osgi.Descriptors.PackageRef;
import aQute.bnd.osgi.Jar;
import aQute.bnd.osgi.Processor;
-import aQute.bnd.osgi.Version;
-import aQute.bnd.osgi.VersionRange;
+import aQute.bnd.version.Version;
+import aQute.bnd.version.VersionRange;
import aQute.lib.collections.MultiMap;
import bndtools.Logger;
import bndtools.Plugin;
@@ -22,8 +22,8 @@
import org.osgi.framework.Constants;
import aQute.bnd.header.Parameters;
-import aQute.bnd.osgi.Version;
-import aQute.bnd.osgi.VersionRange;
+import aQute.bnd.version.Version;
+import aQute.bnd.version.VersionRange;
public class BundleUtils {
private static final String FILE_URL_PREFIX = "file:";
@@ -14,8 +14,8 @@
import aQute.bnd.header.Parameters;
import aQute.bnd.osgi.Constants;
import aQute.bnd.osgi.Jar;
-import aQute.bnd.osgi.Version;
-import aQute.bnd.osgi.VersionRange;
+import aQute.bnd.version.Version;
+import aQute.bnd.version.VersionRange;
import bndtools.model.repo.ProjectBundle;
import bndtools.model.repo.RepositoryBundle;
import bndtools.model.repo.RepositoryBundleVersion;
@@ -25,7 +25,7 @@
import aQute.bnd.build.model.BndEditModel;
import aQute.bnd.build.model.clauses.VersionedClause;
import aQute.bnd.header.Attrs;
-import aQute.bnd.osgi.VersionRange;
+import aQute.bnd.version.VersionRange;
import aQute.lib.io.IO;
import bndtools.BndConstants;
import bndtools.Logger;
@@ -41,9 +41,9 @@
import aQute.bnd.osgi.Builder;
import aQute.bnd.osgi.Jar;
import aQute.bnd.osgi.Resource;
-import aQute.bnd.osgi.VersionRange;
import aQute.bnd.service.RepositoryPlugin;
import aQute.bnd.service.RepositoryPlugin.Strategy;
+import aQute.bnd.version.VersionRange;
public class JarDiff {
@@ -792,8 +792,8 @@ public void calculatePackageVersions() {
}
private static boolean suggestVersionOne(String version) {
- aQute.bnd.osgi.Version aQuteVersion = new aQute.bnd.osgi.Version(version);
- if (aQuteVersion.compareTo(new aQute.bnd.osgi.Version("1.0.0")) < 0) {
+ aQute.bnd.version.Version aQuteVersion = new aQute.bnd.version.Version(version);
+ if (aQuteVersion.compareTo(new aQute.bnd.version.Version("1.0.0")) < 0) {
return true;
}
return false;
@@ -803,7 +803,7 @@ private static boolean suggestVersionOne(String version) {
private static String _version(String[] args) {
String mask = args[1];
- aQute.bnd.osgi.Version version = new aQute.bnd.osgi.Version(args[2]);
+ aQute.bnd.version.Version version = new aQute.bnd.version.Version(args[2]);
StringBuilder sb = new StringBuilder();
String del = "";
@@ -36,7 +36,7 @@
import aQute.bnd.build.Project;
import aQute.bnd.osgi.Constants;
import aQute.bnd.osgi.Jar;
-import aQute.bnd.osgi.Version;
+import aQute.bnd.version.Version;
import aQute.bnd.service.RepositoryPlugin;
public class ReleaseUtils {

0 comments on commit e6d4259

Please sign in to comment.