Merge remote-tracking branch 'upstream/develop' into testgen

eclipse-cognicrypt · May 18, 2020 · 6c01d28 · 6c01d28
2 parents 280968c + 01a11b0
commit 6c01d28
Show file tree

Hide file tree

Showing 146 changed files with 5,696 additions and 3,880 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,4 @@ bin/
 target/
 .metadata/
 .recommenders/
-*.cryptslbin
+*.cryslbin
diff --git a/features/de.cognicrypt.codegenerator.feature/.project b/features/de.cognicrypt.codegenerator.feature/.project
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>de.cognicrypt.codegenerator.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>de.cognicrypt.codegenerator.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/features/de.cognicrypt.codegenerator.feature/pom.xml b/features/de.cognicrypt.codegenerator.feature/pom.xml
@@ -1,13 +1,12 @@
-<project
-	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>
-	<artifactId>de.cognicrypt.codegenerator.feature</artifactId>
-	<packaging>eclipse-feature</packaging>
-	<parent>
-		<groupId>de.cognicrypt</groupId>
-		<artifactId>de.cognicrypt.parent</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../../pom.xml</relativePath>
-	</parent>
-	<groupId>de.cognicrypt</groupId>
-</project>
+<project
+	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>
+	<artifactId>de.cognicrypt.codegenerator.feature</artifactId>
+	<packaging>eclipse-feature</packaging>
+	<parent>
+		<groupId>de.cognicrypt</groupId>
+		<artifactId>de.cognicrypt.parent</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+		<relativePath>../../pom.xml</relativePath>
+	</parent>
+	</project>
diff --git a/features/de.cognicrypt.core.feature/pom.xml b/features/de.cognicrypt.core.feature/pom.xml
@@ -1,13 +1,13 @@
-<project
-	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>
-	<artifactId>de.cognicrypt.core.feature</artifactId>
-	<packaging>eclipse-feature</packaging>
-	<parent>
-		<groupId>de.cognicrypt</groupId>
-		<artifactId>de.cognicrypt.parent</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../../pom.xml</relativePath>
-	</parent>
-	<groupId>de.cognicrypt</groupId>
-</project>
+<project
+	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>
+	<artifactId>de.cognicrypt.core.feature</artifactId>
+	<packaging>eclipse-feature</packaging>
+	<parent>
+		<groupId>de.cognicrypt</groupId>
+		<artifactId>de.cognicrypt.parent</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+		<relativePath>../../pom.xml</relativePath>
+	</parent>
+	<groupId>de.cognicrypt</groupId>
+</project>
diff --git a/features/de.cognicrypt.cryslhandler.feature/feature.xml b/features/de.cognicrypt.cryslhandler.feature/feature.xml
@@ -112,9 +112,9 @@ Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives n
       <import plugin="org.eclipse.jdt.core"/>
       <import plugin="org.eclipse.xtext"/>
       <import plugin="org.eclipse.xtext.common.types.ui"/>
-      <import plugin="de.darmstadt.tu.crossing.CryptSL.ui" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="de.darmstadt.tu.crossing.CryptSL" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="de.darmstadt.tu.crossing.CryptSL.ide" version="1.0.0" match="greaterOrEqual"/>
+      <import plugin="de.darmstadt.tu.crossing.CrySL.ui" version="2.0.0" match="perfect"/>
+      <import plugin="de.darmstadt.tu.crossing.CrySL" version="2.0.0" match="perfect"/>
+      <import plugin="de.darmstadt.tu.crossing.CrySL.ide" version="2.0.0" match="perfect"/>
       <import plugin="de.cognicrypt.core" version="1.0.0" match="greaterOrEqual"/>
       <import plugin="org.junit"/>
    </requires>

diff --git a/features/de.cognicrypt.cryslhandler.feature/pom.xml b/features/de.cognicrypt.cryslhandler.feature/pom.xml
@@ -1,13 +1,12 @@
-<project
-	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>
-	<artifactId>de.cognicrypt.cryslhandler.feature</artifactId>
-	<packaging>eclipse-feature</packaging>
-	<parent>
-		<groupId>de.cognicrypt</groupId>
-		<artifactId>de.cognicrypt.parent</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../../pom.xml</relativePath>
-	</parent>
-	<groupId>de.cognicrypt</groupId>
-</project>
+<project
+	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>
+	<artifactId>de.cognicrypt.cryslhandler.feature</artifactId>
+	<packaging>eclipse-feature</packaging>
+	<parent>
+		<groupId>de.cognicrypt</groupId>
+		<artifactId>de.cognicrypt.parent</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+		<relativePath>../../pom.xml</relativePath>
+	</parent>
+</project>
diff --git a/features/de.cognicrypt.staticanalyzer.feature/.project b/features/de.cognicrypt.staticanalyzer.feature/.project
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>de.cognicrypt.staticanalyzer.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>de.cognicrypt.staticanalyzer.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/features/de.cognicrypt.staticanalyzer.feature/pom.xml b/features/de.cognicrypt.staticanalyzer.feature/pom.xml
@@ -1,13 +1,13 @@
-<project
-	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>
-	<artifactId>de.cognicrypt.staticanalyzer.feature</artifactId>
-	<packaging>eclipse-feature</packaging>
-	<parent>
-		<groupId>de.cognicrypt</groupId>
-		<artifactId>de.cognicrypt.parent</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../../pom.xml</relativePath>
-	</parent>
-	<groupId>de.cognicrypt</groupId>
-</project>
+<project
+	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>
+	<artifactId>de.cognicrypt.staticanalyzer.feature</artifactId>
+	<packaging>eclipse-feature</packaging>
+	<parent>
+		<groupId>de.cognicrypt</groupId>
+		<artifactId>de.cognicrypt.parent</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+		<relativePath>../../pom.xml</relativePath>
+	</parent>
+	<groupId>de.cognicrypt</groupId>
+</project>
diff --git a/plugins/de.cognicrypt.codegenerator.tests/.classpath b/plugins/de.cognicrypt.codegenerator.tests/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

