Merge pull request #110 from thallgren/eclipse-mars-and-jshint-2.9.0

Upgrade to Eclipse Mars and jshint 2.9.0
eclipsesource · Oct 30, 2015 · cd1b666 · cd1b666
2 parents 4074058 + 34f9e6d
commit cd1b666
Show file tree

Hide file tree

Showing 20 changed files with 101,676 additions and 37 deletions.
diff --git a/bundles/com.eclipsesource.jshint.ui/META-INF/MANIFEST.MF b/bundles/com.eclipsesource.jshint.ui/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: JSHint Eclipse Integration
 Bundle-SymbolicName: com.eclipsesource.jshint.ui;singleton:=true
-Bundle-Version: 0.9.11.qualifier
+Bundle-Version: 0.10.0.qualifier
 Bundle-Activator: com.eclipsesource.jshint.ui.internal.Activator
 Bundle-Vendor: EclipseSource
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
  org.eclipse.core.resources;bundle-version="3.6.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
-Import-Package: com.eclipsesource.jshint;version="[0.9.11,1.0.0)",
+Import-Package: com.eclipsesource.jshint;version="[0.10.0,1.0.0)",
  com.eclipsesource.json;version="[0.9.0.jshint,0.9.0.jshint]"
-Export-Package: com.eclipsesource.jshint.ui.internal;version="0.9.11";x-internal:=true,
- com.eclipsesource.jshint.ui.internal.builder;version="0.9.11";x-internal:=true,
- com.eclipsesource.jshint.ui.internal.preferences;version="0.9.11";x-internal:=true,
- com.eclipsesource.jshint.ui.internal.preferences.ui;version="0.9.11";x-internal:=true
+Export-Package: com.eclipsesource.jshint.ui.internal;version="0.10.0";x-internal:=true,
+ com.eclipsesource.jshint.ui.internal.builder;version="0.10.0";x-internal:=true,
+ com.eclipsesource.jshint.ui.internal.preferences;version="0.10.0";x-internal:=true,
+ com.eclipsesource.jshint.ui.internal.preferences.ui;version="0.10.0";x-internal:=true
diff --git a/bundles/com.eclipsesource.jshint.ui/pom.xml b/bundles/com.eclipsesource.jshint.ui/pom.xml
@@ -6,13 +6,13 @@
 
   <groupId>com.eclipsesource.jshint</groupId>
   <artifactId>com.eclipsesource.jshint.ui</artifactId>
-  <version>0.9.11-SNAPSHOT</version>
+  <version>0.10.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <parent>
     <groupId>com.eclipsesource.jshint</groupId>
     <artifactId>com.eclipsesource.jshint.build</artifactId>
-    <version>0.9.11-SNAPSHOT</version>
+    <version>0.10.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

diff --git a/bundles/com.eclipsesource.jshint/META-INF/MANIFEST.MF b/bundles/com.eclipsesource.jshint/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: JSHint
 Bundle-SymbolicName: com.eclipsesource.jshint
-Bundle-Version: 0.9.11.qualifier
+Bundle-Version: 0.10.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: EclipseSource
 Bundle-ActivationPolicy: lazy
-Export-Package: com.eclipsesource.jshint;version="0.9.11",
- com.eclipsesource.jshint.internal;version="0.9.11";x-friends:="com.eclipsesource.jshint.test",
+Export-Package: com.eclipsesource.jshint;version="0.10.0",
+ com.eclipsesource.jshint.internal;version="0.10.0";x-friends:="com.eclipsesource.jshint.test",
  com.eclipsesource.json;version="0.9.0.jshint"
 Require-Bundle: org.mozilla.javascript;bundle-version="1.7.4"
diff --git a/bundles/com.eclipsesource.jshint/pom.xml b/bundles/com.eclipsesource.jshint/pom.xml
@@ -6,13 +6,13 @@
 
   <groupId>com.eclipsesource.jshint</groupId>
   <artifactId>com.eclipsesource.jshint</artifactId>
-  <version>0.9.11-SNAPSHOT</version>
+  <version>0.10.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <parent>
     <groupId>com.eclipsesource.jshint</groupId>
     <artifactId>com.eclipsesource.jshint.build</artifactId>
-    <version>0.9.11-SNAPSHOT</version>
+    <version>0.10.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

