Skip to content

Commit cd1b666

Browse files
ralfstxralfstx
committed
Merge pull request #110 from thallgren/eclipse-mars-and-jshint-2.9.0
Upgrade to Eclipse Mars and jshint 2.9.0
2 parents 4074058 + 34f9e6d commit cd1b666

File tree

20 files changed

+101676
-37
lines changed

20 files changed

+101676
-37
lines changed

‎bundles/com.eclipsesource.jshint.ui/META-INF/MANIFEST.MF

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: JSHint Eclipse Integration
44
Bundle-SymbolicName: com.eclipsesource.jshint.ui;singleton:=true
5-
Bundle-Version: 0.9.11.qualifier
5+
Bundle-Version: 0.10.0.qualifier
66
Bundle-Activator: com.eclipsesource.jshint.ui.internal.Activator
77
Bundle-Vendor: EclipseSource
88
Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
99
org.eclipse.core.runtime;bundle-version="3.6.0",
1010
org.eclipse.core.resources;bundle-version="3.6.0"
1111
Bundle-RequiredExecutionEnvironment: J2SE-1.5
1212
Bundle-ActivationPolicy: lazy
13-
Import-Package: com.eclipsesource.jshint;version="[0.9.11,1.0.0)",
13+
Import-Package: com.eclipsesource.jshint;version="[0.10.0,1.0.0)",
1414
com.eclipsesource.json;version="[0.9.0.jshint,0.9.0.jshint]"
15-
Export-Package: com.eclipsesource.jshint.ui.internal;version="0.9.11";x-internal:=true,
16-
com.eclipsesource.jshint.ui.internal.builder;version="0.9.11";x-internal:=true,
17-
com.eclipsesource.jshint.ui.internal.preferences;version="0.9.11";x-internal:=true,
18-
com.eclipsesource.jshint.ui.internal.preferences.ui;version="0.9.11";x-internal:=true
15+
Export-Package: com.eclipsesource.jshint.ui.internal;version="0.10.0";x-internal:=true,
16+
com.eclipsesource.jshint.ui.internal.builder;version="0.10.0";x-internal:=true,
17+
com.eclipsesource.jshint.ui.internal.preferences;version="0.10.0";x-internal:=true,
18+
com.eclipsesource.jshint.ui.internal.preferences.ui;version="0.10.0";x-internal:=true

‎bundles/com.eclipsesource.jshint.ui/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66

77
<groupId>com.eclipsesource.jshint</groupId>
88
<artifactId>com.eclipsesource.jshint.ui</artifactId>
9-
<version>0.9.11-SNAPSHOT</version>
9+
<version>0.10.0-SNAPSHOT</version>
1010
<packaging>eclipse-plugin</packaging>
1111

1212
<parent>
1313
<groupId>com.eclipsesource.jshint</groupId>
1414
<artifactId>com.eclipsesource.jshint.build</artifactId>
15-
<version>0.9.11-SNAPSHOT</version>
15+
<version>0.10.0-SNAPSHOT</version>
1616
<relativePath>../../pom.xml</relativePath>
1717
</parent>
1818

‎bundles/com.eclipsesource.jshint/META-INF/MANIFEST.MF

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: JSHint
44
Bundle-SymbolicName: com.eclipsesource.jshint
5-
Bundle-Version: 0.9.11.qualifier
5+
Bundle-Version: 0.10.0.qualifier
66
Bundle-RequiredExecutionEnvironment: J2SE-1.5
77
Bundle-Vendor: EclipseSource
88
Bundle-ActivationPolicy: lazy
9-
Export-Package: com.eclipsesource.jshint;version="0.9.11",
10-
com.eclipsesource.jshint.internal;version="0.9.11";x-friends:="com.eclipsesource.jshint.test",
9+
Export-Package: com.eclipsesource.jshint;version="0.10.0",
10+
com.eclipsesource.jshint.internal;version="0.10.0";x-friends:="com.eclipsesource.jshint.test",
1111
com.eclipsesource.json;version="0.9.0.jshint"
1212
Require-Bundle: org.mozilla.javascript;bundle-version="1.7.4"

‎bundles/com.eclipsesource.jshint/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66

77
<groupId>com.eclipsesource.jshint</groupId>
88
<artifactId>com.eclipsesource.jshint</artifactId>
9-
<version>0.9.11-SNAPSHOT</version>
9+
<version>0.10.0-SNAPSHOT</version>
1010
<packaging>eclipse-plugin</packaging>
1111

1212
<parent>
1313
<groupId>com.eclipsesource.jshint</groupId>
1414
<artifactId>com.eclipsesource.jshint.build</artifactId>
15-
<version>0.9.11-SNAPSHOT</version>
15+
<version>0.10.0-SNAPSHOT</version>
1616
<relativePath>../../pom.xml</relativePath>
1717
</parent>
1818

