diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..bf82ff01c6cdae4a1bb754a6e062954d77ac5c11 Binary files /dev/null and b/.mvn/wrapper/maven-wrapper.jar differ diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000000000000000000000000000000000000..70e554c8e229ddc0f489d20addd346846acb4dde --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.1/apache-maven-3.8.1-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar diff --git a/Jenkinsfile b/Jenkinsfile index b752c3f24475116d0bed1ec54880b05c43368759..4bb654c95d4aedac1173d23c27baa7f3c73d845a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -72,25 +72,29 @@ pipeline { } } - stage('Build image') { - steps { - script { - FAILED_STAGE=env.STAGE_NAME + stage('Build image') { + steps { + script { + FAILED_STAGE=env.STAGE_NAME container("docker") { - withCredentials([usernamePassword(credentialsId: 'jenkins-docker-login', usernameVariable: 'USER', passwordVariable: 'PASSWORD')]) { - sh 'docker login docker.ozg-sh.de -u ${USER} -p ${PASSWORD}' + withCredentials([usernamePassword(credentialsId: 'jenkins-docker-login', usernameVariable: 'USER', passwordVariable: 'PASSWORD')]) { + sh 'docker login docker.ozg-sh.de -u ${USER} -p ${PASSWORD}' - sh 'docker build -f Dockerfile.native -t docker.ozg-sh.de/user-manager:build-latest .' - } - } - } - } + sh './mvnw -s $MAVEN_SETTINGS clean package -Pnative -DskipTests' + + sh 'docker build -f src/main/docker/Dockerfile.native -t docker.ozg-sh.de/user-manager:build-latest .' + //sh './mvnw -s $MAVEN_SETTINGS verify -Pnative' + sleep time: 10000, unit: 'MILLISECONDS' + } + } + } + } } - - stage('Push Docker image') { - steps { - script { + + stage('Push Docker image') { + steps { + script { FAILED_STAGE=env.STAGE_NAME def pom = readMavenPom file: 'pom.xml' def version = pom.version