Fix for issue #322: SpecifiedVersion switched packages

groovy · Jul 27, 2017 · 9fb8c48 · 9fb8c48
1 parent 64c8f68
commit 9fb8c48
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 8 deletions.
diff --git a/...ovy.eclipse.compilerResolver/src/org/codehaus/groovy/eclipse/chooser/CompilerChooser.java b/...ovy.eclipse.compilerResolver/src/org/codehaus/groovy/eclipse/chooser/CompilerChooser.java
@@ -21,6 +21,7 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
+import org.codehaus.groovy.frameworkadapter.util.SpecifiedVersion;
 import org.eclipse.core.runtime.ISafeRunnable;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.SafeRunner;

diff --git a/...ovy/eclipse/chooser/SpecifiedVersion.java → ...ameworkadapter/util/SpecifiedVersion.java b/...ovy/eclipse/chooser/SpecifiedVersion.java → ...ameworkadapter/util/SpecifiedVersion.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.codehaus.groovy.eclipse.chooser;
+package org.codehaus.groovy.frameworkadapter.util;
 
 import org.osgi.framework.Version;
 

diff --git a/base/org.codehaus.groovy24/META-INF/MANIFEST.MF b/base/org.codehaus.groovy24/META-INF/MANIFEST.MF
@@ -3,12 +3,12 @@ Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.codehaus.groovy
 Bundle-Name: Groovy
 Bundle-Vendor: Codehaus.org
-Bundle-Version: 2.4.12.qualifier
+Bundle-Version: 2.4.13.qualifier
 Bundle-ClassPath: eclipse-trace.jar,
  groovy-eclipse.jar,
  lib/bsf-2.4.0.jar,
  lib/ivy-2.4.0.jar,
- lib/groovy-all-2.4.12.jar
+ lib/groovy-all-2.4.13.jar
 Export-Package: groovy.beans,
  groovy.grape,
  groovy.inspect,

diff --git a/...clipse.core/src/org/codehaus/groovy/eclipse/core/compiler/CompilerCheckerParticipant.java b/...clipse.core/src/org/codehaus/groovy/eclipse/core/compiler/CompilerCheckerParticipant.java
@@ -15,8 +15,8 @@
  */
 package org.codehaus.groovy.eclipse.core.compiler;
 
-import org.codehaus.groovy.eclipse.chooser.SpecifiedVersion;
 import org.codehaus.groovy.eclipse.core.GroovyCore;
+import org.codehaus.groovy.frameworkadapter.util.SpecifiedVersion;
 import org.codehaus.jdt.groovy.model.GroovyNature;
 import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.resources.IProject;

diff --git a/...haus.groovy.eclipse.core/src/org/codehaus/groovy/eclipse/core/compiler/CompilerUtils.java b/...haus.groovy.eclipse.core/src/org/codehaus/groovy/eclipse/core/compiler/CompilerUtils.java
@@ -29,9 +29,9 @@
 import groovy.lang.GroovySystem;
 
 import org.codehaus.groovy.eclipse.chooser.CompilerChooser;
-import org.codehaus.groovy.eclipse.chooser.SpecifiedVersion;
 import org.codehaus.groovy.eclipse.core.GroovyCore;
 import org.codehaus.groovy.eclipse.core.GroovyCoreActivator;
+import org.codehaus.groovy.frameworkadapter.util.SpecifiedVersion;
 import org.codehaus.jdt.groovy.model.GroovyNature;
 import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.resources.IProject;

diff --git a/...roovy.eclipse.ui/src/org/codehaus/groovy/eclipse/preferences/CompilerPreferencesPage.java b/...roovy.eclipse.ui/src/org/codehaus/groovy/eclipse/preferences/CompilerPreferencesPage.java
@@ -16,12 +16,12 @@
 package org.codehaus.groovy.eclipse.preferences;
 
 import org.codehaus.groovy.eclipse.GroovyPlugin;
-import org.codehaus.groovy.eclipse.chooser.SpecifiedVersion;
 import org.codehaus.groovy.eclipse.core.GroovyCoreActivator;
 import org.codehaus.groovy.eclipse.core.builder.GroovyClasspathContainerInitializer;
 import org.codehaus.groovy.eclipse.core.compiler.CompilerCheckerParticipant;
 import org.codehaus.groovy.eclipse.core.compiler.CompilerUtils;
 import org.codehaus.groovy.eclipse.core.preferences.PreferenceConstants;
+import org.codehaus.groovy.frameworkadapter.util.SpecifiedVersion;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.ProjectScope;

diff --git a/...groovy.eclipse.ui/src/org/codehaus/groovy/eclipse/preferences/CompilerSwitchUIHelper.java b/...groovy.eclipse.ui/src/org/codehaus/groovy/eclipse/preferences/CompilerSwitchUIHelper.java
@@ -18,9 +18,9 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import org.codehaus.groovy.eclipse.chooser.SpecifiedVersion;
 import org.codehaus.groovy.eclipse.core.GroovyCore;
 import org.codehaus.groovy.eclipse.core.compiler.CompilerUtils;
+import org.codehaus.groovy.frameworkadapter.util.SpecifiedVersion;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.dialogs.ErrorDialog;

diff --git a/...codehaus.groovy.eclipse.ui/src/org/codehaus/groovy/eclipse/wizards/ListMessageDialog.java b/...codehaus.groovy.eclipse.ui/src/org/codehaus/groovy/eclipse/wizards/ListMessageDialog.java
@@ -15,9 +15,9 @@
  */
 package org.codehaus.groovy.eclipse.wizards;
 
-import org.codehaus.groovy.eclipse.chooser.SpecifiedVersion;
 import org.codehaus.groovy.eclipse.core.compiler.CompilerUtils;
 import org.codehaus.groovy.eclipse.preferences.CompilerSwitchUIHelper;
+import org.codehaus.groovy.frameworkadapter.util.SpecifiedVersion;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.MessageDialog;