Release 2.0

Signed-off-by: Stefan Krueger <[email protected]>
CROSSINGTUD · Apr 7, 2020 · 19692b6 · 19692b6
1 parent d227a57
commit 19692b6
Show file tree

Hide file tree

Showing 19 changed files with 57 additions and 55 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -18,9 +18,9 @@ pipeline {
             steps {
                 withCredentials([usernamePassword(credentialsId: 'cognicrypt', usernameVariable: 'USER', passwordVariable: 'PASS')]) {
       		  		 sh '''
-                    sshpass -p $PASS ssh -p 22022 -o StrictHostKeyChecking=no [email protected] rm -rf /var/www/cognicrypt
-                    sshpass -p $PASS ssh -p 22022 -o StrictHostKeyChecking=no [email protected] mkdir -p /var/www/cognicrypt
-                    sshpass -p $PASS scp -P 22022 -r de.darmstadt.tu.crossing.CrySL.repository/target/repository/* [email protected]:/var/www/cognicrypt
+                    sshpass -p $PASS ssh -p 22022 -o StrictHostKeyChecking=no [email protected] rm -rf /var/www/cognicrypt/snapshot
+                    sshpass -p $PASS ssh -p 22022 -o StrictHostKeyChecking=no [email protected] mkdir -p /var/www/cognicrypt/snapshot
+                    sshpass -p $PASS scp -P 22022 -r de.darmstadt.tu.crossing.CrySL.repository/target/repository/* [email protected]:/var/www/cognicrypt/snapshot
                     '''
                }
 	        }

diff --git a/de.darmstadt.tu.crossing.CrySL.feature/feature.xml b/de.darmstadt.tu.crossing.CrySL.feature/feature.xml
@@ -2,7 +2,8 @@
 <feature
       id="de.darmstadt.tu.crossing.CrySL.feature"
       label="de.darmstadt.tu.crossing.CrySL.feature"
-      version="2.0.0.qualifier"
+      version="2.0.0"
+      provider-name="Technical University Darmstadt, Paderborn University"
       plugin="https://it.crossing.tu-darmstadt.de/cognicrypt/">
 
    <description>
@@ -138,21 +139,21 @@ Exhibit A – Form of Secondary Licenses Notice
          id="de.darmstadt.tu.crossing.CrySL"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="2.0.0"
          unpack="false"/>
 
    <plugin
          id="de.darmstadt.tu.crossing.CrySL.ide"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="2.0.0"
          unpack="false"/>
 
    <plugin
          id="de.darmstadt.tu.crossing.CrySL.ui"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="2.0.0"
          unpack="false"/>
 
 </feature>
diff --git a/de.darmstadt.tu.crossing.CrySL.feature/pom.xml b/de.darmstadt.tu.crossing.CrySL.feature/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>de.darmstadt.tu.crossing.CrySL</groupId>
 		<artifactId>de.darmstadt.tu.crossing.CrySL.parent</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.0</version>
 	</parent>
 	<groupId>de.darmstadt.tu.crossing.CrySL</groupId>
 </project>
diff --git a/de.darmstadt.tu.crossing.CrySL.ide/META-INF/MANIFEST.MF b/de.darmstadt.tu.crossing.CrySL.ide/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: de.darmstadt.tu.crossing.CrySL.ide
-Bundle-Vendor: My Company
-Bundle-Version: 2.0.0.qualifier
+Bundle-Vendor: Technical University Darmstadt, Paderborn University
+Bundle-Version: 2.0.0
 Bundle-SymbolicName: de.darmstadt.tu.crossing.CrySL.ide; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: de.darmstadt.tu.crossing.CrySL,

diff --git a/de.darmstadt.tu.crossing.CrySL.ide/pom.xml b/de.darmstadt.tu.crossing.CrySL.ide/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>de.darmstadt.tu.crossing.CrySL</groupId>
 		<artifactId>de.darmstadt.tu.crossing.CrySL.parent</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.0</version>
 	</parent>
 	<artifactId>de.darmstadt.tu.crossing.CrySL.ide</artifactId>
 	<packaging>eclipse-plugin</packaging>

diff --git a/de.darmstadt.tu.crossing.CrySL.repository/category.xml b/de.darmstadt.tu.crossing.CrySL.repository/category.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/de.darmstadt.tu.crossing.CrySL.feature_2.0.0.qualifier.jar" id="de.darmstadt.tu.crossing.CrySL.feature" version="2.0.0.qualifier">
+   <feature url="features/de.darmstadt.tu.crossing.CrySL.feature_2.0.0.jar" id="de.darmstadt.tu.crossing.CrySL.feature" version="2.0.0">
       <category name="CrySL"/>
    </feature>
    <category-def name="CrySL" label="CrySL"/>

diff --git a/de.darmstadt.tu.crossing.CrySL.repository/pom.xml b/de.darmstadt.tu.crossing.CrySL.repository/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>de.darmstadt.tu.crossing.CrySL</groupId>
 		<artifactId>de.darmstadt.tu.crossing.CrySL.parent</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.0</version>
 	</parent>
 	<groupId>de.darmstadt.tu.crossing.CrySL</groupId>
 	<build>

diff --git a/de.darmstadt.tu.crossing.CrySL.target/de.darmstadt.tu.crossing.CrySL.target.target b/de.darmstadt.tu.crossing.CrySL.target/de.darmstadt.tu.crossing.CrySL.target.target
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?>
-<target name="de.darmstadt.tu.crossing.CrySL.target" sequenceNumber="1">
-<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.draw2d.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.xpand" version="0.0.0"/>
-<unit id="org.eclipse.xtend" version="0.0.0"/>
-<unit id="org.eclipse.xtend.typesystem.emf" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/mars/201506241002/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.8.1/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.10.0/"/>
-</location>
-</locations>
-</target>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+<target name="de.darmstadt.tu.crossing.CrySL.target" sequenceNumber="1">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.draw2d.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.xpand" version="0.0.0"/>
+<unit id="org.eclipse.xtend" version="0.0.0"/>
+<unit id="org.eclipse.xtend.typesystem.emf" version="0.0.0"/>
+<repository location="http://download.eclipse.org/releases/2020-03/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.11.2/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.21.0/"/>
+</location>
+</locations>
+</target>
diff --git a/de.darmstadt.tu.crossing.CrySL.target/pom.xml b/de.darmstadt.tu.crossing.CrySL.target/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>de.darmstadt.tu.crossing.CrySL</groupId>
 		<artifactId>de.darmstadt.tu.crossing.CrySL.parent</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.0</version>
 	</parent>
 	<artifactId>de.darmstadt.tu.crossing.CrySL.target</artifactId>
 	<packaging>eclipse-target-definition</packaging>

diff --git a/de.darmstadt.tu.crossing.CrySL.tests/META-INF/MANIFEST.MF b/de.darmstadt.tu.crossing.CrySL.tests/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: de.darmstadt.tu.crossing.CrySL.tests
-Bundle-Vendor: My Company
-Bundle-Version: 2.0.0.qualifier
+Bundle-Vendor: Technical University Darmstadt, Paderborn University
+Bundle-Version: 2.0.0
 Bundle-SymbolicName: de.darmstadt.tu.crossing.CrySL.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: de.darmstadt.tu.crossing.CrySL,

diff --git a/de.darmstadt.tu.crossing.CrySL.tests/pom.xml b/de.darmstadt.tu.crossing.CrySL.tests/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>de.darmstadt.tu.crossing.CrySL</groupId>
 		<artifactId>de.darmstadt.tu.crossing.CrySL.parent</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.0</version>
 	</parent>
 	<artifactId>de.darmstadt.tu.crossing.CrySL.tests</artifactId>
 	<packaging>eclipse-test-plugin</packaging>

diff --git a/de.darmstadt.tu.crossing.CrySL.ui.tests/META-INF/MANIFEST.MF b/de.darmstadt.tu.crossing.CrySL.ui.tests/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: de.darmstadt.tu.crossing.CrySL.ui.tests
-Bundle-Vendor: My Company
-Bundle-Version: 2.0.0.qualifier
+Bundle-Vendor: Technical University Darmstadt, Paderborn University
+Bundle-Version: 2.0.0
 Bundle-SymbolicName: de.darmstadt.tu.crossing.CrySL.ui.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: de.darmstadt.tu.crossing.CrySL.ui,

diff --git a/de.darmstadt.tu.crossing.CrySL.ui.tests/pom.xml b/de.darmstadt.tu.crossing.CrySL.ui.tests/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>de.darmstadt.tu.crossing.CrySL</groupId>
 		<artifactId>de.darmstadt.tu.crossing.CrySL.parent</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.0</version>
 	</parent>
 	<artifactId>de.darmstadt.tu.crossing.CrySL.ui.tests</artifactId>
 	<packaging>eclipse-test-plugin</packaging>

diff --git a/de.darmstadt.tu.crossing.CrySL.ui/META-INF/MANIFEST.MF b/de.darmstadt.tu.crossing.CrySL.ui/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: de.darmstadt.tu.crossing.CrySL.ui
-Bundle-Vendor: My Company
-Bundle-Version: 2.0.0.qualifier
+Bundle-Vendor: Technical University Darmstadt, Paderborn University
+Bundle-Version: 2.0.0
 Bundle-SymbolicName: de.darmstadt.tu.crossing.CrySL.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: de.darmstadt.tu.crossing.CrySL,

diff --git a/de.darmstadt.tu.crossing.CrySL.ui/pom.xml b/de.darmstadt.tu.crossing.CrySL.ui/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>de.darmstadt.tu.crossing.CrySL</groupId>
 		<artifactId>de.darmstadt.tu.crossing.CrySL.parent</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.0</version>
 	</parent>
 	<artifactId>de.darmstadt.tu.crossing.CrySL.ui</artifactId>
 	<packaging>eclipse-plugin</packaging>

diff --git a/de.darmstadt.tu.crossing.CrySL/META-INF/MANIFEST.MF b/de.darmstadt.tu.crossing.CrySL/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: de.darmstadt.tu.crossing.CrySL
-Bundle-Vendor: My Company
-Bundle-Version: 2.0.0.qualifier
+Bundle-Vendor: Technical University Darmstadt, Paderborn University
+Bundle-Version: 2.0.0
 Bundle-SymbolicName: de.darmstadt.tu.crossing.CrySL; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.xtext,
@@ -36,5 +36,6 @@ Export-Package: de.darmstadt.tu.crossing,
  de.darmstadt.tu.crossing.serializer,
  de.darmstadt.tu.crossing.services,
  de.darmstadt.tu.crossing.validation
-Import-Package: org.eclipse.jdt.core.dom
+Import-Package: org.eclipse.jdt.core.dom,
+ org.apache.log4j
 Automatic-Module-Name: de.darmstadt.tu.crossing.CrySL
diff --git a/de.darmstadt.tu.crossing.CrySL/pom.xml b/de.darmstadt.tu.crossing.CrySL/pom.xml
@@ -5,9 +5,9 @@
 	<parent>
 		<groupId>de.darmstadt.tu.crossing.CrySL</groupId>
 		<artifactId>de.darmstadt.tu.crossing.CrySL.parent</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.0</version>
 	</parent>
-	<version>2.0.0-SNAPSHOT</version>
+	<version>2.0.0</version>
 	<artifactId>de.darmstadt.tu.crossing.CrySL</artifactId>
 	<packaging>eclipse-plugin</packaging>
 

diff --git a/...tu.crossing.CrySL/src-gen/de/darmstadt/tu/crossing/serializer/CrySLSemanticSequencer.java b/...tu.crossing.CrySL/src-gen/de/darmstadt/tu/crossing/serializer/CrySLSemanticSequencer.java
@@ -1015,7 +1015,7 @@ protected void sequence_Pred(ISerializationContext context, Pred semanticObject)
 	 *     Primary returns Expression
 	 *
 	 * Constraint:
-	 *     ((orderEv+=[Event|ID] (elementop='+' | elementop='?' | elementop='*')?)? elementop='+'? ((elementop='?' | elementop='*')? elementop='+'?)*)
+	 *     ((orderEv+=[Event|ID] (elementop='+' | elementop='?' | elementop='*')?)? elementop='?'? ((elementop='+' | elementop='*')? elementop='?'?)*)
 	 */
 	protected void sequence_Primary(ISerializationContext context, Expression semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.darmstadt.tu.crossing.CrySL</groupId>
-	<version>2.0.0-SNAPSHOT</version>
+	<version>2.0.0</version>
 	<artifactId>de.darmstadt.tu.crossing.CrySL.parent</artifactId>
 	<packaging>pom</packaging>