Merge pull request #331 from tjeske/fix/deployment

fix deployment

Author: cdietrich

Jenkinsfile

@@ -57,23 +57,8 @@ timestamps() {
                 }
             }
 
-            if(env.BRANCH_NAME?.toLowerCase() == 'master') {
-                
-                stage('deploy') {
-                    withCredentials([file(credentialsId: 'secret-subkeys.asc', variable: 'KEYRING')]) {
-                        sh '''
-                        rm -r xpect-local-maven-repository
-                        gpg --batch --import "${KEYRING}"
-                        for fpr in $(gpg --list-keys --with-colons  | awk -F: '/fpr:/ {print $10}' | sort -u);
-                        do
-                            echo -e "5\ny\n" | gpg --batch --command-fd 0 --expert --edit-key $fpr trust;
-                        done
-                        '''
-                        sh "${mvnHome}/bin/mvn -P!tests -P maven-publish -Dtarget-platform=eclipse_2023_03-xtext_2_31_0 ${mvnParams} clean deploy"
-                    }
-                }
-                
-            } else if(env.BRANCH_NAME?.toLowerCase()?.startsWith('release_')) {
+            if(env.BRANCH_NAME?.toLowerCase() == 'master' ||
+               env.BRANCH_NAME?.toLowerCase()?.startsWith('release_')) {
                 stage('deploy') {
                     withCredentials([file(credentialsId: 'secret-subkeys.asc', variable: 'KEYRING')]) {
                         sh '''
@@ -86,8 +71,7 @@ timestamps() {
                         '''
                         sh "${mvnHome}/bin/mvn -P!tests -P!xtext-examples -P maven-publish -Dtarget-platform=eclipse_2023_03-xtext_2_31_0 ${mvnParams} clean deploy"
                     }
-                    
-                }
+                }               
             }
         }
         } catch(e) {