diff --git a/Jenkinsfile b/Jenkinsfile
index c1ff1abd..43a54eeb 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,4 +1,4 @@
-def mvnProfile = 'galasa-dev'
+def mvnProfile = 'dev'
def galasaSignJarSkip = 'true'
pipeline {
@@ -23,22 +23,24 @@ pipeline {
}
steps {
script {
- mvnGoal = 'deploy sonar:sonar'
+ mvnGoal = 'deploy sonar:sonar'
+ galasaSignJarSkip = 'false'
+ }
+ }
+ }
+// If it is the master branch, version 0.3.0 and master on all the other branches
+ stage('set-staging') {
+ when {
+ environment name: 'GIT_BRANCH', value: 'origin/staging'
+ }
+ steps {
+ script {
+ mvnGoal = 'deploy'
+ mvnProfile = 'staging'
galasaSignJarSkip = 'false'
}
}
}
-// If the test-preprod tag, then set as appropriate
-// stage('set-test-preprod') {
-// when {
-// environment name: 'GIT_BRANCH', value: 'origin/testpreprod'
-// }
-// steps {
-// script {
-// mvnProfile = 'galasa-preprod'
-// }
-// }
-// }
// for debugging purposes
stage('report') {
@@ -67,29 +69,33 @@ pipeline {
stage('SimPlatform Application') {
steps {
- withSonarQubeEnv('GalasaSonarQube') {
- dir('galasa-simplatform-application') {
- sh "mvn --settings ${workspace}/settings.xml -Dmaven.repo.local=${workspace}/repository -P ${mvnProfile} -B -e -fae --non-recursive ${mvnGoal}"
+ withCredentials([string(credentialsId: 'galasa-gpg', variable: 'GPG')]) {
+ withSonarQubeEnv('GalasaSonarQube') {
+ dir('galasa-simplatform-application') {
+ sh "mvn --settings ${workspace}/settings.xml -Dmaven.repo.local=${workspace}/repository -Dgpg.skip=false -Dgpg.passphrase=$GPG -P ${mvnProfile} -B -e -fae --non-recursive ${mvnGoal}"
+ }
}
}
}
}
stage('SimBank-Tests') {
steps {
- withSonarQubeEnv('GalasaSonarQube') {
- dir('galasa-simbank-tests') {
- sh "mvn --settings ${workspace}/settings.xml -Dmaven.repo.local=${workspace}/repository -P ${mvnProfile} -B -e -fae --non-recursive ${mvnGoal}"
+ withCredentials([string(credentialsId: 'galasa-gpg', variable: 'GPG')]) {
+ withSonarQubeEnv('GalasaSonarQube') {
+ dir('galasa-simbank-tests') {
+ sh "mvn --settings ${workspace}/settings.xml -Dmaven.repo.local=${workspace}/repository -Dgpg.skip=false -Dgpg.passphrase=$GPG -P ${mvnProfile} -B -e -fae --non-recursive ${mvnGoal}"
- dir('dev.galasa.simbank.manager') {
- sh "mvn --settings ${workspace}/settings.xml -Dmaven.repo.local=${workspace}/repository -P ${mvnProfile} -B -e -fae --non-recursive ${mvnGoal}"
- }
+ dir('dev.galasa.simbank.manager') {
+ sh "mvn --settings ${workspace}/settings.xml -Dmaven.repo.local=${workspace}/repository -Dgpg.skip=false -Dgpg.passphrase=$GPG -P ${mvnProfile} -B -e -fae --non-recursive ${mvnGoal}"
+ }
- dir('dev.galasa.simbank.tests') {
- sh "mvn --settings ${workspace}/settings.xml -Dmaven.repo.local=${workspace}/repository -P ${mvnProfile} -B -e -fae --non-recursive ${mvnGoal}"
- }
+ dir('dev.galasa.simbank.tests') {
+ sh "mvn --settings ${workspace}/settings.xml -Dmaven.repo.local=${workspace}/repository -Dgpg.skip=false -Dgpg.passphrase=$GPG -P ${mvnProfile} -B -e -fae --non-recursive ${mvnGoal}"
+ }
- dir('dev.galasa.simbank.obr') {
- sh "mvn --settings ${workspace}/settings.xml -Dmaven.repo.local=${workspace}/repository -P ${mvnProfile} -B -e -fae --non-recursive ${mvnGoal}"
+ dir('dev.galasa.simbank.obr') {
+ sh "mvn --settings ${workspace}/settings.xml -Dmaven.repo.local=${workspace}/repository -Dgpg.skip=false -Dgpg.passphrase=$GPG -P ${mvnProfile} -B -e -fae --non-recursive ${mvnGoal}"
+ }
}
}
}
@@ -97,18 +103,19 @@ pipeline {
}
stage('SimBank Eclipse Comms Maven') {
steps {
- withSonarQubeEnv('GalasaSonarQube') {
- dir('galasa-simbank-eclipse') {
- sh "mvn --settings ${workspace}/settings.xml -Dmaven.repo.local=${workspace}/repository -P ${mvnProfile} -B -e -fae --non-recursive ${mvnGoal}"
+ withCredentials([string(credentialsId: 'galasa-gpg', variable: 'GPG')]) {
+ withSonarQubeEnv('GalasaSonarQube') {
+ dir('galasa-simbank-eclipse') {
+ sh "mvn --settings ${workspace}/settings.xml -Dmaven.repo.local=${workspace}/repository -Dgpg.skip=false -Dgpg.passphrase=$GPG -P ${mvnProfile} -B -e -fae --non-recursive ${mvnGoal}"
- dir('dev.galasa.simbank.ui') {
- sh "mvn --settings ${workspace}/settings.xml -Dmaven.repo.local=${workspace}/repository -Djarsigner.skip=${galasaSignJarSkip} -P ${mvnProfile} -B -e -fae --non-recursive ${mvnGoal}"
- }
+ dir('dev.galasa.simbank.ui') {
+ sh "mvn --settings ${workspace}/settings.xml -Dmaven.repo.local=${workspace}/repository -Djarsigner.skip=${galasaSignJarSkip} -Dgpg.skip=false -Dgpg.passphrase=$GPG -P ${mvnProfile} -B -e -fae --non-recursive ${mvnGoal}"
+ }
- dir('dev.galasa.simbank.feature') {
- sh "mvn --settings ${workspace}/settings.xml -Dmaven.repo.local=${workspace}/repository -Djarsigner.skip=${galasaSignJarSkip} -P ${mvnProfile} -B -e -fae --non-recursive ${mvnGoal}"
+ dir('dev.galasa.simbank.feature') {
+ sh "mvn --settings ${workspace}/settings.xml -Dmaven.repo.local=${workspace}/repository -Djarsigner.skip=${galasaSignJarSkip} -Dgpg.skip=false -Dgpg.passphrase=$GPG -P ${mvnProfile} -B -e -fae --non-recursive ${mvnGoal}"
+ }
}
-
}
}
}
diff --git a/galasa-simbank-eclipse/dev.galasa.simbank.feature/feature.xml b/galasa-simbank-eclipse/dev.galasa.simbank.feature/feature.xml
index 4dec96ac..34d8d570 100644
--- a/galasa-simbank-eclipse/dev.galasa.simbank.feature/feature.xml
+++ b/galasa-simbank-eclipse/dev.galasa.simbank.feature/feature.xml
@@ -2,7 +2,7 @@
@@ -296,4 +296,5 @@ version(s), and exceptions or additional permissions here}."
download-size="0"
install-size="0"
version="0.3.0.qualifier"/>
+
diff --git a/galasa-simbank-eclipse/dev.galasa.simbank.feature/pom.xml b/galasa-simbank-eclipse/dev.galasa.simbank.feature/pom.xml
index 92febd94..fb7d8d65 100644
--- a/galasa-simbank-eclipse/dev.galasa.simbank.feature/pom.xml
+++ b/galasa-simbank-eclipse/dev.galasa.simbank.feature/pom.xml
@@ -6,7 +6,7 @@
dev.galasa
galasa-simbank-eclipse
- 0.3.0-SNAPSHOT
+ 0.3.0
@@ -18,7 +18,7 @@
dev.galasa
dev.galasa.simbank.ui
- 0.3.0-SNAPSHOT
+ 0.3.0
diff --git a/galasa-simbank-eclipse/dev.galasa.simbank.ui/META-INF/MANIFEST.MF b/galasa-simbank-eclipse/dev.galasa.simbank.ui/META-INF/MANIFEST.MF
index 335ccb9e..37cc7636 100644
--- a/galasa-simbank-eclipse/dev.galasa.simbank.ui/META-INF/MANIFEST.MF
+++ b/galasa-simbank-eclipse/dev.galasa.simbank.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Galasa SimBank
Bundle-SymbolicName: dev.galasa.simbank.ui;singleton:=true
-Bundle-Version: 0.3.0.qualifier
+Bundle-Version: 0.3.0
Automatic-Module-Name: dev.galasa.simbank.ui
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.ui,
diff --git a/galasa-simbank-eclipse/dev.galasa.simbank.ui/pom.xml b/galasa-simbank-eclipse/dev.galasa.simbank.ui/pom.xml
index 87ddd11d..634b139a 100644
--- a/galasa-simbank-eclipse/dev.galasa.simbank.ui/pom.xml
+++ b/galasa-simbank-eclipse/dev.galasa.simbank.ui/pom.xml
@@ -6,11 +6,11 @@
dev.galasa
galasa-simbank-eclipse
- 0.3.0-SNAPSHOT
+ 0.3.0
dev.galasa.simbank.ui
- 0.3.0-SNAPSHOT
+ 0.3.0
eclipse-plugin
Galasa SimBank UI
@@ -31,12 +31,12 @@
-
dev.galasa
galasa-simplatform
- 0.3.0-SNAPSHOT
+ 0.3.0
-
dev.galasa
galasa-simbanktests-parent
- 0.3.0-SNAPSHOT
+ 0.3.0
examples
zip
diff --git a/galasa-simbank-eclipse/pom.xml b/galasa-simbank-eclipse/pom.xml
index 3124c02f..b677ee0a 100644
--- a/galasa-simbank-eclipse/pom.xml
+++ b/galasa-simbank-eclipse/pom.xml
@@ -6,11 +6,11 @@
dev.galasa
galasa-eclipse-parent
- 0.3.0-SNAPSHOT
+ 0.3.0
galasa-simbank-eclipse
- 0.3.0-SNAPSHOT
+ 0.3.0
pom
Galasa Simbank Eclipse Parent
@@ -18,14 +18,14 @@
dev.galasa.simbank.ui
dev.galasa.simbank.feature
-
+
-
- dev.galasa
- dev.galasa.eclipse
- 0.3.0-SNAPSHOT
- eclipse-plugin
-
+
+ dev.galasa
+ dev.galasa.eclipse
+ [0.3.0,1.0.0)
+ eclipse-plugin
+
\ No newline at end of file
diff --git a/galasa-simbank-tests/dev.galasa.simbank.manager/pom-example.xml b/galasa-simbank-tests/dev.galasa.simbank.manager/pom-example.xml
index ec3e5257..2042d0d7 100644
--- a/galasa-simbank-tests/dev.galasa.simbank.manager/pom-example.xml
+++ b/galasa-simbank-tests/dev.galasa.simbank.manager/pom-example.xml
@@ -23,7 +23,7 @@
dev.galasa
galasa-bom
- 0.3.0-SNAPSHOT
+ 0.3.0
pom
import
diff --git a/galasa-simbank-tests/dev.galasa.simbank.manager/pom.xml b/galasa-simbank-tests/dev.galasa.simbank.manager/pom.xml
index df24f575..f10b001f 100644
--- a/galasa-simbank-tests/dev.galasa.simbank.manager/pom.xml
+++ b/galasa-simbank-tests/dev.galasa.simbank.manager/pom.xml
@@ -6,13 +6,13 @@
dev.galasa
galasa-simbanktests-parent
- 0.3.0-SNAPSHOT
+ 0.3.0
Galasa SimBank Manager
dev.galasa.simbank.manager
- 0.3.0-SNAPSHOT
+ 0.3.0
bundle
diff --git a/galasa-simbank-tests/dev.galasa.simbank.obr/pom.xml b/galasa-simbank-tests/dev.galasa.simbank.obr/pom.xml
index ae24f8b8..05d00295 100644
--- a/galasa-simbank-tests/dev.galasa.simbank.obr/pom.xml
+++ b/galasa-simbank-tests/dev.galasa.simbank.obr/pom.xml
@@ -6,26 +6,26 @@
dev.galasa
galasa-simbanktests-parent
- 0.3.0-SNAPSHOT
+ 0.3.0
Galasa SimBank OBR
dev.galasa.simbank.obr
- 0.3.0-SNAPSHOT
+ 0.3.0
galasa-obr
dev.galasa
dev.galasa.simbank.tests
- 0.3.0-SNAPSHOT
+ 0.3.0
compile
dev.galasa
dev.galasa.simbank.manager
- 0.3.0-SNAPSHOT
+ 0.3.0
compile
diff --git a/galasa-simbank-tests/dev.galasa.simbank.tests/pom-example.xml b/galasa-simbank-tests/dev.galasa.simbank.tests/pom-example.xml
index 8ab88913..11ae6129 100644
--- a/galasa-simbank-tests/dev.galasa.simbank.tests/pom-example.xml
+++ b/galasa-simbank-tests/dev.galasa.simbank.tests/pom-example.xml
@@ -23,7 +23,7 @@
dev.galasa
galasa-bom
- 0.3.0-SNAPSHOT
+ 0.3.0
pom
import
diff --git a/galasa-simbank-tests/dev.galasa.simbank.tests/pom.xml b/galasa-simbank-tests/dev.galasa.simbank.tests/pom.xml
index d2261903..5f9356a7 100644
--- a/galasa-simbank-tests/dev.galasa.simbank.tests/pom.xml
+++ b/galasa-simbank-tests/dev.galasa.simbank.tests/pom.xml
@@ -6,20 +6,20 @@
dev.galasa
galasa-simbanktests-parent
- 0.3.0-SNAPSHOT
+ 0.3.0
Galasa SimBank Example Tests
dev.galasa.simbank.tests
- 0.3.0-SNAPSHOT
+ 0.3.0
bundle
dev.galasa
dev.galasa.simbank.manager
- 0.3.0-SNAPSHOT
+ 0.3.0
provided
diff --git a/galasa-simbank-tests/pom.xml b/galasa-simbank-tests/pom.xml
index 43bab349..b8a8f2ba 100644
--- a/galasa-simbank-tests/pom.xml
+++ b/galasa-simbank-tests/pom.xml
@@ -5,10 +5,57 @@
dev.galasa
galasa-simbanktests-parent
- 0.3.0-SNAPSHOT
+ 0.3.0
pom
Galasa Sample SimBank Tests
+ Sample test to run with Galasa against the SimBank application
+ https://galasa.dev
+
+
+
+ Eclipse Public License - v 2.0
+ https://www.eclipse.org/legal/epl-2.0/t
+
+
+
+
+
+ Michael Baylis
+ Michael.Baylis@uk.ibm.com
+ IBM
+ https://www.ibm.com
+
+
+ William Yates
+ wyates@uk.ibm.com
+ IBM
+ https://www.ibm.com
+
+
+ David Roberts
+ david.roberts@uk.ibm.com
+ IBM
+ https://www.ibm.com
+
+
+ James Davies
+ james.davies@ibm.com
+ IBM
+ https://www.ibm.com
+
+
+
+
+ https://github.com/galasa-dev/framework
+ scm:git:git:://github.com/galasa-dev/framework
+ scm:git:git:://github.com/galasa-dev/framework
+
+
+
+ https://github.com/galasa-dev/projectmanagement/issues
+ GitHub
+
dev.galasa.simbank.tests
@@ -19,11 +66,11 @@
galasa.repo
- ${galasa.distribution.repo}
+ ${galasa.release.repo}
galasa.repo
- ${galasa.distribution.repo}
+ ${galasa.snapshot.repo}
@@ -35,9 +82,6 @@
1.8
yyyyMMddHHmm
- 0.3.0-SNAPSHOT
- 0.3.0-SNAPSHOT
-
true
@@ -46,7 +90,7 @@
dev.galasa
galasa-bom
- 0.3.0-SNAPSHOT
+ 0.3.0
pom
import
@@ -216,6 +260,27 @@
+
+ org.apache.maven.plugins
+ maven-gpg-plugin
+ 1.5
+
+
+ sign-artifacts
+ verify
+
+ sign
+
+
+
+ --pinentry-mode
+ loopback
+
+ gpg.passphrase
+
+
+
+
diff --git a/galasa-simplatform-application/pom.xml b/galasa-simplatform-application/pom.xml
index 908faeeb..1816f0db 100644
--- a/galasa-simplatform-application/pom.xml
+++ b/galasa-simplatform-application/pom.xml
@@ -5,19 +5,66 @@
dev.galasa
galasa-simplatform
- 0.3.0-SNAPSHOT
+ 0.3.0
jar
Galasa SimPlatform
+ The SimPlatform and SimBank applications to allow for Galasa tutorials and samples
+ https://galasa.dev
+
+
+
+ Eclipse Public License - v 2.0
+ https://www.eclipse.org/legal/epl-2.0/t
+
+
+
+
+
+ Michael Baylis
+ Michael.Baylis@uk.ibm.com
+ IBM
+ https://www.ibm.com
+
+
+ William Yates
+ wyates@uk.ibm.com
+ IBM
+ https://www.ibm.com
+
+
+ David Roberts
+ david.roberts@uk.ibm.com
+ IBM
+ https://www.ibm.com
+
+
+ James Davies
+ james.davies@ibm.com
+ IBM
+ https://www.ibm.com
+
+
+
+
+ https://github.com/galasa-dev/framework
+ scm:git:git:://github.com/galasa-dev/framework
+ scm:git:git:://github.com/galasa-dev/framework
+
+
+
+ https://github.com/galasa-dev/projectmanagement/issues
+ GitHub
+
galasa.repo
- ${galasa.distribution.repo}
+ ${galasa.release.repo}
galasa.repo
- ${galasa.distribution.repo}
+ ${galasa.snapshot.repo}
@@ -34,7 +81,7 @@
dev.galasa
dev.galasa.zos3270.manager
- 0.3.0-SNAPSHOT
+ 0.3.0
@@ -98,6 +145,27 @@
+
+ org.apache.maven.plugins
+ maven-gpg-plugin
+ 1.5
+
+
+ sign-artifacts
+ verify
+
+ sign
+
+
+
+ --pinentry-mode
+ loopback
+
+ gpg.passphrase
+
+
+
+