From 478ee8ed3eb526c3feac880d0f30d2f2447b6ee7 Mon Sep 17 00:00:00 2001 From: Stefan Krueger Date: Wed, 15 Apr 2020 04:15:46 +0200 Subject: [PATCH 1/7] Fix version to 1.0 Signed-off-by: Stefan Krueger --- .../feature.xml | 6 +++--- .../pom.xml | 2 +- .../de.cognicrypt.core.feature/feature.xml | 4 ++-- features/de.cognicrypt.core.feature/pom.xml | 2 +- .../feature.xml | 6 +++--- .../pom.xml | 2 +- .../feature.xml | 6 +++--- .../pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../de.cognicrypt.codegenerator.tests/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- plugins/de.cognicrypt.codegenerator/pom.xml | 2 +- .../de.cognicrypt.core/META-INF/MANIFEST.MF | 2 +- plugins/de.cognicrypt.core/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- plugins/de.cognicrypt.crysl.handler/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 4 ++-- .../pom.xml | 2 +- .../META-INF/MANIFEST.MF | 4 ++-- plugins/de.cognicrypt.integrator.task/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 3 ++- plugins/de.cognicrypt.staticanalyzer/pom.xml | 2 +- pom.xml | 10 +--------- repository/category.xml | 10 +++++----- repository/pom.xml | 19 +++++++++++++++++-- 25 files changed, 55 insertions(+), 47 deletions(-) diff --git a/features/de.cognicrypt.codegenerator.feature/feature.xml b/features/de.cognicrypt.codegenerator.feature/feature.xml index 91177fc70..ffb258b21 100644 --- a/features/de.cognicrypt.codegenerator.feature/feature.xml +++ b/features/de.cognicrypt.codegenerator.feature/feature.xml @@ -2,7 +2,7 @@ @@ -109,7 +109,7 @@ Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives n - + @@ -117,7 +117,7 @@ Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives n id="de.cognicrypt.codegenerator" download-size="0" install-size="0" - version="0.0.0" + version="1.0.0" unpack="false"/> diff --git a/features/de.cognicrypt.codegenerator.feature/pom.xml b/features/de.cognicrypt.codegenerator.feature/pom.xml index 6bc54d27e..855ca0288 100644 --- a/features/de.cognicrypt.codegenerator.feature/pom.xml +++ b/features/de.cognicrypt.codegenerator.feature/pom.xml @@ -6,7 +6,7 @@ de.cognicrypt de.cognicrypt.parent - 1.0.0-SNAPSHOT + 1.0.0 ../../pom.xml diff --git a/features/de.cognicrypt.core.feature/feature.xml b/features/de.cognicrypt.core.feature/feature.xml index 07f5428c0..007a6a4b1 100644 --- a/features/de.cognicrypt.core.feature/feature.xml +++ b/features/de.cognicrypt.core.feature/feature.xml @@ -2,7 +2,7 @@ @@ -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"/> diff --git a/features/de.cognicrypt.core.feature/pom.xml b/features/de.cognicrypt.core.feature/pom.xml index 9d403a783..9e2edee92 100644 --- a/features/de.cognicrypt.core.feature/pom.xml +++ b/features/de.cognicrypt.core.feature/pom.xml @@ -6,7 +6,7 @@ de.cognicrypt de.cognicrypt.parent - 1.0.0-SNAPSHOT + 1.0.0 ../../pom.xml de.cognicrypt diff --git a/features/de.cognicrypt.cryslhandler.feature/feature.xml b/features/de.cognicrypt.cryslhandler.feature/feature.xml index 553770441..e249f85b4 100644 --- a/features/de.cognicrypt.cryslhandler.feature/feature.xml +++ b/features/de.cognicrypt.cryslhandler.feature/feature.xml @@ -2,7 +2,7 @@ @@ -115,7 +115,7 @@ Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives n - + @@ -123,7 +123,7 @@ Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives n id="de.cognicrypt.crysl.handler" download-size="0" install-size="0" - version="0.0.0" + version="1.0.0" unpack="false"/> diff --git a/features/de.cognicrypt.cryslhandler.feature/pom.xml b/features/de.cognicrypt.cryslhandler.feature/pom.xml index 0e88930ad..67575a5c0 100644 --- a/features/de.cognicrypt.cryslhandler.feature/pom.xml +++ b/features/de.cognicrypt.cryslhandler.feature/pom.xml @@ -6,7 +6,7 @@ de.cognicrypt de.cognicrypt.parent - 1.0.0-SNAPSHOT + 1.0.0 ../../pom.xml diff --git a/features/de.cognicrypt.staticanalyzer.feature/feature.xml b/features/de.cognicrypt.staticanalyzer.feature/feature.xml index fed8460ce..bca5fefa3 100644 --- a/features/de.cognicrypt.staticanalyzer.feature/feature.xml +++ b/features/de.cognicrypt.staticanalyzer.feature/feature.xml @@ -2,7 +2,7 @@ @@ -107,7 +107,7 @@ Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives n - + @@ -115,7 +115,7 @@ Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives n id="de.cognicrypt.staticanalyzer" download-size="0" install-size="0" - version="0.0.0" + version="1.0.0" unpack="false"/> diff --git a/features/de.cognicrypt.staticanalyzer.feature/pom.xml b/features/de.cognicrypt.staticanalyzer.feature/pom.xml index 744a2c53b..d87d936ff 100644 --- a/features/de.cognicrypt.staticanalyzer.feature/pom.xml +++ b/features/de.cognicrypt.staticanalyzer.feature/pom.xml @@ -6,7 +6,7 @@ de.cognicrypt de.cognicrypt.parent - 1.0.0-SNAPSHOT + 1.0.0 ../../pom.xml de.cognicrypt diff --git a/plugins/de.cognicrypt.codegenerator.tests/META-INF/MANIFEST.MF b/plugins/de.cognicrypt.codegenerator.tests/META-INF/MANIFEST.MF index 7dd04b39d..e8fb65550 100644 --- 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 index 1e4ca4cd4..840c80fa0 100644 --- a/plugins/de.cognicrypt.codegenerator.tests/pom.xml +++ b/plugins/de.cognicrypt.codegenerator.tests/pom.xml @@ -6,7 +6,7 @@ de.cognicrypt de.cognicrypt.parent - 1.0.0-SNAPSHOT + 1.0.0 ../../pom.xml diff --git a/plugins/de.cognicrypt.codegenerator/META-INF/MANIFEST.MF b/plugins/de.cognicrypt.codegenerator/META-INF/MANIFEST.MF index 1fd59cc1e..32e7a0e41 100644 --- 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 index 89b452306..0c7deebef 100644 --- a/plugins/de.cognicrypt.codegenerator/pom.xml +++ b/plugins/de.cognicrypt.codegenerator/pom.xml @@ -7,7 +7,7 @@ de.cognicrypt de.cognicrypt.parent - 1.0.0-SNAPSHOT + 1.0.0 ../../pom.xml diff --git a/plugins/de.cognicrypt.core/META-INF/MANIFEST.MF b/plugins/de.cognicrypt.core/META-INF/MANIFEST.MF index 4cc1ef1c9..d5fe375bf 100644 --- 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 index ad287a7ff..85a3a3fd4 100644 --- a/plugins/de.cognicrypt.core/pom.xml +++ b/plugins/de.cognicrypt.core/pom.xml @@ -9,7 +9,7 @@ de.cognicrypt de.cognicrypt.parent - 1.0.0-SNAPSHOT + 1.0.0 ../../pom.xml diff --git a/plugins/de.cognicrypt.crysl.handler/META-INF/MANIFEST.MF b/plugins/de.cognicrypt.crysl.handler/META-INF/MANIFEST.MF index 39a7359a5..7ef4a3861 100644 --- 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 index 2f1a411a5..78a07d2bb 100644 --- a/plugins/de.cognicrypt.crysl.handler/pom.xml +++ b/plugins/de.cognicrypt.crysl.handler/pom.xml @@ -8,7 +8,7 @@ de.cognicrypt de.cognicrypt.parent - 1.0.0-SNAPSHOT + 1.0.0 ../../pom.xml diff --git a/plugins/de.cognicrypt.integrator.primitive/META-INF/MANIFEST.MF b/plugins/de.cognicrypt.integrator.primitive/META-INF/MANIFEST.MF index 37962a7fb..5ca8595fb 100644 --- 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 index 9454a48ad..4312658d8 100644 --- a/plugins/de.cognicrypt.integrator.primitive/pom.xml +++ b/plugins/de.cognicrypt.integrator.primitive/pom.xml @@ -7,7 +7,7 @@ de.cognicrypt de.cognicrypt.parent - 1.0.0-SNAPSHOT + 1.0.0 ../../pom.xml diff --git a/plugins/de.cognicrypt.integrator.task/META-INF/MANIFEST.MF b/plugins/de.cognicrypt.integrator.task/META-INF/MANIFEST.MF index 731f678ef..2a70875a0 100644 --- 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 index 5184d6d2b..62b20058a 100644 --- a/plugins/de.cognicrypt.integrator.task/pom.xml +++ b/plugins/de.cognicrypt.integrator.task/pom.xml @@ -7,7 +7,7 @@ de.cognicrypt de.cognicrypt.parent - 1.0.0-SNAPSHOT + 1.0.0 ../../pom.xml diff --git a/plugins/de.cognicrypt.staticanalyzer/META-INF/MANIFEST.MF b/plugins/de.cognicrypt.staticanalyzer/META-INF/MANIFEST.MF index b547db499..308ede790 100644 --- 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 index 8d647b455..c6a18be08 100644 --- a/plugins/de.cognicrypt.staticanalyzer/pom.xml +++ b/plugins/de.cognicrypt.staticanalyzer/pom.xml @@ -8,7 +8,7 @@ de.cognicrypt de.cognicrypt.parent - 1.0.0-SNAPSHOT + 1.0.0 ../../pom.xml diff --git a/pom.xml b/pom.xml index bcf0a5b92..eebf3c94f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 de.cognicrypt de.cognicrypt.parent - 1.0.0-SNAPSHOT + 1.0.0 pom @@ -47,11 +47,6 @@ JBoss Public Repository Group http://repository.jboss.org/nexus/content/groups/public/ - - jboss-snapshots-repository - JBoss Snapshots Repository - https://repository.jboss.org/nexus/content/repositories/snapshots/ - @@ -91,10 +86,7 @@ plugins/de.cognicrypt.core/ plugins/de.cognicrypt.crysl.handler/ plugins/de.cognicrypt.codegenerator/ - plugins/de.cognicrypt.codegenerator.tests/ plugins/de.cognicrypt.staticanalyzer/ - plugins/de.cognicrypt.integrator.task/ - plugins/de.cognicrypt.integrator.primitive/ features/de.cognicrypt.core.feature/ features/de.cognicrypt.codegenerator.feature/ features/de.cognicrypt.cryslhandler.feature/ diff --git a/repository/category.xml b/repository/category.xml index 4b09cdc7d..2b0031636 100644 --- a/repository/category.xml +++ b/repository/category.xml @@ -1,23 +1,23 @@ - + - + - + - + - + diff --git a/repository/pom.xml b/repository/pom.xml index e97a7a55c..109fcc4a0 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -6,7 +6,7 @@ de.cognicrypt de.cognicrypt.parent - 1.0.0-SNAPSHOT + 1.0.0 ../pom.xml @@ -51,7 +51,22 @@ org.jboss.tools.tycho-plugins repository-utils - 1.4.0 + 1.6.0 + + + package + + generate-repository-facade + + + + http://download.eclipse.org/cognicrypt/stable + http://download.eclipse.org/modeling/tmf/xtext/updates/composite/releases/ + http://it.crossing.tu-darmstadt.de/cognicrypt/stable + + + + From 45b2fa6298b8cfcfc6eced80932c5d92cd2c8bb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Kr=C3=BCger?= Date: Tue, 5 May 2020 18:51:13 +0200 Subject: [PATCH 2/7] Switching Update Site link to https as per a suggestion by @dicer. See #392 for details. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index aba5787d8..1cd9efd41 100644 --- 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 From 2e3d612a295d05812a39963d7a4c74a941e0083d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Kr=C3=BCger?= Date: Wed, 24 Jun 2020 16:33:35 +0200 Subject: [PATCH 3/7] Update and rename codeofconduct.md to CODE_OF_CONDUCT.md --- codeofconduct.md => CODE_OF_CONDUCT.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) rename codeofconduct.md => CODE_OF_CONDUCT.md (94%) diff --git a/codeofconduct.md b/CODE_OF_CONDUCT.md similarity index 94% rename from codeofconduct.md rename to CODE_OF_CONDUCT.md index 1f5d19bf0..5296b69ea 100644 --- a/codeofconduct.md +++ b/CODE_OF_CONDUCT.md @@ -51,7 +51,7 @@ If a community member engages in unacceptable behaviour, the community organizer ## 6. Reporting Guidelines -If you are subject to or witness unacceptable behavior, or have any other concerns, please notify [Stefan Krueger](mailto:stefan.krueger@crossing.tu-darmstadt.de). +If you are subject to or witness unacceptable behavior, or have any other concerns, please notify [Michael Schlichtig](mailto:michael.schlichtig@upb.de). Additionally, community organizers are available to help community members engage with local law enforcement or to otherwise help those experiencing unacceptable behaviour feel safe. @@ -67,7 +67,7 @@ This code of conduct and its related procedures also apply to unacceptable behav ## 9. Contact info -Stefan Krueger [](mailto:stefan.krueger@crossing.tu-darmstadt.de). +Michael Schlichtig [](mailto:michael.schlichtig@upb.de). ## 10. License and attribution @@ -75,3 +75,4 @@ This Code of Conduct is derived from the [Citizen Code of Conduct](http://stumpt Revision 0.8 Adoption of Citizen COC with revisions to adjust for CogniCrypt context. Revision 0.9 Removed non-applicable aspects. Made the COC stricter in a few places. +Revision 0.9.1 Update contact info. From c1e33e2a6a01a8d96fbb0dfe1c9f257a8af0a5ca Mon Sep 17 00:00:00 2001 From: AnakinSklavenwalker Date: Mon, 12 Oct 2020 11:32:03 +0200 Subject: [PATCH 4/7] update .gitignore --- .gitignore | 324 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 322 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6b51612cc..25d8dca9a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,325 @@ + +# Created by https://www.toptal.com/developers/gitignore/api/maven,eclipse,intellij,intellij+iml,java,intellij+all +# Edit at https://www.toptal.com/developers/gitignore?templates=maven,eclipse,intellij,intellij+iml,java,intellij+all + +### Eclipse ### +.metadata bin/ -target/ -.metadata/ +tmp/ +*.tmp +*.bak +*.swp +*~.nib +local.properties +.settings/ +.loadpath +.recommenders + +# External tool builders +.externalToolBuilders/ + +# Locally stored "Eclipse launch configurations" +*.launch + +# PyDev specific (Python IDE for Eclipse) +*.pydevproject + +# CDT-specific (C/C++ Development Tooling) +.cproject + +# CDT- autotools +.autotools + +# Java annotation processor (APT) +.factorypath + +# PDT-specific (PHP Development Tools) +.buildpath + +# sbteclipse plugin +.target + +# Tern plugin +.tern-project + +# TeXlipse plugin +.texlipse + +# STS (Spring Tool Suite) +.springBeans + +# Code Recommenders .recommenders/ + +# Annotation Processing +.apt_generated/ +.apt_generated_test/ + +# Scala IDE specific (Scala & Java development for Eclipse) +.cache-main +.scala_dependencies +.worksheet + +# Uncomment this line if you wish to ignore the project description file. +# Typically, this file would be tracked if it contains build/dependency configurations: +#.project + +### Eclipse Patch ### +# Spring Boot Tooling +.sts4-cache/ + +### Intellij ### +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# Generated files +.idea/**/contentModel.xml + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml +.idea/**/libraries + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/artifacts +# .idea/compiler.xml +# .idea/jarRepositories.xml +# .idea/modules.xml +# .idea/*.iml +# .idea/modules +# *.iml +# *.ipr + +# CMake +cmake-build-*/ + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# File-based project format +*.iws + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Editor-based Rest Client +.idea/httpRequests + +# Android studio 3.1+ serialized cache file +.idea/caches/build_file_checksums.ser + +### Intellij Patch ### +# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721 + +# *.iml +# modules.xml +# .idea/misc.xml +# *.ipr + +# Sonarlint plugin +# https://plugins.jetbrains.com/plugin/7973-sonarlint +.idea/**/sonarlint/ + +# SonarQube Plugin +# https://plugins.jetbrains.com/plugin/7238-sonarqube-community-plugin +.idea/**/sonarIssues.xml + +# Markdown Navigator plugin +# https://plugins.jetbrains.com/plugin/7896-markdown-navigator-enhanced +.idea/**/markdown-navigator.xml +.idea/**/markdown-navigator-enh.xml +.idea/**/markdown-navigator/ + +# Cache file creation bug +# See https://youtrack.jetbrains.com/issue/JBR-2257 +.idea/$CACHE_FILE$ + +# CodeStream plugin +# https://plugins.jetbrains.com/plugin/12206-codestream +.idea/codestream.xml + +### Intellij+all ### +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff + +# Generated files + +# Sensitive or high-churn files + +# Gradle + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/artifacts +# .idea/compiler.xml +# .idea/jarRepositories.xml +# .idea/modules.xml +# .idea/*.iml +# .idea/modules +# *.iml +# *.ipr + +# CMake + +# Mongo Explorer plugin + +# File-based project format + +# IntelliJ + +# mpeltonen/sbt-idea plugin + +# JIRA plugin + +# Cursive Clojure plugin + +# Crashlytics plugin (for Android Studio and IntelliJ) + +# Editor-based Rest Client + +# Android studio 3.1+ serialized cache file + +### Intellij+all Patch ### +# Ignores the whole .idea folder and all .iml files +# See https://github.com/joeblau/gitignore.io/issues/186 and https://github.com/joeblau/gitignore.io/issues/360 + +.idea/ + +# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023 + +*.iml +modules.xml +.idea/misc.xml +*.ipr + +# Sonarlint plugin +.idea/sonarlint + +### Intellij+iml ### +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff + +# Generated files + +# Sensitive or high-churn files + +# Gradle + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/artifacts +# .idea/compiler.xml +# .idea/jarRepositories.xml +# .idea/modules.xml +# .idea/*.iml +# .idea/modules +# *.iml +# *.ipr + +# CMake + +# Mongo Explorer plugin + +# File-based project format + +# IntelliJ + +# mpeltonen/sbt-idea plugin + +# JIRA plugin + +# Cursive Clojure plugin + +# Crashlytics plugin (for Android Studio and IntelliJ) + +# Editor-based Rest Client + +# Android studio 3.1+ serialized cache file + +### Intellij+iml Patch ### +# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023 + + +### Java ### +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +### Maven ### +target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next +release.properties +dependency-reduced-pom.xml +buildNumber.properties +.mvn/timing.properties +# https://github.com/takari/maven-wrapper#usage-without-binary-jar +.mvn/wrapper/maven-wrapper.jar + +# End of https://www.toptal.com/developers/gitignore/api/maven,eclipse,intellij,intellij+iml,java,intellij+all + + *.cryslbin \ No newline at end of file From 5dc96d67b8ea40e693bb0d796b48fa2377f636ca Mon Sep 17 00:00:00 2001 From: AnakinSklavenwalker Date: Mon, 12 Oct 2020 11:50:01 +0200 Subject: [PATCH 5/7] update CrySL dependency to 2.0.1 --- .../feature.xml | 94 +++++++++---------- .../META-INF/MANIFEST.MF | 6 +- plugins/de.cognicrypt.crysl.handler/pom.xml | 6 +- .../cognicrypt/crysl/reader/CrySLParser.java | 53 ++++++++++- repository/category.xml | 2 +- 5 files changed, 105 insertions(+), 56 deletions(-) diff --git a/features/de.cognicrypt.cryslhandler.feature/feature.xml b/features/de.cognicrypt.cryslhandler.feature/feature.xml index e249f85b4..20617e07a 100644 --- a/features/de.cognicrypt.cryslhandler.feature/feature.xml +++ b/features/de.cognicrypt.cryslhandler.feature/feature.xml @@ -1,11 +1,11 @@ - - - - + + + + CogniCrypt is an Eclipse plugin that supports Java developers in using cryptographic APIs. It supports developers in two ways. First, it may generate code snippets for a number of programming @@ -13,14 +13,14 @@ tasks that involve cryptography, e.g., communication over a secure channel, data encryption, and long-term archiving. Second, it continuously runs a suite of static analyses in the background that check the developer's code for misuses of cryptographic -APIs. - - - - Copyrights reserved. - - - +APIs. + + + + Copyrights reserved. + + + Eclipse Public License - v 2.0 THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. 1. DEFINITIONS @@ -96,34 +96,34 @@ All Recipient's rights under this Agreement shall terminate if it fails to Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be Distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to Distribute the Program (including its Contributions) under the new version. -Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved. Nothing in this Agreement is intended to be enforceable by any entity that is not a Contributor or Recipient. No third-party beneficiary rights are created under this Agreement. - - - - - - - - - - - - - - - - - - - - - - - - - +Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved. Nothing in this Agreement is intended to be enforceable by any entity that is not a Contributor or Recipient. No third-party beneficiary rights are created under this Agreement. + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/de.cognicrypt.crysl.handler/META-INF/MANIFEST.MF b/plugins/de.cognicrypt.crysl.handler/META-INF/MANIFEST.MF index 7ef4a3861..9a5a6b4c3 100644 --- a/plugins/de.cognicrypt.crysl.handler/META-INF/MANIFEST.MF +++ b/plugins/de.cognicrypt.crysl.handler/META-INF/MANIFEST.MF @@ -13,9 +13,9 @@ Require-Bundle: org.eclipse.ui, org.eclipse.jdt.core, org.eclipse.xtext, org.eclipse.xtext.common.types.ui, - de.darmstadt.tu.crossing.CrySL.ui;bundle-version="2.0.0", - de.darmstadt.tu.crossing.CrySL;bundle-version="2.0.0", - de.darmstadt.tu.crossing.CrySL.ide;bundle-version="2.0.0", + de.darmstadt.tu.crossing.CrySL.ui;bundle-version="2.0.1", + de.darmstadt.tu.crossing.CrySL;bundle-version="2.0.1", + de.darmstadt.tu.crossing.CrySL.ide;bundle-version="2.0.1", de.cognicrypt.core;bundle-version="1.0.0", org.junit Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/plugins/de.cognicrypt.crysl.handler/pom.xml b/plugins/de.cognicrypt.crysl.handler/pom.xml index 78a07d2bb..c1503748b 100644 --- a/plugins/de.cognicrypt.crysl.handler/pom.xml +++ b/plugins/de.cognicrypt.crysl.handler/pom.xml @@ -158,17 +158,17 @@ de.darmstadt.tu.crossing.CrySL de.darmstadt.tu.crossing.CrySL - 2.0.0 + 2.0.1 de.darmstadt.tu.crossing.CrySL de.darmstadt.tu.crossing.CrySL.ide - 2.0.0 + 2.0.1 de.darmstadt.tu.crossing.CrySL de.darmstadt.tu.crossing.CrySL.ui - 2.0.0 + 2.0.1 diff --git a/plugins/de.cognicrypt.crysl.handler/src/main/java/de/cognicrypt/crysl/reader/CrySLParser.java b/plugins/de.cognicrypt.crysl.handler/src/main/java/de/cognicrypt/crysl/reader/CrySLParser.java index 9d9e3323a..99c29b28d 100644 --- a/plugins/de.cognicrypt.crysl.handler/src/main/java/de/cognicrypt/crysl/reader/CrySLParser.java +++ b/plugins/de.cognicrypt.crysl.handler/src/main/java/de/cognicrypt/crysl/reader/CrySLParser.java @@ -37,6 +37,7 @@ import org.eclipse.xtext.common.types.access.jdt.JdtTypeProviderFactory; import org.eclipse.xtext.resource.XtextResource; import org.eclipse.xtext.resource.XtextResourceSet; +import com.google.common.base.CharMatcher; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.io.Files; @@ -340,7 +341,13 @@ private List retrieveReqPredFromAltPreds(ReqPred left) { private CrySLPredicate extractReqPred(final ReqPred pred) { final List variables = new ArrayList<>(); PredLit innerPred = (PredLit) pred; - final Constraint conditional = innerPred.getCons(); + EObject cons = innerPred.getCons(); + ISLConstraint conditional = null; + if (cons instanceof Constraint) { + conditional = getConstraint((Constraint) cons); + } else if (cons instanceof Pred) { + conditional = getPredicate((Pred) cons); + } if (innerPred.getPred().getParList() != null) { for (final SuPar var : innerPred.getPred().getParList().getParameters()) { if (var.getVal() != null) { @@ -361,7 +368,45 @@ private CrySLPredicate extractReqPred(final ReqPred pred) { } } } - return new CrySLPredicate(null, innerPred.getPred().getPredName(), variables, (innerPred.getNot() != null ? true : false), getConstraint(conditional)); + return new CrySLPredicate(null, innerPred.getPred().getPredName(), variables, (innerPred.getNot() != null ? true : false), conditional); + } + + private ISLConstraint getPredicate(Pred pred) { + final List variables = new ArrayList<>(); + if (pred.getParList() != null) { + for (final SuPar var : pred.getParList().getParameters()) { + if (var.getVal() != null) { + final LiteralExpression lit = var.getVal(); + final ObjectImpl object = (ObjectImpl) ((LiteralExpression) lit.getLit().getName()).getValue(); + final String type = ((ObjectDecl) object.eContainer()).getObjectType().getQualifiedName(); + final String variable = object.getName(); + final String part = var.getVal().getPart(); + if (part != null) { + variables.add(new CrySLObject(variable, type, new CrySLSplitter(Integer.parseInt(lit.getInd()), filterQuotes(lit.getSplit())))); + } else { + final String consPred = var.getVal().getConsPred(); + int ind; + if (consPred != null) { + if (consPred.equals("alg(")) { + ind = 0; + variables.add(new CrySLObject(variable, type, new CrySLSplitter(ind, filterQuotes("/")))); + } else if (consPred.equals("mode(")) { + ind = 1; + variables.add(new CrySLObject(variable, type, new CrySLSplitter(ind, filterQuotes("/")))); + } else if (consPred.equals("pad(")) { + ind = 2; + variables.add(new CrySLObject(variable, type, new CrySLSplitter(ind, filterQuotes("/")))); + } + } else { + variables.add(new CrySLObject(variable, type)); + } + } + } else { + variables.add(new CrySLObject(UNDERSCORE, NULL)); + } + } + } + return new CrySLPredicate(null, pred.getPredName(), variables, (((PredLit)pred.eContainer()).getNot() != null ? true : false), null); } private CrySLArithmeticConstraint convertLiteralToArithmetic(final Constraint expression) { @@ -752,4 +797,8 @@ private String getValueOfLiteral(final EObject name) { } return Utils.filterQuotes(value); } + + private static String filterQuotes(final String dirty) { + return CharMatcher.anyOf("\"").removeFrom(dirty); + } } diff --git a/repository/category.xml b/repository/category.xml index 2b0031636..cd6d5731f 100644 --- a/repository/category.xml +++ b/repository/category.xml @@ -9,7 +9,7 @@ - + From 3ed50bc302e2b6687e182b2f3462b31e788f1023 Mon Sep 17 00:00:00 2001 From: AnakinSklavenwalker Date: Fri, 16 Oct 2020 11:11:43 +0200 Subject: [PATCH 6/7] update missing CrySL dependency to 2.0.1 --- repository/category.xml | 46 ++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/repository/category.xml b/repository/category.xml index cd6d5731f..97cd4ce24 100644 --- a/repository/category.xml +++ b/repository/category.xml @@ -1,23 +1,23 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + From 5c2b5ffff6b9f0d97de45a1a97562c6d6884275f Mon Sep 17 00:00:00 2001 From: AnakinSklavenwalker Date: Fri, 16 Oct 2020 11:22:52 +0200 Subject: [PATCH 7/7] update from 1.0.0 ---> 1.0.1 --- .../feature.xml | 96 +++++++++---------- .../pom.xml | 2 +- .../de.cognicrypt.core.feature/feature.xml | 84 ++++++++-------- features/de.cognicrypt.core.feature/pom.xml | 2 +- .../feature.xml | 6 +- .../pom.xml | 2 +- .../feature.xml | 92 +++++++++--------- .../pom.xml | 2 +- .../META-INF/MANIFEST.MF | 4 +- .../de.cognicrypt.codegenerator.tests/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 8 +- plugins/de.cognicrypt.codegenerator/pom.xml | 2 +- .../de.cognicrypt.core/META-INF/MANIFEST.MF | 2 +- plugins/de.cognicrypt.core/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 4 +- plugins/de.cognicrypt.crysl.handler/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 4 +- .../pom.xml | 2 +- .../META-INF/MANIFEST.MF | 4 +- plugins/de.cognicrypt.integrator.task/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 6 +- plugins/de.cognicrypt.staticanalyzer/pom.xml | 2 +- pom.xml | 2 +- repository/category.xml | 8 +- repository/pom.xml | 2 +- 25 files changed, 172 insertions(+), 172 deletions(-) diff --git a/features/de.cognicrypt.codegenerator.feature/feature.xml b/features/de.cognicrypt.codegenerator.feature/feature.xml index ffb258b21..1c472ee42 100644 --- a/features/de.cognicrypt.codegenerator.feature/feature.xml +++ b/features/de.cognicrypt.codegenerator.feature/feature.xml @@ -1,19 +1,19 @@ - - - - - CogniCrypt is an Eclipse plugin that supports Java developers in using cryptographic APIs. It supports developers in two ways. First, it may generate code snippets for a number of programming tasks that involve cryptography, e.g., communication over a secure channel, data encryption, and long-term archiving. Second, it continuously runs a suite of static analyses in the background that check the developer's code for misuses of cryptographic APIs. - - - - Copyrights reserved. - - - + + + + + CogniCrypt is an Eclipse plugin that supports Java developers in using cryptographic APIs. It supports developers in two ways. First, it may generate code snippets for a number of programming tasks that involve cryptography, e.g., communication over a secure channel, data encryption, and long-term archiving. Second, it continuously runs a suite of static analyses in the background that check the developer's code for misuses of cryptographic APIs. + + + + Copyrights reserved. + + + Eclipse Public License - v 2.0 THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. 1. DEFINITIONS @@ -89,35 +89,35 @@ All Recipient's rights under this Agreement shall terminate if it fails to Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be Distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to Distribute the Program (including its Contributions) under the new version. -Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved. Nothing in this Agreement is intended to be enforceable by any entity that is not a Contributor or Recipient. No third-party beneficiary rights are created under this Agreement. - - - - - - - - - - - - - - - - - - - - - - - - - - +Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved. Nothing in this Agreement is intended to be enforceable by any entity that is not a Contributor or Recipient. No third-party beneficiary rights are created under this Agreement. + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/features/de.cognicrypt.codegenerator.feature/pom.xml b/features/de.cognicrypt.codegenerator.feature/pom.xml index 855ca0288..e9d26c3dc 100644 --- a/features/de.cognicrypt.codegenerator.feature/pom.xml +++ b/features/de.cognicrypt.codegenerator.feature/pom.xml @@ -6,7 +6,7 @@ de.cognicrypt de.cognicrypt.parent - 1.0.0 + 1.0.1 ../../pom.xml diff --git a/features/de.cognicrypt.core.feature/feature.xml b/features/de.cognicrypt.core.feature/feature.xml index 007a6a4b1..ba2a62a58 100644 --- a/features/de.cognicrypt.core.feature/feature.xml +++ b/features/de.cognicrypt.core.feature/feature.xml @@ -1,11 +1,11 @@ - - - - + + + + CogniCrypt is an Eclipse plugin that supports Java developers in using cryptographic APIs. It supports developers in two ways. First, it may generate code snippets for a number of programming @@ -13,14 +13,14 @@ tasks that involve cryptography, e.g., communication over a secure channel, data encryption, and long-term archiving. Second, it continuously runs a suite of static analyses in the background that check the developer's code for misuses of cryptographic -APIs. - - - - Copyrights reserved. - - - +APIs. + + + + Copyrights reserved. + + + Eclipse Public License - v 2.0 THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. 1. DEFINITIONS @@ -96,29 +96,29 @@ All Recipient's rights under this Agreement shall terminate if it fails to Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be Distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to Distribute the Program (including its Contributions) under the new version. -Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved. Nothing in this Agreement is intended to be enforceable by any entity that is not a Contributor or Recipient. No third-party beneficiary rights are created under this Agreement. - - - - - - - - - - - - - - - - - - - - +Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved. Nothing in this Agreement is intended to be enforceable by any entity that is not a Contributor or Recipient. No third-party beneficiary rights are created under this Agreement. + + + + + + + + + + + + + + + + + + + + diff --git a/features/de.cognicrypt.core.feature/pom.xml b/features/de.cognicrypt.core.feature/pom.xml index 9e2edee92..5fea01bbc 100644 --- a/features/de.cognicrypt.core.feature/pom.xml +++ b/features/de.cognicrypt.core.feature/pom.xml @@ -6,7 +6,7 @@ de.cognicrypt de.cognicrypt.parent - 1.0.0 + 1.0.1 ../../pom.xml de.cognicrypt diff --git a/features/de.cognicrypt.cryslhandler.feature/feature.xml b/features/de.cognicrypt.cryslhandler.feature/feature.xml index 20617e07a..1adb9b711 100644 --- a/features/de.cognicrypt.cryslhandler.feature/feature.xml +++ b/features/de.cognicrypt.cryslhandler.feature/feature.xml @@ -2,7 +2,7 @@ @@ -115,7 +115,7 @@ Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives n - + @@ -123,7 +123,7 @@ Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives n id="de.cognicrypt.crysl.handler" download-size="0" install-size="0" - version="1.0.0" + version="1.0.1" unpack="false"/> diff --git a/features/de.cognicrypt.cryslhandler.feature/pom.xml b/features/de.cognicrypt.cryslhandler.feature/pom.xml index 67575a5c0..320788f24 100644 --- a/features/de.cognicrypt.cryslhandler.feature/pom.xml +++ b/features/de.cognicrypt.cryslhandler.feature/pom.xml @@ -6,7 +6,7 @@ de.cognicrypt de.cognicrypt.parent - 1.0.0 + 1.0.1 ../../pom.xml diff --git a/features/de.cognicrypt.staticanalyzer.feature/feature.xml b/features/de.cognicrypt.staticanalyzer.feature/feature.xml index bca5fefa3..fbc18b30a 100644 --- a/features/de.cognicrypt.staticanalyzer.feature/feature.xml +++ b/features/de.cognicrypt.staticanalyzer.feature/feature.xml @@ -1,19 +1,19 @@ - - - - - CogniCrypt is an Eclipse plugin that supports Java developers in using cryptographic APIs. It supports developers in two ways. First, it may generate code snippets for a number of programming tasks that involve cryptography, e.g., communication over a secure channel, data encryption, and long-term archiving. Second, it continuously runs a suite of static analyses in the background that check the developer's code for misuses of cryptographic APIs. - - - - Copyrights reserved. - - - + + + + + CogniCrypt is an Eclipse plugin that supports Java developers in using cryptographic APIs. It supports developers in two ways. First, it may generate code snippets for a number of programming tasks that involve cryptography, e.g., communication over a secure channel, data encryption, and long-term archiving. Second, it continuously runs a suite of static analyses in the background that check the developer's code for misuses of cryptographic APIs. + + + + Copyrights reserved. + + + Eclipse Public License - v 2.0 THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. 1. DEFINITIONS @@ -89,33 +89,33 @@ All Recipient's rights under this Agreement shall terminate if it fails to Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be Distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to Distribute the Program (including its Contributions) under the new version. -Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved. Nothing in this Agreement is intended to be enforceable by any entity that is not a Contributor or Recipient. No third-party beneficiary rights are created under this Agreement. - - - - - - - - - - - - - - - - - - - - - - - - +Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved. Nothing in this Agreement is intended to be enforceable by any entity that is not a Contributor or Recipient. No third-party beneficiary rights are created under this Agreement. + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/features/de.cognicrypt.staticanalyzer.feature/pom.xml b/features/de.cognicrypt.staticanalyzer.feature/pom.xml index d87d936ff..f5491cd3e 100644 --- a/features/de.cognicrypt.staticanalyzer.feature/pom.xml +++ b/features/de.cognicrypt.staticanalyzer.feature/pom.xml @@ -6,7 +6,7 @@ de.cognicrypt de.cognicrypt.parent - 1.0.0 + 1.0.1 ../../pom.xml de.cognicrypt diff --git a/plugins/de.cognicrypt.codegenerator.tests/META-INF/MANIFEST.MF b/plugins/de.cognicrypt.codegenerator.tests/META-INF/MANIFEST.MF index e8fb65550..db7516484 100644 --- a/plugins/de.cognicrypt.codegenerator.tests/META-INF/MANIFEST.MF +++ b/plugins/de.cognicrypt.codegenerator.tests/META-INF/MANIFEST.MF @@ -2,8 +2,8 @@ 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 -Fragment-Host: de.cognicrypt.codegenerator;bundle-version="1.0.0" +Bundle-Version: 1.0.1 +Fragment-Host: de.cognicrypt.codegenerator;bundle-version="1.0.1" Require-Bundle: org.eclipse.jdt.launching, de.cognicrypt.core Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/plugins/de.cognicrypt.codegenerator.tests/pom.xml b/plugins/de.cognicrypt.codegenerator.tests/pom.xml index 840c80fa0..f3f4f4a70 100644 --- a/plugins/de.cognicrypt.codegenerator.tests/pom.xml +++ b/plugins/de.cognicrypt.codegenerator.tests/pom.xml @@ -6,7 +6,7 @@ de.cognicrypt de.cognicrypt.parent - 1.0.0 + 1.0.1 ../../pom.xml diff --git a/plugins/de.cognicrypt.codegenerator/META-INF/MANIFEST.MF b/plugins/de.cognicrypt.codegenerator/META-INF/MANIFEST.MF index 32e7a0e41..d91747cba 100644 --- 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 +Bundle-Version: 1.0.1 Bundle-Activator: de.cognicrypt.codegenerator.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, @@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.ui, org.apache.commons.io;bundle-version="2.2.0", org.eclipse.ui.workbench, org.junit, - de.cognicrypt.core;bundle-version="1.0.0", + de.cognicrypt.core;bundle-version="1.0.1", org.eclipse.ui.ide, com.google.gson, org.eclipse.ui.workbench.texteditor, @@ -30,8 +30,8 @@ Bundle-ClassPath: lib/claferchocoig.jar, src/main/java/, lib/dom4j-2.0.0.jar, lib/saxon9he.jar -Automatic-Module-Name: de.cognicrypt.codegenerator -Bundle-Vendor: TU Darmstadt, Paderborn University +Automatic-Module-Name: de.cognicrypt.codegenerator +Bundle-Vendor: TU Darmstadt, Paderborn University Export-Package: de.cognicrypt.codegenerator, de.cognicrypt.codegenerator.actions, de.cognicrypt.codegenerator.crysl, diff --git a/plugins/de.cognicrypt.codegenerator/pom.xml b/plugins/de.cognicrypt.codegenerator/pom.xml index 0c7deebef..6a6297329 100644 --- a/plugins/de.cognicrypt.codegenerator/pom.xml +++ b/plugins/de.cognicrypt.codegenerator/pom.xml @@ -7,7 +7,7 @@ de.cognicrypt de.cognicrypt.parent - 1.0.0 + 1.0.1 ../../pom.xml diff --git a/plugins/de.cognicrypt.core/META-INF/MANIFEST.MF b/plugins/de.cognicrypt.core/META-INF/MANIFEST.MF index 336d9468c..8cae3ebc1 100644 --- 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 +Bundle-Version: 1.0.1 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 index 85a3a3fd4..8be92ae4b 100644 --- a/plugins/de.cognicrypt.core/pom.xml +++ b/plugins/de.cognicrypt.core/pom.xml @@ -9,7 +9,7 @@ de.cognicrypt de.cognicrypt.parent - 1.0.0 + 1.0.1 ../../pom.xml diff --git a/plugins/de.cognicrypt.crysl.handler/META-INF/MANIFEST.MF b/plugins/de.cognicrypt.crysl.handler/META-INF/MANIFEST.MF index 9a5a6b4c3..ba07b5b21 100644 --- 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 +Bundle-Version: 1.0.1 Bundle-Activator: de.cognicrypt.crysl.Activator Bundle-Vendor: TU Darmstadt, Paderborn University Require-Bundle: org.eclipse.ui, @@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.ui, de.darmstadt.tu.crossing.CrySL.ui;bundle-version="2.0.1", de.darmstadt.tu.crossing.CrySL;bundle-version="2.0.1", de.darmstadt.tu.crossing.CrySL.ide;bundle-version="2.0.1", - de.cognicrypt.core;bundle-version="1.0.0", + de.cognicrypt.core;bundle-version="1.0.1", org.junit Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy diff --git a/plugins/de.cognicrypt.crysl.handler/pom.xml b/plugins/de.cognicrypt.crysl.handler/pom.xml index c1503748b..9e91e10cd 100644 --- a/plugins/de.cognicrypt.crysl.handler/pom.xml +++ b/plugins/de.cognicrypt.crysl.handler/pom.xml @@ -8,7 +8,7 @@ de.cognicrypt de.cognicrypt.parent - 1.0.0 + 1.0.1 ../../pom.xml diff --git a/plugins/de.cognicrypt.integrator.primitive/META-INF/MANIFEST.MF b/plugins/de.cognicrypt.integrator.primitive/META-INF/MANIFEST.MF index 5ca8595fb..a940c2740 100644 --- a/plugins/de.cognicrypt.integrator.primitive/META-INF/MANIFEST.MF +++ b/plugins/de.cognicrypt.integrator.primitive/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Primitive Integrator Bundle-SymbolicName: de.cognicrypt.integrator.primitive -Bundle-Version: 1.0.0 +Bundle-Version: 1.0.1 Bundle-Activator: de.cognicrypt.integrator.primitive.Activator Bundle-Vendor: TU Darmstadt, Paderborn University Require-Bundle: org.eclipse.ui, @@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.ui, de.cognicrypt.core, com.google.gson, org.junit, - de.cognicrypt.codegenerator;bundle-version="1.0.0" + de.cognicrypt.codegenerator;bundle-version="1.0.1" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Automatic-Module-Name: de.cognicrypt.integrator.primitive Bundle-ActivationPolicy: lazy diff --git a/plugins/de.cognicrypt.integrator.primitive/pom.xml b/plugins/de.cognicrypt.integrator.primitive/pom.xml index 4312658d8..0d1a95e52 100644 --- a/plugins/de.cognicrypt.integrator.primitive/pom.xml +++ b/plugins/de.cognicrypt.integrator.primitive/pom.xml @@ -7,7 +7,7 @@ de.cognicrypt de.cognicrypt.parent - 1.0.0 + 1.0.1 ../../pom.xml diff --git a/plugins/de.cognicrypt.integrator.task/META-INF/MANIFEST.MF b/plugins/de.cognicrypt.integrator.task/META-INF/MANIFEST.MF index 2a70875a0..9a7934715 100644 --- a/plugins/de.cognicrypt.integrator.task/META-INF/MANIFEST.MF +++ b/plugins/de.cognicrypt.integrator.task/META-INF/MANIFEST.MF @@ -2,12 +2,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Task Integrator Bundle-SymbolicName: de.cognicrypt.integrator.task -Bundle-Version: 1.0.0 +Bundle-Version: 1.0.1 Bundle-Activator: de.cognicrypt.integrator.task.Activator Bundle-Vendor: TU Darmstadt, Paderborn University Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, - de.cognicrypt.codegenerator;bundle-version="1.0.0", + de.cognicrypt.codegenerator;bundle-version="1.0.1", de.cognicrypt.core, org.eclipse.ui.workbench, com.google.gson, diff --git a/plugins/de.cognicrypt.integrator.task/pom.xml b/plugins/de.cognicrypt.integrator.task/pom.xml index 62b20058a..a6304f20e 100644 --- a/plugins/de.cognicrypt.integrator.task/pom.xml +++ b/plugins/de.cognicrypt.integrator.task/pom.xml @@ -7,7 +7,7 @@ de.cognicrypt de.cognicrypt.parent - 1.0.0 + 1.0.1 ../../pom.xml diff --git a/plugins/de.cognicrypt.staticanalyzer/META-INF/MANIFEST.MF b/plugins/de.cognicrypt.staticanalyzer/META-INF/MANIFEST.MF index 308ede790..5ff61bcf8 100644 --- 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 +Bundle-Version: 1.0.1 Bundle-Activator: de.cognicrypt.staticanalyzer.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, @@ -14,10 +14,10 @@ Require-Bundle: org.eclipse.ui, org.eclipse.jface.text;bundle-version="3.11.0", org.eclipse.emf.common, org.eclipse.m2e.maven.runtime, - de.cognicrypt.core;bundle-version="1.0.0", + de.cognicrypt.core;bundle-version="1.0.1", com.google.guava, org.eclipse.jdt.launching, - de.cognicrypt.crysl.handler;bundle-version="1.0.0" + de.cognicrypt.crysl.handler;bundle-version="1.0.1" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Bundle-ClassPath: ., diff --git a/plugins/de.cognicrypt.staticanalyzer/pom.xml b/plugins/de.cognicrypt.staticanalyzer/pom.xml index c6a18be08..2fde25bff 100644 --- a/plugins/de.cognicrypt.staticanalyzer/pom.xml +++ b/plugins/de.cognicrypt.staticanalyzer/pom.xml @@ -8,7 +8,7 @@ de.cognicrypt de.cognicrypt.parent - 1.0.0 + 1.0.1 ../../pom.xml diff --git a/pom.xml b/pom.xml index eebf3c94f..e92bc15d9 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 de.cognicrypt de.cognicrypt.parent - 1.0.0 + 1.0.1 pom diff --git a/repository/category.xml b/repository/category.xml index 97cd4ce24..72e475729 100644 --- a/repository/category.xml +++ b/repository/category.xml @@ -1,18 +1,18 @@ - + - + - + - + diff --git a/repository/pom.xml b/repository/pom.xml index 109fcc4a0..1a5041169 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -6,7 +6,7 @@ de.cognicrypt de.cognicrypt.parent - 1.0.0 + 1.0.1 ../pom.xml