diff --git a/bundles/com.eclipsesource.jshint/src/com/eclipsesource/jshint/JSHint.java b/bundles/com.eclipsesource.jshint/src/com/eclipsesource/jshint/JSHint.java
@@ -47,7 +47,7 @@
  */
 public class JSHint {
 
-  private static final String DEFAULT_JSHINT_VERSION = "2.5.6";
+  private static final String DEFAULT_JSHINT_VERSION = "2.9.0";
   private static final int DEFAULT_JSHINT_INDENT = 4;
   private ScriptableObject scope;
   private Function jshint;
@@ -259,7 +259,8 @@ private static String createShimCode() {
     // Create shims to prevent problems with JSHint accessing objects that are not available in
     // Rhino, e.g. https://github.com/jshint/jshint/issues/1038
     return "console = {log:function(){},error:function(){},trace:function(){}};"
-         + "window = {};";
+         + "window = {};"
+         + "global = this;";
   }
 
   private static Function findJSHintFunction( ScriptableObject scope )

diff --git a/bundles/com.eclipsesource.jshint/src/com/jshint/jshint-2.9.0.js b/bundles/com.eclipsesource.jshint/src/com/jshint/jshint-2.9.0.js
diff --git a/pom.xml b/pom.xml
@@ -17,7 +17,7 @@
 
   <groupId>com.eclipsesource.jshint</groupId>
   <artifactId>com.eclipsesource.jshint.build</artifactId>
-  <version>0.9.11-SNAPSHOT</version>
+  <version>0.10.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <modules>
@@ -34,17 +34,17 @@
     <repository>
       <id>target-repo</id>
       <layout>p2</layout>
-      <url>http://download.eclipse.org/releases/indigo/</url>
+      <url>http://download.eclipse.org/releases/mars/</url>
     </repository>
     <repository>
       <id>orbit-repo</id>
       <layout>p2</layout>
-      <url>http://download.eclipse.org/tools/orbit/downloads/drops/R20130827064939/repository/</url>
+      <url>http://download.eclipse.org/tools/orbit/downloads/drops/R20150821153341/repository/</url>
     </repository>
     <repository>
       <id>swtbot-repo</id>
       <layout>p2</layout>
-      <url>http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site</url>
+      <url>http://download.eclipse.org/technology/swtbot/releases/2.3.0/</url>
     </repository>
     <repository>
       <id>mockito-all-repo</id>
@@ -101,7 +101,6 @@
           <dependency>
             <type>eclipse-feature</type>
             <artifactId>org.eclipse.rcp</artifactId>
-            <version>0.0.0</version>
           </dependency>
         </configuration>
       </plugin>

diff --git a/releng/com.eclipsesource.jshint.feature/feature.xml b/releng/com.eclipsesource.jshint.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.eclipsesource.jshint.feature"
       label="JSHint Eclipse Integration"
-      version="0.9.11.qualifier"
+      version="0.10.0.qualifier"
       provider-name="EclipseSource">
 
    <description url="http://github.eclipsesource.com/jshint-eclipse/">

diff --git a/releng/com.eclipsesource.jshint.feature/pom.xml b/releng/com.eclipsesource.jshint.feature/pom.xml
@@ -6,13 +6,13 @@
 
   <groupId>com.eclipsesource.jshint</groupId>
   <artifactId>com.eclipsesource.jshint.feature</artifactId>
-  <version>0.9.11-SNAPSHOT</version>
+  <version>0.10.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <parent>
     <groupId>com.eclipsesource.jshint</groupId>
     <artifactId>com.eclipsesource.jshint.build</artifactId>
-    <version>0.9.11-SNAPSHOT</version>
+    <version>0.10.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

diff --git a/releng/com.eclipsesource.jshint.repository/category.xml b/releng/com.eclipsesource.jshint.repository/category.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="../com.eclipsesource.jshint.feature" id="com.eclipsesource.jshint.feature" version="0.9.11.qualifier">
+   <feature url="../com.eclipsesource.jshint.feature" id="com.eclipsesource.jshint.feature" version="0.10.0.qualifier">
       <category name="com.eclipsesource.jshint"/>
    </feature>
    <category-def name="com.eclipsesource.jshint" label="JSHint">

diff --git a/releng/com.eclipsesource.jshint.repository/pom.xml b/releng/com.eclipsesource.jshint.repository/pom.xml
@@ -6,13 +6,13 @@
 
   <groupId>com.eclipsesource.jshint</groupId>
   <artifactId>com.eclipsesource.jshint.repository</artifactId>
-  <version>0.9.11-SNAPSHOT</version>
+  <version>0.10.0-SNAPSHOT</version>
   <packaging>eclipse-repository</packaging>
 
   <parent>
     <groupId>com.eclipsesource.jshint</groupId>
     <artifactId>com.eclipsesource.jshint.build</artifactId>
-    <version>0.9.11-SNAPSHOT</version>
+    <version>0.10.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

diff --git a/tests/com.eclipsesource.jshint.test/META-INF/MANIFEST.MF b/tests/com.eclipsesource.jshint.test/META-INF/MANIFEST.MF
@@ -2,12 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for JSHint Eclipse Integration
 Bundle-SymbolicName: com.eclipsesource.jshint.test
-Bundle-Version: 0.9.11.qualifier
-Fragment-Host: com.eclipsesource.jshint;bundle-version="0.9.11"
+Bundle-Version: 0.10.0.qualifier
+Fragment-Host: com.eclipsesource.jshint;bundle-version="0.10.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Import-Package: org.junit;version="4.8.2",
  org.junit.runner;version="4.8.2",
  org.junit.runners;version="4.8.2"
 Bundle-Vendor: EclipseSource
 Require-Bundle: org.hamcrest.core;bundle-version="1.1.0",
- org.mockito.mockito-all;bundle-version="[1.9.5,2.0.0)"
+ org.mockito.mockito-all;bundle-version="[1.9.5,2.0.0)",
+ org.eclipse.equinox.ds,
+ org.eclipse.equinox.event
diff --git a/tests/com.eclipsesource.jshint.test/pom.xml b/tests/com.eclipsesource.jshint.test/pom.xml
@@ -6,13 +6,13 @@
 
   <groupId>com.eclipsesource.jshint</groupId>
   <artifactId>com.eclipsesource.jshint.test</artifactId>
-  <version>0.9.11-SNAPSHOT</version>
+  <version>0.10.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 
   <parent>
     <groupId>com.eclipsesource.jshint</groupId>
     <artifactId>com.eclipsesource.jshint.build</artifactId>
-    <version>0.9.11-SNAPSHOT</version>
+    <version>0.10.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

diff --git a/...com.eclipsesource.jshint.test/src/com/eclipsesource/jshint/JSHint_Compatibility_Test.java b/...com.eclipsesource.jshint.test/src/com/eclipsesource/jshint/JSHint_Compatibility_Test.java
@@ -53,7 +53,12 @@ public static Collection<Object[]> getParameters() {
       { "2.1.2" },
       { "2.1.10" },
       { "2.4.3" },
-      { "2.5.6" } } );
+      { "2.5.6" },
+      { "2.6.3" },
+      { "2.7.0" },
+      { "2.8.0" },
+      { "2.9.0" },
+      } );
   }
 
   public JSHint_Compatibility_Test( String version ) {

diff --git a/tests/com.eclipsesource.jshint.test/src/com/jshint/jshint-2.6.3.js b/tests/com.eclipsesource.jshint.test/src/com/jshint/jshint-2.6.3.js
diff --git a/tests/com.eclipsesource.jshint.test/src/com/jshint/jshint-2.7.0.js b/tests/com.eclipsesource.jshint.test/src/com/jshint/jshint-2.7.0.js
diff --git a/tests/com.eclipsesource.jshint.test/src/com/jshint/jshint-2.8.0.js b/tests/com.eclipsesource.jshint.test/src/com/jshint/jshint-2.8.0.js
diff --git a/tests/com.eclipsesource.jshint.test/src/com/jshint/jshint-2.9.0.js b/tests/com.eclipsesource.jshint.test/src/com/jshint/jshint-2.9.0.js
diff --git a/tests/com.eclipsesource.jshint.ui.test/META-INF/MANIFEST.MF b/tests/com.eclipsesource.jshint.ui.test/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for JSHint UI
 Bundle-SymbolicName: com.eclipsesource.jshint.ui.test
-Bundle-Version: 0.9.11.qualifier
+Bundle-Version: 0.10.0.qualifier
 Bundle-Vendor: EclipseSource
-Fragment-Host: com.eclipsesource.jshint.ui;bundle-version="0.9.11"
+Fragment-Host: com.eclipsesource.jshint.ui;bundle-version="0.10.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Import-Package: org.apache.log4j;version="[1.2.13,1.3.0)",
  org.eclipse.swt.custom,
@@ -13,4 +13,6 @@ Import-Package: org.apache.log4j;version="[1.2.13,1.3.0)",
  org.junit;version="4.8.2",
  org.junit.runner;version="4.8.2"
 Require-Bundle: org.hamcrest.core;bundle-version="1.1.0",
- org.mockito.mockito-all;bundle-version="[1.9.5,2.0.0)"
+ org.mockito.mockito-all;bundle-version="[1.9.5,2.0.0)",
+ org.eclipse.equinox.ds,
+ org.eclipse.equinox.event
diff --git a/tests/com.eclipsesource.jshint.ui.test/pom.xml b/tests/com.eclipsesource.jshint.ui.test/pom.xml
@@ -6,13 +6,13 @@
 
   <groupId>com.eclipsesource.jshint</groupId>
   <artifactId>com.eclipsesource.jshint.ui.test</artifactId>
-  <version>0.9.11-SNAPSHOT</version>
+  <version>0.10.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 
   <parent>
     <groupId>com.eclipsesource.jshint</groupId>
     <artifactId>com.eclipsesource.jshint.build</artifactId>
-    <version>0.9.11-SNAPSHOT</version>
+    <version>0.10.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>