Merge remote-tracking branch 'origin/master' into testgen

rakshitkr · rakshitkr · commit 630eea41361e · 2020-05-19T11:08:54.000+02:00
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ CogniCrypt is an Eclipse plugin that supports Java developers in using cryptogra
 
 ## Installation
 
-To set up CogniCrypt in your own Eclipse, please install it from the [**Update Site**](http://download.eclipse.org/cognicrypt/stable). If it is your first time using CogniCrypt, we recommend you to browse [Eclipse website](https://www.eclipse.org/cognicrypt/) and check out the [**tutorial**](https://github.com/CROSSINGTUD/CogniCrypt/wiki/Tutorial) in this project's wiki. Nightly builds of CogniCrypt are also [available](http://download.eclipse.org/cognicrypt/snapshot).
+To set up CogniCrypt in your own Eclipse, please install it from the [**Update Site**](https://download.eclipse.org/cognicrypt/stable). If it is your first time using CogniCrypt, we recommend you to browse [Eclipse website](https://www.eclipse.org/cognicrypt/) and check out the [**tutorial**](https://github.com/CROSSINGTUD/CogniCrypt/wiki/Tutorial) in this project's wiki. Nightly builds of CogniCrypt are also [available](https://download.eclipse.org/cognicrypt/snapshot).
 
 
 ## Contribution
diff --git a/features/de.cognicrypt.codegenerator.feature/feature.xml b/features/de.cognicrypt.codegenerator.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="de.cognicrypt.codegenerator.feature"
       label="CogniCrypt Crypto-API Example Generator"
-      version="1.0.0.qualifier"
+      version="1.0.0"
       provider-name="Technical University Darmstadt; Paderborn University">
 
    <description url="https://cognicrypt.de">
@@ -109,15 +109,15 @@ Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives n
       <import plugin="org.eclipse.ui.editors"/>
       <import plugin="org.eclipse.compare"/>
       <import plugin="org.apache.commons.io" version="2.2.0" match="greaterOrEqual"/>
-      <import plugin="de.cognicrypt.core" version="1.0.0" match="greaterOrEqual"/>
+      <import plugin="de.cognicrypt.core" version="1.0.0" match="perfect"/>
       <import plugin="org.eclipse.jdt.launching"/>
    </requires>
 
    <plugin
          id="de.cognicrypt.codegenerator"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="1.0.0"
          unpack="false"/>
 
 </feature>
diff --git a/features/de.cognicrypt.codegenerator.feature/pom.xml b/features/de.cognicrypt.codegenerator.feature/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>de.cognicrypt</groupId>
 		<artifactId>de.cognicrypt.parent</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.0.0</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	</project>
diff --git a/features/de.cognicrypt.core.feature/feature.xml b/features/de.cognicrypt.core.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="de.cognicrypt.core.feature"
       label="CogniCrypt Core"
-      version="1.0.0.qualifier"
+      version="1.0.0"
       provider-name="Technical University Darmstadt; Paderborn University">
 
    <description url="https://cognicrypt.de">
@@ -118,7 +118,7 @@ Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives n
          id="de.cognicrypt.core"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="1.0.0"
          unpack="false"/>
 
 </feature>
diff --git a/features/de.cognicrypt.core.feature/pom.xml b/features/de.cognicrypt.core.feature/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>de.cognicrypt</groupId>
 		<artifactId>de.cognicrypt.parent</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.0.0</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<groupId>de.cognicrypt</groupId>
diff --git a/features/de.cognicrypt.cryslhandler.feature/feature.xml b/features/de.cognicrypt.cryslhandler.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="de.cognicrypt.cryslhandler.feature"
       label="CogniCrypt CrySL Handler"
-      version="1.0.0.qualifier"
+      version="1.0.0"
       provider-name="Technical University Darmstadt, Paderborn University">
 
    <description url="https://cognicrypt.de">
@@ -115,15 +115,15 @@ Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives n
       <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="de.cognicrypt.core" version="1.0.0" match="perfect"/>
       <import plugin="org.junit"/>
    </requires>
 
    <plugin
          id="de.cognicrypt.crysl.handler"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="1.0.0"
          unpack="false"/>
 
 </feature>
diff --git a/features/de.cognicrypt.cryslhandler.feature/pom.xml b/features/de.cognicrypt.cryslhandler.feature/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>de.cognicrypt</groupId>
 		<artifactId>de.cognicrypt.parent</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.0.0</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 </project>
diff --git a/features/de.cognicrypt.staticanalyzer.feature/feature.xml b/features/de.cognicrypt.staticanalyzer.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="de.cognicrypt.staticanalyzer.feature"
       label="CogniCrypt Crypto-API Misuse Detector"
-      version="1.0.0.qualifier"
+      version="1.0.0"
       provider-name="Technical University Darmstadt; Paderborn University">
 
    <description url="https://cognicrypt.de">
@@ -107,15 +107,15 @@ Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives n
       <import plugin="org.eclipse.jface.text" version="3.11.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.emf.common"/>
       <import plugin="org.eclipse.m2e.maven.runtime"/>
-      <import plugin="de.cognicrypt.core" version="1.0.0" match="greaterOrEqual"/>
+      <import plugin="de.cognicrypt.core" version="1.0.0" match="perfect"/>
       <import plugin="com.google.guava"/>
    </requires>
 
    <plugin
          id="de.cognicrypt.staticanalyzer"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="1.0.0"
          unpack="false"/>
 
 </feature>
diff --git a/features/de.cognicrypt.staticanalyzer.feature/pom.xml b/features/de.cognicrypt.staticanalyzer.feature/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>de.cognicrypt</groupId>
 		<artifactId>de.cognicrypt.parent</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.0.0</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<groupId>de.cognicrypt</groupId>
diff --git a/plugins/de.cognicrypt.codegenerator.tests/META-INF/MANIFEST.MF b/plugins/de.cognicrypt.codegenerator.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ 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
+Bundle-Version: 1.0.0
 Fragment-Host: de.cognicrypt.codegenerator;bundle-version="1.0.0"
 Require-Bundle: org.eclipse.jdt.launching,
  de.cognicrypt.core
diff --git a/plugins/de.cognicrypt.codegenerator.tests/pom.xml b/plugins/de.cognicrypt.codegenerator.tests/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>de.cognicrypt</groupId>
 		<artifactId>de.cognicrypt.parent</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.0.0</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/plugins/de.cognicrypt.codegenerator/META-INF/MANIFEST.MF b/plugins/de.cognicrypt.codegenerator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CogniCrypt Code Generator
 Bundle-SymbolicName: de.cognicrypt.codegenerator;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.0
 Bundle-Activator: de.cognicrypt.codegenerator.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/plugins/de.cognicrypt.codegenerator/pom.xml b/plugins/de.cognicrypt.codegenerator/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>de.cognicrypt</groupId>
     <artifactId>de.cognicrypt.parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.0</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/plugins/de.cognicrypt.core/META-INF/MANIFEST.MF b/plugins/de.cognicrypt.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CogniCrypt Core
 Bundle-SymbolicName: de.cognicrypt.core;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.0
 Bundle-Activator: de.cognicrypt.core.Activator
 Bundle-Vendor: TU Darmstadt, Paderborn University
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/plugins/de.cognicrypt.core/pom.xml b/plugins/de.cognicrypt.core/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>de.cognicrypt</groupId>
 		<artifactId>de.cognicrypt.parent</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.0.0</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/plugins/de.cognicrypt.crysl.handler/META-INF/MANIFEST.MF b/plugins/de.cognicrypt.crysl.handler/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CogniCrypt CrySL Handler
 Bundle-SymbolicName: de.cognicrypt.crysl.handler;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.0
 Bundle-Activator: de.cognicrypt.crysl.Activator
 Bundle-Vendor: TU Darmstadt, Paderborn University
 Require-Bundle: org.eclipse.ui,
diff --git a/plugins/de.cognicrypt.crysl.handler/pom.xml b/plugins/de.cognicrypt.crysl.handler/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>de.cognicrypt</groupId>
     <artifactId>de.cognicrypt.parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.0</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/plugins/de.cognicrypt.integrator.primitive/META-INF/MANIFEST.MF b/plugins/de.cognicrypt.integrator.primitive/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Primitive Integrator
 Bundle-SymbolicName: de.cognicrypt.integrator.primitive
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.0
 Bundle-Activator: de.cognicrypt.integrator.primitive.Activator
-Bundle-Vendor: TU Darmstadt
+Bundle-Vendor: TU Darmstadt, Paderborn University
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.core.resources,
diff --git a/plugins/de.cognicrypt.integrator.primitive/pom.xml b/plugins/de.cognicrypt.integrator.primitive/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>de.cognicrypt</groupId>
     <artifactId>de.cognicrypt.parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.0</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/plugins/de.cognicrypt.integrator.task/META-INF/MANIFEST.MF b/plugins/de.cognicrypt.integrator.task/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Task Integrator
 Bundle-SymbolicName: de.cognicrypt.integrator.task
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.0
 Bundle-Activator: de.cognicrypt.integrator.task.Activator
-Bundle-Vendor: TU Darmstadt
+Bundle-Vendor: TU Darmstadt, Paderborn University
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  de.cognicrypt.codegenerator;bundle-version="1.0.0",
diff --git a/plugins/de.cognicrypt.integrator.task/pom.xml b/plugins/de.cognicrypt.integrator.task/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>de.cognicrypt</groupId>
     <artifactId>de.cognicrypt.parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.0</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/plugins/de.cognicrypt.staticanalyzer/META-INF/MANIFEST.MF b/plugins/de.cognicrypt.staticanalyzer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CogniCrypt Static Analyzer
 Bundle-SymbolicName: de.cognicrypt.staticanalyzer;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.0
 Bundle-Activator: de.cognicrypt.staticanalyzer.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
@@ -24,3 +24,4 @@ Bundle-ClassPath: .,
  resources/
 Automatic-Module-Name: de.cognicrypt.staticanalyzer
 Import-Package: org.eclipse.ui.texteditor
+Bundle-Vendor: TU Darmstadt, Paderborn University
diff --git a/plugins/de.cognicrypt.staticanalyzer/pom.xml b/plugins/de.cognicrypt.staticanalyzer/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>de.cognicrypt</groupId>
     <artifactId>de.cognicrypt.parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.0</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>de.cognicrypt</groupId>
   <artifactId>de.cognicrypt.parent</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>1.0.0</version>
   <packaging>pom</packaging>
 
   <properties>
@@ -47,11 +47,6 @@
       <name>JBoss Public Repository Group</name>
       <url>http://repository.jboss.org/nexus/content/groups/public/</url>
     </pluginRepository>
-    <pluginRepository>
-      <id>jboss-snapshots-repository</id>
-      <name>JBoss Snapshots Repository</name>
-      <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
-    </pluginRepository>
   </pluginRepositories>
 
   <build>
@@ -91,10 +86,7 @@
     <module>plugins/de.cognicrypt.core/</module>
     <module>plugins/de.cognicrypt.crysl.handler/</module>
     <module>plugins/de.cognicrypt.codegenerator/</module>
-    <module>plugins/de.cognicrypt.codegenerator.tests/</module>
     <module>plugins/de.cognicrypt.staticanalyzer/</module>
-	<module>plugins/de.cognicrypt.integrator.task/</module>
-	<module>plugins/de.cognicrypt.integrator.primitive/</module>
 	<module>features/de.cognicrypt.core.feature/</module>
     <module>features/de.cognicrypt.codegenerator.feature/</module>
     <module>features/de.cognicrypt.cryslhandler.feature/</module>
diff --git a/repository/category.xml b/repository/category.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/de.cognicrypt.codegenerator.feature_1.0.0.qualifier.jar" id="de.cognicrypt.codegenerator.feature" version="1.0.0.qualifier">
+   <feature url="features/de.cognicrypt.codegenerator.feature_1.0.0.jar" id="de.cognicrypt.codegenerator.feature" version="1.0.0">
       <category name="de.cognicrypt.catergory"/>
    </feature>
-   <feature url="features/de.cognicrypt.staticanalyzer.feature_1.0.0.qualifier.jar" id="de.cognicrypt.staticanalyzer.feature" version="1.0.0.qualifier">
+   <feature url="features/de.cognicrypt.staticanalyzer.feature_1.0.0.jar" id="de.cognicrypt.staticanalyzer.feature" version="1.0.0">
       <category name="de.cognicrypt.catergory"/>
    </feature>
-   <feature url="features/de.cognicrypt.cryslhandler.feature_1.0.0.qualifier.jar" id="de.cognicrypt.cryslhandler.feature" version="1.0.0.qualifier">
+   <feature url="features/de.cognicrypt.cryslhandler.feature_1.0.0.jar" id="de.cognicrypt.cryslhandler.feature" version="1.0.0">
       <category name="de.cognicrypt.catergory"/>
    </feature>
    <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="de.darmstadt.tu.crysl"/>
    </feature>
-   <feature url="features/de.cognicrypt.core.feature_1.0.0.qualifier.jar" id="de.cognicrypt.core.feature" version="1.0.0.qualifier">
+   <feature url="features/de.cognicrypt.core.feature_1.0.0.jar" id="de.cognicrypt.core.feature" version="1.0.0">
       <category name="de.cognicrypt.catergory"/>
    </feature>
    <category-def name="de.cognicrypt.catergory" label="CogniCrypt"/>
    <category-def name="de.darmstadt.tu.crysl" label="CrySL"/>
-   <repository-reference location="http://download.eclipse.org/cognicrypt" enabled="true" />
    <repository-reference location="http://download.eclipse.org/modeling/tmf/xtext/updates/composite/releases/" enabled="true" />
    <repository-reference location="http://it.crossing.tu-darmstadt.de/cognicrypt/stable/" enabled="true" />
+   <repository-reference location="http://https://download.eclipse.org/cognicrypt/stable/" enabled="true" />
 </site>
diff --git a/repository/pom.xml b/repository/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>de.cognicrypt</groupId>
 		<artifactId>de.cognicrypt.parent</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.0.0</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<profiles>
