Merge remote-tracking branch 'upstream/master'

PriyaGovind · Sep 27, 2019 · c07d88b · c07d88b
2 parents ccf8d0e + 3fa8368
commit c07d88b
Show file tree

Hide file tree

Showing 463 changed files with 24,476 additions and 8,795 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -23,14 +23,16 @@ pipeline {
         stage("build") {
             steps {
                 checkout scm;
-                sh "mvn -Pplugins -Pplatforms -P!tests -P!deployment -Psign -f bundles/pom.xml clean install"
+                // clean local copies of mita artifacts
+                sh 'rm -rf /opt/public/hipp/homes/genie.mita/.m2/repository/org/eclipse/mita/'
+                sh "mvn -U -Pplugins -Pplatforms -P!tests -P!deployment -Psign -f bundles/pom.xml clean install"
             }
         }
 
         stage('base tests') {
             steps {
                 wrap([$class:'Xvnc', useXauthority: true]) {
-                    sh "mvn -P!plugins -P!platforms -Ptests -P!deployment -P!sign -f bundles/pom.xml install"
+                    sh "mvn -P!plugins -P!platforms -Ptests -P!deployment -P!sign -f bundles/pom.xml clean install"
                 }
             }
             post {
@@ -42,7 +44,7 @@ pipeline {
 
         stage("deploy") {
             steps {
-                sh "mvn -P!plugins -P!platforms -P!tests -Pdeployment -Psign -f bundles/pom.xml install"
+                sh "mvn -P!plugins -P!platforms -P!tests -Pdeployment -Psign -f bundles/pom.xml clean install"
             }
             post {
                 always {

diff --git a/bundles/org.eclipse.mita.base.ide/META-INF/MANIFEST.MF b/bundles/org.eclipse.mita.base.ide/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Mita Type Definition Language IDE
 Bundle-Vendor: Eclipse.org/Mita
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 0.2.0.qualifier
 Bundle-SymbolicName: org.eclipse.mita.base.ide; singleton:=true
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.mita.base.ide
 Require-Bundle: org.eclipse.mita.base,
  org.eclipse.xtext.ide,
  org.eclipse.xtext.xbase.ide,
  org.antlr.runtime
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.mita.base.ide.contentassist.antlr,
  org.eclipse.mita.base.ide.contentassist.antlr.internal
-
diff --git a/bundles/org.eclipse.mita.base.ide/build.properties b/bundles/org.eclipse.mita.base.ide/build.properties
@@ -1,3 +1,5 @@
-source.. = src-gen/
+source.. = src-gen/,\
+		   src/,\
+		   xtend-gen/
 bin.includes = .,\
                META-INF/
diff --git a/bundles/org.eclipse.mita.base.ide/pom.xml b/bundles/org.eclipse.mita.base.ide/pom.xml
@@ -4,12 +4,12 @@
 	<parent>
 		<groupId>org.eclipse.mita</groupId>
 		<artifactId>org.eclipse.mita.releng</artifactId>
-		<version>0.1.0-SNAPSHOT</version>
+		<version>0.2.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.eclipse.mita</groupId>
 	<artifactId>org.eclipse.mita.base.ide</artifactId>
-	<version>0.1.0-SNAPSHOT</version>
+	<version>0.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.mita.base.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.mita.base.ui/META-INF/MANIFEST.MF
@@ -2,9 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Mita Type Definition Language UI
 Bundle-Vendor: Eclipse.org/Mita
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 0.2.0.qualifier
 Bundle-SymbolicName: org.eclipse.mita.base.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.mita.base.ui
 Require-Bundle: org.eclipse.mita.base,
  org.eclipse.mita.base.ide,
  org.eclipse.xtext.ui,
@@ -20,6 +21,7 @@ Require-Bundle: org.eclipse.mita.base,
 Import-Package: org.apache.log4j
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.mita.base.ui.contentassist,
+ org.eclipse.mita.base.ui.index,
  org.eclipse.mita.base.ui.internal,
  org.eclipse.mita.base.ui.opener,
  org.eclipse.mita.base.ui.quickfix

diff --git a/bundles/org.eclipse.mita.base.ui/plugin.xml b/bundles/org.eclipse.mita.base.ui/plugin.xml
@@ -408,4 +408,14 @@
 			type="text">
 		</fileTypes>
 	</extension>
+ <extension
+       point="org.eclipse.ui.views">
+    <view
+          allowMultiple="false"
+          class="org.eclipse.mita.base.ui.MitaTypesDebugView"
+          id="org.eclipse.mita.base.ui.typesDebug"
+          name="Types"
+          restorable="true">
+    </view>
+ </extension>
 </plugin>
diff --git a/bundles/org.eclipse.mita.base.ui/pom.xml b/bundles/org.eclipse.mita.base.ui/pom.xml
@@ -4,12 +4,12 @@
 	<parent>
 		<groupId>org.eclipse.mita</groupId>
 		<artifactId>org.eclipse.mita.releng</artifactId>
-		<version>0.1.0-SNAPSHOT</version>
+		<version>0.2.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.eclipse.mita</groupId>
 	<artifactId>org.eclipse.mita.base.ui</artifactId>
-	<version>0.1.0-SNAPSHOT</version>
+	<version>0.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	<build>
 		<plugins>