Skip to content

Commit 6c01d28

Browse files
rakshitkrrakshitkr
committed
Merge remote-tracking branch 'upstream/develop' into testgen
2 parents 280968c + 01a11b0 commit 6c01d28

File tree

146 files changed

+5696
-3880
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

146 files changed

+5696
-3880
lines changed

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ bin/
22
target/
33
.metadata/
44
.recommenders/
5-
*.cryptslbin
5+
*.cryslbin

‎features/de.cognicrypt.codegenerator.feature/.project‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<projectDescription>
3-
<name>de.cognicrypt.codegenerator.feature</name>
4-
<comment></comment>
5-
<projects>
6-
</projects>
7-
<buildSpec>
8-
<buildCommand>
9-
<name>org.eclipse.pde.FeatureBuilder</name>
10-
<arguments>
11-
</arguments>
12-
</buildCommand>
13-
</buildSpec>
14-
<natures>
15-
<nature>org.eclipse.pde.FeatureNature</nature>
16-
</natures>
17-
</projectDescription>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>de.cognicrypt.codegenerator.feature</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.pde.FeatureBuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
</buildSpec>
14+
<natures>
15+
<nature>org.eclipse.pde.FeatureNature</nature>
16+
</natures>
17+
</projectDescription>

‎features/de.cognicrypt.codegenerator.feature/pom.xml‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
<project
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
4-
<artifactId>de.cognicrypt.codegenerator.feature</artifactId>
5-
<packaging>eclipse-feature</packaging>
6-
<parent>
7-
<groupId>de.cognicrypt</groupId>
8-
<artifactId>de.cognicrypt.parent</artifactId>
9-
<version>1.0.0-SNAPSHOT</version>
10-
<relativePath>../../pom.xml</relativePath>
11-
</parent>
12-
<groupId>de.cognicrypt</groupId>
13-
</project>
1+
<project
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<artifactId>de.cognicrypt.codegenerator.feature</artifactId>
5+
<packaging>eclipse-feature</packaging>
6+
<parent>
7+
<groupId>de.cognicrypt</groupId>
8+
<artifactId>de.cognicrypt.parent</artifactId>
9+
<version>1.0.0-SNAPSHOT</version>
10+
<relativePath>../../pom.xml</relativePath>
11+
</parent>
12+
</project>

‎features/de.cognicrypt.core.feature/pom.xml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
<project
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
4-
<artifactId>de.cognicrypt.core.feature</artifactId>
5-
<packaging>eclipse-feature</packaging>
6-
<parent>
7-
<groupId>de.cognicrypt</groupId>
8-
<artifactId>de.cognicrypt.parent</artifactId>
9-
<version>1.0.0-SNAPSHOT</version>
10-
<relativePath>../../pom.xml</relativePath>
11-
</parent>
12-
<groupId>de.cognicrypt</groupId>
13-
</project>
1+
<project
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<artifactId>de.cognicrypt.core.feature</artifactId>
5+
<packaging>eclipse-feature</packaging>
6+
<parent>
7+
<groupId>de.cognicrypt</groupId>
8+
<artifactId>de.cognicrypt.parent</artifactId>
9+
<version>1.0.0-SNAPSHOT</version>
10+
<relativePath>../../pom.xml</relativePath>
11+
</parent>
12+
<groupId>de.cognicrypt</groupId>
13+
</project>

‎features/de.cognicrypt.cryslhandler.feature/feature.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,9 @@ Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives n
112112
<import plugin="org.eclipse.jdt.core"/>
113113
<import plugin="org.eclipse.xtext"/>
114114
<import plugin="org.eclipse.xtext.common.types.ui"/>
115-
<import plugin="de.darmstadt.tu.crossing.CryptSL.ui" version="1.0.0" match="greaterOrEqual"/>
116-
<import plugin="de.darmstadt.tu.crossing.CryptSL" version="1.0.0" match="greaterOrEqual"/>
117-
<import plugin="de.darmstadt.tu.crossing.CryptSL.ide" version="1.0.0" match="greaterOrEqual"/>
115+
<import plugin="de.darmstadt.tu.crossing.CrySL.ui" version="2.0.0" match="perfect"/>
116+
<import plugin="de.darmstadt.tu.crossing.CrySL" version="2.0.0" match="perfect"/>
117+
<import plugin="de.darmstadt.tu.crossing.CrySL.ide" version="2.0.0" match="perfect"/>
118118
<import plugin="de.cognicrypt.core" version="1.0.0" match="greaterOrEqual"/>
119119
<import plugin="org.junit"/>
120120
</requires>