‎bundles/com.eclipsesource.jshint/src/com/eclipsesource/jshint/JSHint.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
*/
4848
public class JSHint {
4949

50-
private static final String DEFAULT_JSHINT_VERSION = "2.5.6";
50+
private static final String DEFAULT_JSHINT_VERSION = "2.9.0";
5151
private static final int DEFAULT_JSHINT_INDENT = 4;
5252
private ScriptableObject scope;
5353
private Function jshint;
@@ -259,7 +259,8 @@ private static String createShimCode() {
259259
// Create shims to prevent problems with JSHint accessing objects that are not available in
260260
// Rhino, e.g. https://github.com/jshint/jshint/issues/1038
261261
return "console = {log:function(){},error:function(){},trace:function(){}};"
262-
+ "window = {};";
262+
+ "window = {};"
263+
+ "global = this;";
263264
}
264265

265266
private static Function findJSHintFunction( ScriptableObject scope )

‎bundles/com.eclipsesource.jshint/src/com/jshint/jshint-2.9.0.js

Lines changed: 24090 additions & 0 deletions
Large diffs are not rendered by default.

‎pom.xml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
<groupId>com.eclipsesource.jshint</groupId>
1919
<artifactId>com.eclipsesource.jshint.build</artifactId>
20-
<version>0.9.11-SNAPSHOT</version>
20+
<version>0.10.0-SNAPSHOT</version>
2121
<packaging>pom</packaging>
2222

2323
<modules>
@@ -34,17 +34,17 @@
3434
<repository>
3535
<id>target-repo</id>
3636
<layout>p2</layout>
37-
<url>http://download.eclipse.org/releases/indigo/</url>
37+
<url>http://download.eclipse.org/releases/mars/</url>
3838
</repository>
3939
<repository>
4040
<id>orbit-repo</id>
4141
<layout>p2</layout>
42-
<url>http://download.eclipse.org/tools/orbit/downloads/drops/R20130827064939/repository/</url>
42+
<url>http://download.eclipse.org/tools/orbit/downloads/drops/R20150821153341/repository/</url>
4343
</repository>
4444
<repository>
4545
<id>swtbot-repo</id>
4646
<layout>p2</layout>
47-
<url>http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site</url>
47+
<url>http://download.eclipse.org/technology/swtbot/releases/2.3.0/</url>
4848
</repository>
4949
<repository>
5050
<id>mockito-all-repo</id>
@@ -101,7 +101,6 @@
101101
<dependency>
102102
<type>eclipse-feature</type>
103103
<artifactId>org.eclipse.rcp</artifactId>
104-
<version>0.0.0</version>
105104
</dependency>
106105
</configuration>
107106
</plugin>

‎releng/com.eclipsesource.jshint.feature/feature.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<feature
33
id="com.eclipsesource.jshint.feature"
44
label="JSHint Eclipse Integration"
5-
version="0.9.11.qualifier"
5+
version="0.10.0.qualifier"
66
provider-name="EclipseSource">
77

88
<description url="http://github.eclipsesource.com/jshint-eclipse/">

‎releng/com.eclipsesource.jshint.feature/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66

77
<groupId>com.eclipsesource.jshint</groupId>
88
<artifactId>com.eclipsesource.jshint.feature</artifactId>
9-
<version>0.9.11-SNAPSHOT</version>
9+
<version>0.10.0-SNAPSHOT</version>
1010
<packaging>eclipse-feature</packaging>
1111

1212
<parent>
1313
<groupId>com.eclipsesource.jshint</groupId>
1414
<artifactId>com.eclipsesource.jshint.build</artifactId>
15-
<version>0.9.11-SNAPSHOT</version>
15+
<version>0.10.0-SNAPSHOT</version>
1616
<relativePath>../../pom.xml</relativePath>
1717
</parent>
1818

‎releng/com.eclipsesource.jshint.repository/category.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<site>
3-
<feature url="../com.eclipsesource.jshint.feature" id="com.eclipsesource.jshint.feature" version="0.9.11.qualifier">
3+
<feature url="../com.eclipsesource.jshint.feature" id="com.eclipsesource.jshint.feature" version="0.10.0.qualifier">
44
<category name="com.eclipsesource.jshint"/>
55
</feature>
66
<category-def name="com.eclipsesource.jshint" label="JSHint">

‎releng/com.eclipsesource.jshint.repository/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66

77
<groupId>com.eclipsesource.jshint</groupId>
88
<artifactId>com.eclipsesource.jshint.repository</artifactId>
9-
<version>0.9.11-SNAPSHOT</version>
9+
<version>0.10.0-SNAPSHOT</version>
1010
<packaging>eclipse-repository</packaging>
1111

1212
<parent>
1313
<groupId>com.eclipsesource.jshint</groupId>
1414
<artifactId>com.eclipsesource.jshint.build</artifactId>
15-
<version>0.9.11-SNAPSHOT</version>
15+
<version>0.10.0-SNAPSHOT</version>
1616
<relativePath>../../pom.xml</relativePath>
1717
</parent>
1818

‎tests/com.eclipsesource.jshint.test/META-INF/MANIFEST.MF

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: Tests for JSHint Eclipse Integration
44
Bundle-SymbolicName: com.eclipsesource.jshint.test
5-
Bundle-Version: 0.9.11.qualifier
6-
Fragment-Host: com.eclipsesource.jshint;bundle-version="0.9.11"
5+
Bundle-Version: 0.10.0.qualifier
6+
Fragment-Host: com.eclipsesource.jshint;bundle-version="0.10.0"
77
Bundle-RequiredExecutionEnvironment: J2SE-1.5
88
Import-Package: org.junit;version="4.8.2",
99
org.junit.runner;version="4.8.2",
1010
org.junit.runners;version="4.8.2"
1111
Bundle-Vendor: EclipseSource
1212
Require-Bundle: org.hamcrest.core;bundle-version="1.1.0",
13-
org.mockito.mockito-all;bundle-version="[1.9.5,2.0.0)"
13+
org.mockito.mockito-all;bundle-version="[1.9.5,2.0.0)",
14+
org.eclipse.equinox.ds,
15+
org.eclipse.equinox.event

‎tests/com.eclipsesource.jshint.test/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66

77
<groupId>com.eclipsesource.jshint</groupId>
88
<artifactId>com.eclipsesource.jshint.test</artifactId>
9-
<version>0.9.11-SNAPSHOT</version>
9+
<version>0.10.0-SNAPSHOT</version>
1010
<packaging>eclipse-test-plugin</packaging>
1111

1212
<parent>
1313
<groupId>com.eclipsesource.jshint</groupId>
1414
<artifactId>com.eclipsesource.jshint.build</artifactId>
15-
<version>0.9.11-SNAPSHOT</version>
15+
<version>0.10.0-SNAPSHOT</version>
1616
<relativePath>../../pom.xml</relativePath>
1717
</parent>
1818

‎tests/com.eclipsesource.jshint.test/src/com/eclipsesource/jshint/JSHint_Compatibility_Test.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,12 @@ public static Collection<Object[]> getParameters() {
5353
{ "2.1.2" },
5454
{ "2.1.10" },
5555
{ "2.4.3" },
56-
{ "2.5.6" } } );
56+
{ "2.5.6" },
57+
{ "2.6.3" },
58+
{ "2.7.0" },
59+
{ "2.8.0" },
60+
{ "2.9.0" },
61+
} );
5762
}
5863