diff --git a/plugins/de.cognicrypt.codegenerator.tests/META-INF/MANIFEST.MF b/plugins/de.cognicrypt.codegenerator.tests/META-INF/MANIFEST.MF
@@ -1,11 +1,12 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: CogniCrypt-CodeGenerator_Plug-inTests
-Bundle-SymbolicName: de.cognicrypt.codegenerator.tests;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Fragment-Host: de.cognicrypt.codegenerator;bundle-version="1.0.0"
-Require-Bundle: org.eclipse.jdt.launching,
- de.cognicrypt.core
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-ClassPath: lib/claferchocoig.jar,src/
-Export-Package: de.cognicrypt.codegenerator
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: CogniCrypt-CodeGenerator_Plug-inTests
+Bundle-SymbolicName: de.cognicrypt.codegenerator.tests;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Fragment-Host: de.cognicrypt.codegenerator;bundle-version="1.0.0"
+Require-Bundle: org.eclipse.jdt.launching,
+ de.cognicrypt.core
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-ClassPath: lib/claferchocoig.jar,src/
+Export-Package: de.cognicrypt.codegenerator
+Automatic-Module-Name: de.cognicrypt.codegenerator.tests
diff --git a/plugins/de.cognicrypt.codegenerator.tests/build.properties b/plugins/de.cognicrypt.codegenerator.tests/build.properties
@@ -1,4 +1,3 @@
 source.. = src/
-output.. = bin/
 bin.includes = META-INF/,\
-			   lib/claferchocoig.jar,\
+			   lib/claferchocoig.jar,\
diff --git a/plugins/de.cognicrypt.codegenerator.tests/pom.xml b/plugins/de.cognicrypt.codegenerator.tests/pom.xml
@@ -1,59 +1,59 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>de.cognicrypt</groupId>
-		<artifactId>de.cognicrypt.parent</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../../pom.xml</relativePath>
-	</parent>
-
-	<groupId>de.cognicrypt</groupId>
-	<artifactId>de.cognicrypt.codegenerator.tests</artifactId>
-	<packaging>eclipse-test-plugin</packaging>
-
-	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.eclipse.m2e</groupId>
-					<artifactId>lifecycle-mapping</artifactId>
-					<version>1.0.0</version>
-					<configuration>
-						<lifecycleMappingMetadata>
-							<pluginExecutions>
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>org.codehaus.mojo</groupId>
-										<artifactId>aspectj-maven-plugin</artifactId>
-										<versionRange>[1.0,)</versionRange>
-										<goals>
-											<goal>test-compile</goal>
-											<goal>compile</goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<execute />
-									</action>
-								</pluginExecution>
-							</pluginExecutions>
-						</lifecycleMappingMetadata>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.eclipse.tycho</groupId>
-					<artifactId>tycho-surefire-plugin</artifactId>
-					<version>${tycho-version}</version>
-					<configuration>
-						<useUIHarness>true</useUIHarness>
-					</configuration>
-				</plugin>
-
-			</plugins>
-		</pluginManagement>
-	</build>
-
-</project>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>de.cognicrypt</groupId>
+		<artifactId>de.cognicrypt.parent</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+		<relativePath>../../pom.xml</relativePath>
+	</parent>
+
+	<groupId>de.cognicrypt</groupId>
+	<artifactId>de.cognicrypt.codegenerator.tests</artifactId>
+	<packaging>eclipse-test-plugin</packaging>
+
+	<build>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.eclipse.m2e</groupId>
+					<artifactId>lifecycle-mapping</artifactId>
+					<version>1.0.0</version>
+					<configuration>
+						<lifecycleMappingMetadata>
+							<pluginExecutions>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>org.codehaus.mojo</groupId>
+										<artifactId>aspectj-maven-plugin</artifactId>
+										<versionRange>[1.0,)</versionRange>
+										<goals>
+											<goal>test-compile</goal>
+											<goal>compile</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<execute />
+									</action>
+								</pluginExecution>
+							</pluginExecutions>
+						</lifecycleMappingMetadata>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.eclipse.tycho</groupId>
+					<artifactId>tycho-surefire-plugin</artifactId>
+					<version>${tycho-version}</version>
+					<configuration>
+						<useUIHarness>true</useUIHarness>
+					</configuration>
+				</plugin>
+
+			</plugins>
+		</pluginManagement>
+	</build>
+
+</project>
+