‎features/de.cognicrypt.cryslhandler.feature/pom.xml‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
<project
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
4-
<artifactId>de.cognicrypt.cryslhandler.feature</artifactId>
5-
<packaging>eclipse-feature</packaging>
6-
<parent>
7-
<groupId>de.cognicrypt</groupId>
8-
<artifactId>de.cognicrypt.parent</artifactId>
9-
<version>1.0.0-SNAPSHOT</version>
10-
<relativePath>../../pom.xml</relativePath>
11-
</parent>
12-
<groupId>de.cognicrypt</groupId>
13-
</project>
1+
<project
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<artifactId>de.cognicrypt.cryslhandler.feature</artifactId>
5+
<packaging>eclipse-feature</packaging>
6+
<parent>
7+
<groupId>de.cognicrypt</groupId>
8+
<artifactId>de.cognicrypt.parent</artifactId>
9+
<version>1.0.0-SNAPSHOT</version>
10+
<relativePath>../../pom.xml</relativePath>
11+
</parent>
12+
</project>

‎features/de.cognicrypt.staticanalyzer.feature/.project‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<projectDescription>
3-
<name>de.cognicrypt.staticanalyzer.feature</name>
4-
<comment></comment>
5-
<projects>
6-
</projects>
7-
<buildSpec>
8-
<buildCommand>
9-
<name>org.eclipse.pde.FeatureBuilder</name>
10-
<arguments>
11-
</arguments>
12-
</buildCommand>
13-
</buildSpec>
14-
<natures>
15-
<nature>org.eclipse.pde.FeatureNature</nature>
16-
</natures>
17-
</projectDescription>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>de.cognicrypt.staticanalyzer.feature</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.pde.FeatureBuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
</buildSpec>
14+
<natures>
15+
<nature>org.eclipse.pde.FeatureNature</nature>
16+
</natures>
17+
</projectDescription>

‎features/de.cognicrypt.staticanalyzer.feature/pom.xml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
<project
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
4-
<artifactId>de.cognicrypt.staticanalyzer.feature</artifactId>
5-
<packaging>eclipse-feature</packaging>
6-
<parent>
7-
<groupId>de.cognicrypt</groupId>
8-
<artifactId>de.cognicrypt.parent</artifactId>
9-
<version>1.0.0-SNAPSHOT</version>
10-
<relativePath>../../pom.xml</relativePath>
11-
</parent>
12-
<groupId>de.cognicrypt</groupId>
13-
</project>
1+
<project
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<artifactId>de.cognicrypt.staticanalyzer.feature</artifactId>
5+
<packaging>eclipse-feature</packaging>
6+
<parent>
7+
<groupId>de.cognicrypt</groupId>
8+
<artifactId>de.cognicrypt.parent</artifactId>
9+
<version>1.0.0-SNAPSHOT</version>
10+
<relativePath>../../pom.xml</relativePath>
11+
</parent>
12+
<groupId>de.cognicrypt</groupId>
13+
</project>

‎plugins/de.cognicrypt.codegenerator.tests/.classpath‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
44
<attributes>
55
<attribute name="maven.pomderived" value="true"/>
66
</attributes>

‎plugins/de.cognicrypt.codegenerator.tests/META-INF/MANIFEST.MF‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
Manifest-Version: 1.0
2-
Bundle-ManifestVersion: 2
3-
Bundle-Name: CogniCrypt-CodeGenerator_Plug-inTests
4-
Bundle-SymbolicName: de.cognicrypt.codegenerator.tests;singleton:=true
5-
Bundle-Version: 1.0.0.qualifier
6-
Fragment-Host: de.cognicrypt.codegenerator;bundle-version="1.0.0"
7-
Require-Bundle: org.eclipse.jdt.launching,
8-
de.cognicrypt.core
9-
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
10-
Bundle-ClassPath: lib/claferchocoig.jar,src/
11-
Export-Package: de.cognicrypt.codegenerator
1+
Manifest-Version: 1.0
2+
Bundle-ManifestVersion: 2
3+
Bundle-Name: CogniCrypt-CodeGenerator_Plug-inTests
4+
Bundle-SymbolicName: de.cognicrypt.codegenerator.tests;singleton:=true
5+
Bundle-Version: 1.0.0.qualifier
6+
Fragment-Host: de.cognicrypt.codegenerator;bundle-version="1.0.0"
7+
Require-Bundle: org.eclipse.jdt.launching,
8+
de.cognicrypt.core
9+
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
10+
Bundle-ClassPath: lib/claferchocoig.jar,src/
11+
Export-Package: de.cognicrypt.codegenerator
12+
Automatic-Module-Name: de.cognicrypt.codegenerator.tests

0 commit comments

Comments
 (0)