Merge commit '9f76c5cd'

Conflicts:
	.gitignore
	build.gradle

.gitignore

+local.*
 /bin
 /build
 /gradle

.travis.yml

+language: java
+
+script: gradle tla2b check uploadArchives
+
+before_install:
+- openssl aes-256-cbc -pass pass:$ENCRYPTION_PASSWORD -in secring.gpg.enc -out secring.gpg
+  -d
+- openssl aes-256-cbc -pass pass:$ENCRYPTION_PASSWORD -in pubring.gpg.enc -out pubring.gpg
+  -d
+- openssl aes-256-cbc -pass pass:$ENCRYPTION_PASSWORD -in gradle.properties.enc -out
+  gradle.properties -d
+
+after_success: find TLA2B.jar -type f -exec
+  curl -u $FTP_USER:$FTP_PASS --ftp-create-dirs -T {} ftp://cobra.cs.uni-duesseldorf.de/upload/{}
+  \;
+
+env:
+  global:
+  - secure: RSWp6NRFm5iSK76fm6Ms1FLyUKMKhXt1JrUAQ6x558R73mT7SUvdKbBn9Ffh+TiNO6JVsma3KFoHvYnx8Ys6OGipyXW8g2DKiyg3jm2im4HTtxJqpp7Rls0gm0jGpjOOLwkWl719DZLC6+cPoUuGWtAk8FbowkBz1uWySnJSltI=
+  - secure: COBSC/26p1nTF3rZgSdy1iz7biCnwULsTrc5R6HvcZwlve8jtMej6Nr0oecjcAFvZaaKrEZTSSRtI3W5gwC5Jxpffgrf0ZmJPXg1BPwamve97s7Gyhfb1wyJWRPOkt71AVqBXe6yvSnjm5jeExsE+mUIpurmG9eUaWGDU8gXRv0=
+  - secure: G0dFwNmRNpxhqUYJyx+Ua7/Grb+AMLCipOuysyeR6ImRPHCwI1i5Hd5pPnRqq30psTiWllFc5eijqVvx19bLIUARG0pH7rUBcKNeL0R9THpJcflOO3NNAx5wF01jpuK0CnkDfnz90FDpjvB6vPi2NCInMKypuozxMsMZVnhzm90=

README

-tla2bAST
\ No newline at end of file

README.md

+# tla2bAST
+
+[![Build Status](https://travis-ci.org/hhu-stups/tla2bAST.svg)](https://travis-ci.org/hhu-stups/tla2bAST)

build.gradle

@@ -4,13 +4,20 @@ apply plugin: 'maven'
 apply plugin: 'jacoco'
 apply plugin: 'findbugs'
 
-project.version = '1.0.5-SNAPSHOT'
-project.group = 'de.prob'
+project.version = '1.0.8-SNAPSHOT'
+project.group = 'de.hhu.stups'
+project.archivesBaseName = "tla2bAST"
+
 
 
 repositories {
 	mavenCentral()
         maven {
+		name "sonatype snapshots"
+		url "https://oss.sonatype.org/content/repositories/snapshots"
+	}
+	maven {
+		name "cobra"
 		url "http://cobra.cs.uni-duesseldorf.de/artifactory/repo"
 	}
 }
@@ -27,22 +34,22 @@ def parser_version = '2.5.0-SNAPSHOT'
 
 dependencies {
 	//compile (group: 'com.microsoft', name: 'tla2tools', version: '1.4.6')
-	compile (group: 'de.tla', name: 'tlatools', version: '1.0.0-SNAPSHOT')
+	compile (group: 'de.hhu.stups', name: 'tlatools', version: '1.0.0')
 
-	compile (group: 'de.prob', name: 'prologlib', version: parser_version)
-	compile (group: 'de.prob', name: 'parserbase', version: parser_version)
-	compile (group: 'de.prob', name: 'bparser', version: parser_version)
-	compile (group: 'de.prob', name: 'ltlparser', version: parser_version)
+	compile (group: 'de.hhu.stups', name: 'prologlib', version: parser_version)
+	compile (group: 'de.hhu.stups', name: 'parserbase', version: parser_version)
+	compile (group: 'de.hhu.stups', name: 'bparser', version: parser_version)
+	compile (group: 'de.hhu.stups', name: 'ltlparser', version: parser_version)
 
 	//compile(group: 'de.prob', name: 'de.prob.core.kernel', version: '2.0.0-milestone-13-SNAPSHOT')
 
 	testCompile (group: 'junit', name: 'junit', version: '4.7')
 
-	releaseJars (group: 'de.tla', name: 'tlatools', version: '1.0.0-SNAPSHOT')
-	releaseJars (group: 'de.prob', name: 'prologlib', version: parser_version)
-	releaseJars (group: 'de.prob', name: 'parserbase', version: parser_version)
-	releaseJars (group: 'de.prob', name: 'bparser', version: parser_version)
-	releaseJars (group: 'de.prob', name: 'ltlparser', version: parser_version)
+	releaseJars (group: 'de.hhu.stups', name: 'tlatools', version: '1.0.0')
+	releaseJars (group: 'de.hhu.stups', name: 'prologlib', version: parser_version)
+	releaseJars (group: 'de.hhu.stups', name: 'parserbase', version: parser_version)
+	releaseJars (group: 'de.hhu.stups', name: 'bparser', version: parser_version)
+	releaseJars (group: 'de.hhu.stups', name: 'ltlparser', version: parser_version)
 }
 
 jacoco {
@@ -90,8 +97,78 @@ jar {
 task tla2b(dependsOn: build) << {
 	copy {
 		from('build/libs/')
-		into('build/tla2b')
+		into('.')
 		include('tla2bAST-'+project.version+'.jar')
 		rename('tla2bAST-(.+)', 'TLA2B.jar')
 	}
 }
+
+if (project.hasProperty('ossrhUsername') && project.hasProperty('ossrhPassword')) {
+
+apply plugin: 'signing'
+
+signing {
+    sign configurations.archives
+}
+
+
+task javadocJar(type: Jar) {
+	 classifier = 'javadoc'
+	 from javadoc
+}
+
+task sourcesJar(type: Jar) {
+	 classifier = 'sources'
+	 from sourceSets.main.allSource
+}
+
+artifacts {
+	 archives javadocJar, sourcesJar
+}
+
+uploadArchives {
+  repositories {
+    mavenDeployer {
+      beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+
+      repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
+        authentication(userName: ossrhUsername, password: ossrhPassword)
+      }
+
+      snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
+        authentication(userName: ossrhUsername, password: ossrhPassword)
+      }
+
+      pom.project {
+        name 'TLA+ to B-AST'
+        packaging 'jar'
+        // optionally artifactId can be defined here
+        description "Translator from TLA+ to ProB's AST representation."
+        url 'https://github.com/hhu-stups/tla2bAST'
+
+        licenses {
+          license {
+            name 'Eclipse Public License, Version 1.0'
+            url 'https://www.eclipse.org/legal/epl-v10.html'
+          }
+        }
+
+        scm {
+          connection 'scm:git:git://github.com/hhu-stups/tla2bAST.git'
+          developerConnection 'scm:git:git@github.com:hhu-stups/tla2bAST.git'
+          url 'https://github.com/bendisposto/hhu-stups/tla2bAST'
+        }
+
+
+        developers {
+          developer {
+            id 'bendisposto'
+            name 'Jens Bendisposto'
+            email 'jens@bendisposto.de'
+          }
+        }
+      }
+    }
+  }
+}
+}