Updated to internal MD distribution and v4md 2.4.1

GH-13

.gitignore

@@ -1,5 +1,5 @@
 *.mdzip.bak
-/.gradle/
+.gradle/
 .settings
 !**/.settings/org.eclipse.viatra.query.patternlanguage.emf.EMFPatternLanguage.prefs
 .classpath

Jenkinsfile

@@ -36,7 +36,7 @@ pipeline {
 		)
 	}
 
-    // Keep only the last 15 builds
+    // Keep only the last 5 builds
 	options {
 		buildDiscarder(logRotator(numToKeepStr: '5'))
 	}
@@ -45,30 +45,28 @@ pipeline {
         jdk 'OpenJDK 8' 
     }
 
-    stages { 
+    stages {
+		environment {
+			# WORKSPACE_BENCHMARK is used as on client-side 3rd applications (e.g. git on Windows) 
+			# overrides the $WORKSPACE variable during their execution
+			WORKSPACE_BENCHMARK=$WORKSPACE
+			MODEL_LOCATION=/home/jenkins/models-tmt
+		}
         stage('Build') { 
 			steps {
-				sh '''
-					# WORKSPACE_BENCHMARK is used as on client-side 3rd applications (e.g. git on Windows) 
-					# overrides the $WORKSPACE variable during their execution
-					export WORKSPACE_BENCHMARK=$WORKSPACE
-					rm -rf benhmark/results
-					rm -rf benhmark/diagrams
-				    cd com.incquerylabs.magicdraw.benchmark
-				    rm -rf results
-				    rm -rf build/dependency-cache
-				    ./gradlew clean
-				    ./gradlew installDist
-				'''
+				withCredentials([usernamePassword(credentialsId: 'nexus-buildserver-deploy', passwordVariable: 'DEPLOY_PASSWORD', usernameVariable: 'DEPLOY_USER')]) {
+					dir ('com.incquerylabs.magicdraw.benchmark') {
+						sh "./gradlew clean installDist -PnexusUsername=$DEPLOY_USER -PnexusPassword=$DEPLOY_PASSWORD --stacktrace"
+					}
+				}
 			}
 		}
 		stage('Benchmark') {
             steps {
             	wrap([$class: 'Xvnc']) {
-					sh '''
-						export MODEL_LOCATION=/home/jenkins/models-tmt
-				    	./com.incquerylabs.magicdraw.benchmark/run.sh
-					'''
+					dir ('com.incquerylabs.magicdraw.benchmark') {
+						sh './run.sh'
+					}
             	}
 			}
 		}

com.incquerylabs.magicdraw.benchmark/build.gradle

@@ -52,12 +52,13 @@ sourceSets {
 
 // In this section you declare where to find the dependencies of your project
 repositories {
-    ivy {
-        url 'http://download1.nomagic.com/'
-        layout 'pattern', {
-            artifact '/[module][revision]/[classifier].[ext]'
-        }
-    } 
+    maven {
+	    url "https://build.incquerylabs.com/nexus/repository/nomagic-binaries/"
+	    credentials {
+		    username = "$nexusUsername"
+		    password = "$nexusPassword"
+		}
+	}
     jcenter()
     mavenCentral()
 	maven { url 'https://build.incquerylabs.com/nexus/repository/v4md/' }
@@ -89,8 +90,7 @@ dependencies {
         exclude module: 'org.eclipse.xtext.xtext.generator' //version number replacement        
     }
 
-    preCompile group: 'com.nomagic', name: 'magicdraw', version: '190', classifier: 'MagicDraw_190_no_install', ext: 'zip'
-    preCompile group: 'com.nomagic', name: 'sysml', version: '190', classifier: 'SysML_Plugin_190_bundle', ext: 'zip'
+    preCompile group: 'com.nomagic', name: 'csm', version: '190sp4', classifier: 'no_install', ext: 'zip'
     preCompile group: 'com.incquerylabs.v4md', name: 'com.incquerylabs.v4md', version: v4mdVersion, classifier: 'plugin', ext: 'zip'
 
     compile group: 'org.eclipse.viatra', name: 'viatra-query-language', version: viatraVersion, exclusions
@@ -387,3 +387,10 @@ task preparePluginDistributions {
 preparePluginDistributions.dependsOn installDist
 
 
+clean {
+    doFirst {
+        delete('../benhmark/results')
+        delete('../benhmark/diagrams')
+        delete('results')
+    }
+}

com.incquerylabs.magicdraw.benchmark/gradle.properties

@@ -3,6 +3,6 @@ pluginName = Benchmark Plugin
 group=com.incquerylabs.magicdraw.benchmark
 descriptorFile=MDR_Example_Plugin_18351_descriptor.xml
 magicDrawGroupName=com.incquerylabs.magicdraw.benchmark
-viatraVersion=2.3.0.M4
-v4mdVersion=2.3.0.M4
+viatraVersion=2.4.1
+v4mdVersion=2.4.1
 xtextVersion=2.18.0