diff --git a/.gitignore b/.gitignore index 1428dd5..53862f9 100644 --- a/.gitignore +++ b/.gitignore @@ -55,4 +55,6 @@ local.properties wercker.env /**/.wercker **/GSModel.log* +.release + diff --git a/.releasetemplate b/.releasetemplate index 6e33baf..ac397a8 100644 --- a/.releasetemplate +++ b/.releasetemplate @@ -1,3 +1,6 @@ -**Branch:** ${env.WERCKER_GIT_BRANCH} -**Maven repository:** ${env.JUDONG_MAVEN_UPSTREAM_SNAPSHOT}/#browse/browse:maven-judo-release:hu%2Fblackbelt%2Feclipse%2F${project-shortname} -**Wercker:** https://app.wercker.com/${project-repositoryId}/runs/build/${env.WERCKER_RUN_ID} +**Branch:** +${env.WERCKER_GIT_BRANCH} +**Maven repository:** +${env.JUDONG_MAVEN_UPSTREAM_SNAPSHOT}/#browse/browse:maven-judo-release:hu%2Fblackbelt%2Feclipse%2F${project-shortname} +**Wercker:** +https://app.wercker.com/${project-repositoryId}/runs/build/${env.WERCKER_RUN_ID} diff --git a/pom.xml b/pom.xml index 6e347b2..0d5ac91 100644 --- a/pom.xml +++ b/pom.xml @@ -199,16 +199,6 @@ - - - ${project.basedir} - true - - .releasetemplate - - - - @@ -470,6 +460,46 @@ + + generate-github-release-body + + + github_release + true + + + + + + org.apache.maven.plugins + maven-resources-plugin + 3.2.0 + + + template-github-release-body + process-resources + + copy-resources + + + ${basedir}/.release + + + ${project.basedir} + true + + .releasetemplate + + + + + + + + + + + release-p2-judong diff --git a/wercker.yml b/wercker.yml index 22e4ba6..4967c6e 100644 --- a/wercker.yml +++ b/wercker.yml @@ -45,14 +45,14 @@ build: - wercker/maven: goals: deploy settings: .maven.xml - maven_opts: -Dtycho.mode=maven -DdeployOnly + maven_opts: -Dtycho.mode=maven -DdeployOnly -DskipTests=true -Dgithub_release=true profiles: ${DEPLOY_PROFILES} cache_repo: true - script: name: get github release attributes code: |- - export GITHUB_RELEASE_BODY=$(cat ./target/classes/.releasetemplate | jq -aRs . | sed 's/"//g') + export GITHUB_RELEASE_BODY=$(cat ./.release/.releasetemplate | jq -aRs . | sed 's/"//g') export GITHUB_RELEASE_TITLE=$(echo "$VERSION_NUMBER" | jq -aRs . | sed 's/"//g') echo "Release title: $GITHUB_RELEASE_TITLE" echo "Release notes: $GITHUB_RELEASE_BODY" @@ -156,7 +156,7 @@ release: - wercker/maven: goals: deploy settings: .maven.xml - maven_opts: -Dtycho.mode=maven -DdeployOnly + maven_opts: -Dtycho.mode=maven -DdeployOnly -DskipTests=true -Dgithub_release=true profiles: ${DEPLOY_PROFILES} cache_repo: true @@ -231,7 +231,7 @@ release: - script: name: get github release attributes code: |- - export GITHUB_RELEASE_BODY=$(cat ./target/classes/.releasetemplate | jq -aRs . | sed 's/"//g') + export GITHUB_RELEASE_BODY=$(cat ./.release/.releasetemplate | jq -aRs . | sed 's/"//g') export GITHUB_RELEASE_TITLE=$(echo "$VERSION_NUMBER" | jq -aRs . | sed 's/"//g') echo "Release title: $GITHUB_RELEASE_TITLE" echo "Release notes: $GITHUB_RELEASE_BODY"