diff options
author | Matthew Piggott | 2011-03-25 21:38:00 +0000 |
---|---|---|
committer | Matthew Piggott | 2011-03-25 21:38:00 +0000 |
commit | d6c033b85da91aaefcde022e20438f8d96898339 (patch) | |
tree | a3d2fff2600ceeb170a9779db2e5cb854800480a /org.eclipse.m2e.discovery | |
parent | b435d7b6c59c0160473d58513fa6f9b5dd473097 (diff) | |
download | m2e-core-d6c033b85da91aaefcde022e20438f8d96898339.tar.gz m2e-core-d6c033b85da91aaefcde022e20438f8d96898339.tar.xz m2e-core-d6c033b85da91aaefcde022e20438f8d96898339.zip |
Revert "Change discovery to use versioned URL"
This reverts commit 5b68038bb56ca2bd777ac7d359b4524c5fbc347d.
Diffstat (limited to 'org.eclipse.m2e.discovery')
-rw-r--r-- | org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/MavenDiscovery.java | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/MavenDiscovery.java b/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/MavenDiscovery.java index d24a2c78..ad477fa3 100644 --- a/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/MavenDiscovery.java +++ b/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/MavenDiscovery.java @@ -39,7 +39,6 @@ import org.eclipse.osgi.util.NLS; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.internal.Workbench; -import org.osgi.framework.Version; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -58,7 +57,7 @@ public class MavenDiscovery { private static final Tag MAVEN_TAG = new Tag("maven", Messages.MavenDiscovery_Wizard_MavenTag); //$NON-NLS-1$ - private static final String PATH; + private static final String PATH = "http://download.eclipse.org/technology/m2e/discovery/directory.xml"; //$NON-NLS-1$ public static final String LIFECYCLE_PATH = "lifecycle/"; //$NON-NLS-1$ @@ -66,14 +65,6 @@ public class MavenDiscovery { public static final String PLUGINXML_EXT = ".pluginxml"; //$NON-NLS-1$ - static { - Version v = DiscoveryActivator.getDefault().getBundle().getVersion(); - StringBuilder sb = new StringBuilder("http://download.eclipse.org/technology/m2e/discovery/"); //$NON-NLS-1$ - sb.append(v.getMajor()).append('.').append(v.getMinor()).append('.').append(v.getMicro()); - sb.append("/directory.xml"); //$NON-NLS-1$ - PATH = sb.toString(); - } - public static void launchWizard(Shell shell) { launchWizard(shell, Collections.EMPTY_LIST, Collections.EMPTY_LIST, Collections.EMPTY_LIST, Collections.EMPTY_LIST); } |