diff --git a/Jenkinsfile b/Jenkinsfile
index 99a57d1707c4303cae37ec8196cc61903568ed12..ee3bc3f4b7f9594db891a0661b5acc4de6571f8d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -56,9 +56,9 @@ pipeline {
FAILED_STAGE=env.STAGE_NAME
}
- configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
- sh './mvnw -pl user-manager-interface -s $MAVEN_SETTINGS clean deploy -Dmaven.wagon.http.retryHandler.count=3'
- }
+ // configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
+ // sh './mvnw -pl user-manager-interface -s $MAVEN_SETTINGS clean deploy -Dmaven.wagon.http.retryHandler.count=3'
+ // }
}
}
@@ -67,10 +67,10 @@ pipeline {
script {
FAILED_STAGE=env.STAGE_NAME
- configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
- sh './mvnw -pl user-manager-server -s $MAVEN_SETTINGS clean deploy -Dmaven.wagon.http.retryHandler.count=3'
- junit testResults: '**/target/surefire-reports/*.xml', skipPublishingChecks: true
- }
+ // configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
+ // sh './mvnw -pl user-manager-server -s $MAVEN_SETTINGS clean deploy -Dmaven.wagon.http.retryHandler.count=3'
+ // junit testResults: '**/target/surefire-reports/*.xml', skipPublishingChecks: true
+ // }
}
}
}
@@ -80,28 +80,32 @@ pipeline {
script {
FAILED_STAGE=env.STAGE_NAME
- withCredentials([usernamePassword(credentialsId: 'jenkins-nexus-login', usernameVariable: 'USER', passwordVariable: 'PASSWORD')]) {
- configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
- sh './mvnw -pl user-manager-server -s $MAVEN_SETTINGS clean verify -Pnative -Dquarkus.container-image.registry=docker.ozg-sh.de -Dquarkus.container-image.username=${USER} -Dquarkus.container-image.password=${PASSWORD} -Dquarkus.container-image.push=true -Dquarkus.container-image.build=true -Dquarkus.native.remote-container-build=true -Dmaven.wagon.http.retryHandler.count=3'
- }
- }
+ // withCredentials([usernamePassword(credentialsId: 'jenkins-nexus-login', usernameVariable: 'USER', passwordVariable: 'PASSWORD')]) {
+ // configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
+ // sh './mvnw -pl user-manager-server -s $MAVEN_SETTINGS clean verify -Pnative -Dquarkus.container-image.registry=docker.ozg-sh.de -Dquarkus.container-image.username=${USER} -Dquarkus.container-image.password=${PASSWORD} -Dquarkus.container-image.push=true -Dquarkus.container-image.build=true -Dquarkus.native.remote-container-build=true -Dmaven.wagon.http.retryHandler.count=3'
+ // }
+ // }
}
}
}
stage ('OWASP Dependency-Check Vulnerabilities') {
steps {
- dependencyCheck additionalArguments: '''
- -o "./"
- -s "./"
- -f "ALL"
- -d /dependency-check-data
- --suppression dependency-check-supressions.xml
- --disableKnownExploited
- --disableArchive
- --prettyPrint''', odcInstallation: 'dependency-check-owasp'
-
- dependencyCheckPublisher pattern: 'dependency-check-report.xml'
+ script {
+ FAILED_STAGE=env.STAGE_NAME
+ }
+
+ // dependencyCheck additionalArguments: '''
+ // -o "./"
+ // -s "./"
+ // -f "ALL"
+ // -d /dependency-check-data
+ // --suppression dependency-check-supressions.xml
+ // --disableKnownExploited
+ // --disableArchive
+ // --prettyPrint''', odcInstallation: 'dependency-check-owasp'
+
+ // dependencyCheckPublisher pattern: 'dependency-check-report.xml'
}
}
@@ -113,17 +117,17 @@ pipeline {
script {
FAILED_STAGE=env.STAGE_NAME
- configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
- dir('user-manager-server') {
- try {
- withSonarQubeEnv('sonarqube-ozg-sh'){
- sh "./mvnw -s $MAVEN_SETTINGS package sonar:sonar -Dsonar.coverage.jacoco.xmlReportPaths=${env.WORKSPACE}/user-manager-server/target/jacoco-report/jacoco.xml"
- }
- } catch (Exception e) {
- unstable("SonarQube failed")
- }
- }
- }
+ // configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
+ // dir('user-manager-server') {
+ // try {
+ // withSonarQubeEnv('sonarqube-ozg-sh'){
+ // sh "./mvnw -s $MAVEN_SETTINGS package sonar:sonar -Dsonar.coverage.jacoco.xmlReportPaths=${env.WORKSPACE}/user-manager-server/target/jacoco-report/jacoco.xml"
+ // }
+ // } catch (Exception e) {
+ // unstable("SonarQube failed")
+ // }
+ // }
+ // }
}
}
}
@@ -132,16 +136,16 @@ pipeline {
steps {
script {
FAILED_STAGE = env.STAGE_NAME
- IMAGE_TAG = generateImageTag()
+ // IMAGE_TAG = generateImageTag()
- tagAndPushDockerImage(IMAGE_TAG)
+ // tagAndPushDockerImage(IMAGE_TAG)
- if (env.BRANCH_NAME == 'master') {
- tagAndPushDockerImage('snapshot-latest')
- }
- else if (env.BRANCH_NAME == 'release') {
- tagAndPushDockerImage('latest')
- }
+ // if (env.BRANCH_NAME == 'master') {
+ // tagAndPushDockerImage('snapshot-latest')
+ // }
+ // else if (env.BRANCH_NAME == 'release') {
+ // tagAndPushDockerImage('latest')
+ // }
}
}
}
@@ -159,7 +163,7 @@ pipeline {
sh "helm package --version=${HELM_CHART_VERSION} ."
- deployHelmChart(HELM_CHART_VERSION)
+ // deployHelmChart(HELM_CHART_VERSION)
}
}
}
@@ -184,18 +188,18 @@ pipeline {
stage('Trigger Test rollout') {
when {
- branch 'release'
+ branch 'release'
}
steps {
script {
FAILED_STAGE = env.STAGE_NAME
- cloneGitopsRepo()
+ // cloneGitopsRepo()
- setNewTestUserManagerVersion()
+ // setNewTestUserManagerVersion()
- pushTestGitopsRepo()
+ // pushTestGitopsRepo()
}
}
}
diff --git a/pom.xml b/pom.xml
index d6c49622a22ea0a53bda35ffe1fd4ed7a09e77b5..88c2b91919109086f9bfb92ca17bb3df8f31c4cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>de.itvsh.kop</groupId>
<artifactId>user-manager</artifactId>
- <version>1.11.0-SNAPSHOT</version>
+ <version>1.10.0</version>
<name>User Manager Parent</name>
<packaging>pom</packaging>
diff --git a/user-manager-interface/pom.xml b/user-manager-interface/pom.xml
index bf585810bd6d0d0e528aaaafe7093fd4df8dd33c..aedd29770fa77e88cb42382edbd1045785ad391b 100644
--- a/user-manager-interface/pom.xml
+++ b/user-manager-interface/pom.xml
@@ -36,7 +36,7 @@
<groupId>de.itvsh.kop.user</groupId>
<artifactId>user-manager-interface</artifactId>
- <version>1.11.0-SNAPSHOT</version>
+ <version>1.10.0</version>
<name>UserManager Interface</name>
<description>gRPC Interface for User Manager</description>
diff --git a/user-manager-server/pom.xml b/user-manager-server/pom.xml
index 902aebbc8f876a515e713a6785eb97178bf78cc4..3d50745ed079c752c33ef646e3e0d2e99a809f2e 100644
--- a/user-manager-server/pom.xml
+++ b/user-manager-server/pom.xml
@@ -36,7 +36,7 @@
<groupId>de.itvsh.kop.user</groupId>
<artifactId>user-manager-server</artifactId>
- <version>1.11.0-SNAPSHOT</version>
+ <version>1.10.0</version>
<name>User Manager</name>
<properties>