Merge pull request #29 from opengeospatial/java17Tomcat101Teamengine6

Closes #28
opengeospatial · Jan 27, 2025 · e74a5e9 · e74a5e9
2 parents a7a6907 + d26d386
commit e74a5e9
Show file tree

Hide file tree

Showing 42 changed files with 2,131 additions and 2,128 deletions.
diff --git a/jenkinsfiles/build/Jenkinsfile b/jenkinsfiles/build/Jenkinsfile
@@ -1,8 +1,8 @@
 pipeline {
   agent any
   tools {
-    maven 'mvn'
-    jdk 'JDK 8'
+    maven 'mvn396'
+    jdk 'temurin-jdk17'
   }
   stages {
     stage('Preparation') {
@@ -14,7 +14,7 @@ pipeline {
     stage('Build') {
       steps{
         sh 'mvn --version'
-        sh 'mvn clean install site -Pdocker'
+        sh 'mvn clean install site -Pintegration-tests,docker -Dsoapui.test.fail.ignore=true'
       }
     }
     stage('Results') {

diff --git a/jenkinsfiles/release/Jenkinsfile b/jenkinsfiles/release/Jenkinsfile
@@ -1,34 +1,35 @@
 pipeline {
   agent any
   tools {
-    maven 'mvn'
-    jdk 'JDK 8'
+    maven 'mvn396'
+    jdk 'temurin-jdk17'
   }
   stages {
-    stage('Preparation') {
+    stage('Initialize') {
       steps{
-        deleteDir()
-        sh 'git clone [email protected]:opengeospatial/ets-swecommon20.git .'
+        sh '''
+          echo "PATH = ${PATH}"
+          echo "M2_HOME = ${M2_HOME}"
+        '''
+        sh 'mvn --version'
       }
     }
     stage('Release') {
       steps{
-        sh 'mvn --version'
         sh 'mvn -Dresume=false -DdryRun=true release:prepare -Psign-artifacts-with-ogc,integration-tests,docker -DreleaseVersion=${releaseVersion} -DdevelopmentVersion=${developmentVersion}'
         sh 'mvn -Dresume=false release:prepare release:perform -Psign-artifacts-with-ogc,integration-tests,docker -DreleaseVersion=${releaseVersion} -DdevelopmentVersion=${developmentVersion}'
       }
     }
     stage('Publication of site') {
       steps{
-        sh 'mvn --version'
         sh 'git checkout ${releaseVersion}'
         sh 'mvn clean install site site:stage scm-publish:publish-scm'
       }
     }
     stage('Results') {
       steps{
-        junit '**/target/surefire-reports/TEST-*.xml'
-        archive 'target/*'
+        archiveArtifacts artifacts: 'target/*', allowEmptyArchive: true
+        deleteDir()
       }
     }
   }