From 49ee3946ad5b931e2a5622e9f5966f41a27f7680 Mon Sep 17 00:00:00 2001 From: Enri Ozuni Date: Sat, 8 May 2021 14:56:35 +0200 Subject: [PATCH 1/2] Update Jenkins file File is updated to include the JUnit Plug-in tests in the build stage of CogniCrypt Signed-off-by: Enri Ozuni --- Jenkinsfile | 2 +- plugins/de.cognicrypt.codegenerator.tests/pom.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index c54b315f3..f54443860 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,7 +9,7 @@ pipeline { stages { stage('Build') { steps { - sh 'mvn clean package -X -e' + sh 'mvn clean install' } } stage('Publish Snapshot'){ diff --git a/plugins/de.cognicrypt.codegenerator.tests/pom.xml b/plugins/de.cognicrypt.codegenerator.tests/pom.xml index 2d62274db..82cbeb32d 100644 --- a/plugins/de.cognicrypt.codegenerator.tests/pom.xml +++ b/plugins/de.cognicrypt.codegenerator.tests/pom.xml @@ -55,6 +55,7 @@ ${tycho-version} true + false From 6c1745e3969ccc5cb5b26e519e4b63b894ece64f Mon Sep 17 00:00:00 2001 From: Enri Ozuni Date: Sat, 8 May 2021 15:13:45 +0200 Subject: [PATCH 2/2] Refactor pom files of CogniCrypt's modules Signed-off-by: Enri Ozuni --- plugins/de.cognicrypt.codegenerator.tests/pom.xml | 1 - plugins/de.cognicrypt.codegenerator/pom.xml | 3 +-- plugins/de.cognicrypt.core/pom.xml | 1 - plugins/de.cognicrypt.crysl.handler/pom.xml | 1 - plugins/de.cognicrypt.staticanalyzer/pom.xml | 1 - 5 files changed, 1 insertion(+), 6 deletions(-) diff --git a/plugins/de.cognicrypt.codegenerator.tests/pom.xml b/plugins/de.cognicrypt.codegenerator.tests/pom.xml index 82cbeb32d..afdf1aab6 100644 --- a/plugins/de.cognicrypt.codegenerator.tests/pom.xml +++ b/plugins/de.cognicrypt.codegenerator.tests/pom.xml @@ -10,7 +10,6 @@ ../../pom.xml - de.cognicrypt de.cognicrypt.codegenerator.tests eclipse-test-plugin diff --git a/plugins/de.cognicrypt.codegenerator/pom.xml b/plugins/de.cognicrypt.codegenerator/pom.xml index 89b452306..efc54167b 100644 --- a/plugins/de.cognicrypt.codegenerator/pom.xml +++ b/plugins/de.cognicrypt.codegenerator/pom.xml @@ -151,5 +151,4 @@ - de.cognicrypt - + diff --git a/plugins/de.cognicrypt.core/pom.xml b/plugins/de.cognicrypt.core/pom.xml index ad287a7ff..aa3294a14 100644 --- a/plugins/de.cognicrypt.core/pom.xml +++ b/plugins/de.cognicrypt.core/pom.xml @@ -3,7 +3,6 @@ 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"> 4.0.0 - de.cognicrypt de.cognicrypt.core eclipse-plugin diff --git a/plugins/de.cognicrypt.crysl.handler/pom.xml b/plugins/de.cognicrypt.crysl.handler/pom.xml index 9093abb7a..e07d42eae 100644 --- a/plugins/de.cognicrypt.crysl.handler/pom.xml +++ b/plugins/de.cognicrypt.crysl.handler/pom.xml @@ -2,7 +2,6 @@ 4.0.0 - de.cognicrypt de.cognicrypt.crysl.handler eclipse-plugin diff --git a/plugins/de.cognicrypt.staticanalyzer/pom.xml b/plugins/de.cognicrypt.staticanalyzer/pom.xml index 8d647b455..5d8fac764 100644 --- a/plugins/de.cognicrypt.staticanalyzer/pom.xml +++ b/plugins/de.cognicrypt.staticanalyzer/pom.xml @@ -2,7 +2,6 @@ 4.0.0 - de.cognicrypt de.cognicrypt.staticanalyzer eclipse-plugin