bump versions from 1.8 to 2.1

sixinli · sixinli · commit 911c0cf185fe · 2017-01-06T23:21:12.000-05:00
diff --git a/com.palantir.typescript.feature/feature.xml b/com.palantir.typescript.feature/feature.xml
@@ -17,7 +17,7 @@
 <feature
       id="com.palantir.typescript.feature"
       label="TypeScript"
-      version="1.8.0.qualifier"
+      version="2.1.0.qualifier"
       provider-name="Palantir Technologies, Inc.">
 
    <description url="https://github.com/palantir/eclipse-typescript">
@@ -237,6 +237,6 @@
          id="com.palantir.typescript"
          download-size="0"
          install-size="0"
-         version="1.8.0.qualifier"/>
+         version="2.1.0.qualifier"/>
 
 </feature>
diff --git a/com.palantir.typescript.feature/pom.xml b/com.palantir.typescript.feature/pom.xml
@@ -21,7 +21,7 @@
     <relativePath>../pom.xml</relativePath>
     <groupId>com.palantir</groupId>
     <artifactId>parent</artifactId>
-    <version>1.8.0.qualifier</version>
+    <version>2.1.0.qualifier</version>
   </parent>
 
   <artifactId>com.palantir.typescript.feature</artifactId>
diff --git a/com.palantir.typescript.p2updatesite/category.xml b/com.palantir.typescript.p2updatesite/category.xml
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 <site>
-   <feature url="features/com.palantir.typescript.feature_1.8.0.qualifier.jar" id="com.palantir.typescript.feature" version="1.8.0.qualifier">
+   <feature url="features/com.palantir.typescript.feature_2.1.0.qualifier.jar" id="com.palantir.typescript.feature" version="2.1.0.qualifier">
       <category name="com.palantir.typescript"/>
    </feature>
    <category-def name="com.palantir.typescript" label="TypeScript"/>
diff --git a/com.palantir.typescript.p2updatesite/pom.xml b/com.palantir.typescript.p2updatesite/pom.xml
@@ -21,7 +21,7 @@
     <relativePath>../pom.xml</relativePath>
     <groupId>com.palantir</groupId>
     <artifactId>parent</artifactId>
-    <version>1.8.0.qualifier</version>
+    <version>2.1.0.qualifier</version>
   </parent>
 
   <artifactId>com.palantir.typescript.p2updatesite</artifactId>
diff --git a/com.palantir.typescript/.classpath b/com.palantir.typescript/.classpath
@@ -2,10 +2,11 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="lib" path="lib/guava-19.0.jar" sourcepath="lib/guava-19.0-sources.jar"/>
-	<classpathentry kind="lib" path="lib/jackson-annotations-2.7.2.jar"/>
-	<classpathentry kind="lib" path="lib/jackson-core-2.7.2.jar"/>
-	<classpathentry kind="lib" path="lib/jackson-databind-2.7.2.jar"/>
-	<classpathentry kind="output" path="ecbuild"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry exported="true" kind="lib" path="lib/jackson-annotations-2.7.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jackson-core-2.7.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jackson-databind-2.7.2.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/com.palantir.typescript/.project b/com.palantir.typescript/.project
@@ -30,8 +30,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
diff --git a/com.palantir.typescript/META-INF/MANIFEST.MF b/com.palantir.typescript/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
 Bundle-Name: TypeScript
 Bundle-SymbolicName: com.palantir.typescript;singleton:=true
-Bundle-Version: 1.8.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Activator: com.palantir.typescript.TypeScriptPlugin
 Bundle-Vendor: Palantir Technologies
 Require-Bundle: org.eclipse.compare,
diff --git a/com.palantir.typescript/pom.xml b/com.palantir.typescript/pom.xml
@@ -21,7 +21,7 @@
     <relativePath>../pom.xml</relativePath>
     <groupId>com.palantir</groupId>
     <artifactId>parent</artifactId>
-    <version>1.8.0.qualifier</version>
+    <version>2.1.0.qualifier</version>
   </parent>
 
   <artifactId>com.palantir.typescript</artifactId>
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eclipse-typescript",
-  "version": "1.8.0",
+  "version": "2.1.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/palantir/eclipse-typescript.git"
@@ -9,6 +9,7 @@
     "grunt": "1.0.1",
     "grunt-contrib-concat": "^1.0.1",
     "grunt-contrib-watch": "^1.0.0",
-    "grunt-ts": "5.5.1"
+    "grunt-ts": "6.0.0-beta.3",
+    "typescript": "2.1.4"
   }
 }
diff --git a/pom.xml b/pom.xml
@@ -19,7 +19,7 @@
 
   <groupId>com.palantir</groupId>
   <artifactId>parent</artifactId>
-  <version>1.8.0.qualifier</version>
+  <version>2.1.0.qualifier</version>
   <packaging>pom</packaging>
 
   <modules>
diff --git a/scripts/updateTypeScript.sh b/scripts/updateTypeScript.sh
@@ -6,7 +6,7 @@ set -e
 (
   cd ../TypeScript
   git fetch
-  git checkout origin/release-1.8
+  git checkout origin/release-2.1
   rm -rf built/local
   jake clean
   jake local

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "eclipse-typescript",`
`3`		`- "version": "1.8.0",`
	`3`	`+ "version": "2.1.0",`
`4`	`4`	`"repository": {`
`5`	`5`	`"type": "git",`
`6`	`6`	`"url": "https://github.com/palantir/eclipse-typescript.git"`
`@@ -9,6 +9,7 @@`
`9`	`9`	`"grunt": "1.0.1",`
`10`	`10`	`"grunt-contrib-concat": "^1.0.1",`
`11`	`11`	`"grunt-contrib-watch": "^1.0.0",`
`12`		`- "grunt-ts": "5.5.1"`
	`12`	`+ "grunt-ts": "6.0.0-beta.3",`
	`13`	`+ "typescript": "2.1.4"`
`13`	`14`	`}`
`14`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ set -e`
`6`	`6`	`(`
`7`	`7`	`cd ../TypeScript`
`8`	`8`	`git fetch`
`9`		`- git checkout origin/release-1.8`
	`9`	`+ git checkout origin/release-2.1`
`10`	`10`	`rm -rf built/local`
`11`	`11`	`jake clean`
`12`	`12`	`jake local`