5964
public JSHint_Compatibility_Test( String version ) {

‎tests/com.eclipsesource.jshint.test/src/com/jshint/jshint-2.6.3.js

Lines changed: 12441 additions & 0 deletions
Large diffs are not rendered by default.

‎tests/com.eclipsesource.jshint.test/src/com/jshint/jshint-2.7.0.js

Lines changed: 17965 additions & 0 deletions
Large diffs are not rendered by default.

‎tests/com.eclipsesource.jshint.test/src/com/jshint/jshint-2.8.0.js

Lines changed: 23044 additions & 0 deletions
Large diffs are not rendered by default.

‎tests/com.eclipsesource.jshint.test/src/com/jshint/jshint-2.9.0.js

Lines changed: 24090 additions & 0 deletions
Large diffs are not rendered by default.

‎tests/com.eclipsesource.jshint.ui.test/META-INF/MANIFEST.MF

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: Tests for JSHint UI
44
Bundle-SymbolicName: com.eclipsesource.jshint.ui.test
5-
Bundle-Version: 0.9.11.qualifier
5+
Bundle-Version: 0.10.0.qualifier
66
Bundle-Vendor: EclipseSource
7-
Fragment-Host: com.eclipsesource.jshint.ui;bundle-version="0.9.11"
7+
Fragment-Host: com.eclipsesource.jshint.ui;bundle-version="0.10.0"
88
Bundle-RequiredExecutionEnvironment: J2SE-1.5
99
Import-Package: org.apache.log4j;version="[1.2.13,1.3.0)",
1010
org.eclipse.swt.custom,
@@ -13,4 +13,6 @@ Import-Package: org.apache.log4j;version="[1.2.13,1.3.0)",
1313
org.junit;version="4.8.2",
1414
org.junit.runner;version="4.8.2"
1515
Require-Bundle: org.hamcrest.core;bundle-version="1.1.0",
16-
org.mockito.mockito-all;bundle-version="[1.9.5,2.0.0)"
16+
org.mockito.mockito-all;bundle-version="[1.9.5,2.0.0)",
17+
org.eclipse.equinox.ds,
18+
org.eclipse.equinox.event

‎tests/com.eclipsesource.jshint.ui.test/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66

77
<groupId>com.eclipsesource.jshint</groupId>
88
<artifactId>com.eclipsesource.jshint.ui.test</artifactId>
9-
<version>0.9.11-SNAPSHOT</version>
9+
<version>0.10.0-SNAPSHOT</version>
1010
<packaging>eclipse-test-plugin</packaging>
1111

1212
<parent>
1313
<groupId>com.eclipsesource.jshint</groupId>
1414
<artifactId>com.eclipsesource.jshint.build</artifactId>
15-
<version>0.9.11-SNAPSHOT</version>
15+
<version>0.10.0-SNAPSHOT</version>
1616
<relativePath>../../pom.xml</relativePath>
1717
</parent>
1818

0 commit comments

Comments
 (0)