cleanup & bugfixes
continuous delivery now working removed meta informations from parent now building frontend aswell typo in config merged sign and build-extras to snapshot format xml deployment script WIP added release plugin fixed deploy script enhanced deploy script added plugins for javadoc & source attachement now deploying snapshots of core and cdi fixed travis config file removed subshells generalized deploy scripts enabled release via git tag fixed pattern matching fixed release deployment now decripting key while deploying tag made deploy script prettier shortened build time debug messages Revert "shortened build time" This reverts commit d4efc9e6bfb6e4913291ba8a3e940e59c73bc6b1. Revert "debug messages" This reverts commit d9f23d1e002f8ea0b31612d4ec3873c92b3ab5a3. cleanup of deploy script added debug feature of deploy script [ci skip] added repo check fixed travis config file removed subshells Revert "shortened build time" This reverts commit d4efc9e6bfb6e4913291ba8a3e940e59c73bc6b1. generalized deploy scripts enabled release via git tag Revert "debug messages" This reverts commit d9f23d1e002f8ea0b31612d4ec3873c92b3ab5a3. testing if build fails testing commit pushing Revert "testing if build fails" This reverts commit e1a742689f20d220fdf836ea957e0df6e03ce214. deployment only on tags fixed travis file now deploying to sonatype from mustaphazorgati/taskana do not do tests [ci skip] overwrite files added head detection for branch now pushing new snapshot version back to git Updated poms to version 0.0.5-SNAPSHOT refactoring Revert "Updated poms to version 0.0.5-SNAPSHOT" This reverts commit 9f1db8824e4bca4ae076df3ea39ad2439e8ed5d5. do not build on PR-builds this should be disabled in general ... removed dryrun fixed build order and javadoc errors build only on master branch improvements fixed deploy script
This commit is contained in:
Mustapha Zorgati
Holger Hagen
parent
afa6314cd7
commit
dc6ac19c42
15
.travis.yml
15
.travis.yml
|
|
@ -11,10 +11,19 @@ cache:
|
|||
- "workplace/node_modules"
|
||||
- "admin/node_modules"
|
||||
- "monitor/node_modules"
|
||||
before_install:
|
||||
- nvm install $NODE_VERSION
|
||||
- npm install -g @angular/cli
|
||||
install:
|
||||
- mvn clean install -f lib/ -DskipTests=true -Dmaven.javadoc.skip=true -B
|
||||
- (cd workplace && npm install && ng build --environment=prod)
|
||||
&& (cd admin && npm install && ng build --environment=prod)
|
||||
&& (cd monitor && npm install && ng build --environment=prod)
|
||||
&& mvn clean install -f lib/ -DskipTests=true -Dmaven.javadoc.skip=true -B
|
||||
&& mvn clean install -f rest/ -DskipTests=true -B
|
||||
script:
|
||||
- lib/deployment/deploy.sh --dry-run lib/ lib/taskana-core/ lib/taskana-spring/ lib/taskana-cdi/
|
||||
- mvn verify -f lib/
|
||||
&& mvn verify -f rest/
|
||||
&& lib/deployment/deploy.sh lib/ lib/taskana-core/ lib/taskana-spring/ lib/taskana-cdi/
|
||||
deploy:
|
||||
provider: cloudfoundry
|
||||
username: tobias.schaefer@novatec-gmbh.de
|
||||
|
|
@ -24,4 +33,4 @@ deploy:
|
|||
organization: '"NovaTec Consulting GmbH"'
|
||||
space: Taskana
|
||||
on:
|
||||
repo: Taskana/taskana
|
||||
repo: Taskana/taskana
|
||||
|
|
|
|||
|
|
@ -34,6 +34,14 @@ function deploy {
|
|||
$debug mvn deploy -f "$1" -P "$2" --settings "$3" -DskipTests=true -B -U
|
||||
}
|
||||
|
||||
# changing version in pom and all its children
|
||||
# Arguments:
|
||||
# $1: directory of pom
|
||||
# $2: new version
|
||||
function change_version {
|
||||
mvn org.codehaus.mojo:versions-maven-plugin:2.5:set -f "$1" -DnewVersion="$2" -DartifactId=* -DgroupId=*
|
||||
}
|
||||
|
||||
function push_new_poms() {
|
||||
#setup username
|
||||
git config --global user.email "travis@travis-ci.org"
|
||||
|
|
@ -45,7 +53,7 @@ function push_new_poms() {
|
|||
git commit -m "Updated poms to version ${TRAVIS_TAG##v}-SNAPSHOT"
|
||||
|
||||
#push poms (authentication via GH_TOKEN)
|
||||
git remote add origin-pages "https://$GH_TOKEN@github.com/Taskana/taskana.git" >/dev/null 2>&1
|
||||
git remote add origin-pages "https://$GH_TOKEN@github.com/$reqRepo.git" >/dev/null 2>&1
|
||||
git push --quiet --set-upstream origin-pages "$branch"
|
||||
}
|
||||
|
||||
|
|
@ -70,27 +78,39 @@ function main {
|
|||
exit 0
|
||||
fi
|
||||
|
||||
decodeAndImportKeys `dirname "$0"`
|
||||
#this should never happen
|
||||
if [[ "$TRAVIS" == 'true' && -n $TRAVIS_PULL_REQUEST ]]; then
|
||||
echo "Skipping release to sonatype because this is a PR build"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if [[ "$TRAVIS_TAG" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
|
||||
#check if tagged commit is a head commit of any branch
|
||||
local commit=`git ls-remote origin | grep "$TRAVIS_TAG" | cut -c1-40`
|
||||
local branch=`git ls-remote origin | grep -v refs/tags | grep "$commit" | sed "s/$commit.*refs\/heads\///"`
|
||||
if [[ -z $branch ]]; then
|
||||
echo "tag $TRAVIS_TAG is not a head commit. Can not release" >&2
|
||||
echo "the commit of tag '$TRAVIS_TAG' is not a head commit. Can not release" >&2
|
||||
exit 1;
|
||||
fi
|
||||
mvn org.codehaus.mojo:versions-maven-plugin:2.5:set -f "$1" -DnewVersion="${TRAVIS_TAG##v}" -DartifactId=* -DgroupId=*
|
||||
local parent_dir="$1"
|
||||
local profile="release"
|
||||
change_version "$parent_dir" "${TRAVIS_TAG##v}"
|
||||
else
|
||||
if [[ "$TRAVIS_BRANCH" != 'master' ]]; then
|
||||
echo "Skipping release to sonatype because this branch is not permitted"
|
||||
exit 0
|
||||
fi
|
||||
local profile="snapshot"
|
||||
fi
|
||||
shift
|
||||
|
||||
decodeAndImportKeys `dirname "$0"`
|
||||
for dir in "$@"; do
|
||||
deploy "$PWD/$dir" "$profile" "`dirname "$0"`/mvnsettings.xml"
|
||||
done
|
||||
|
||||
if [[ -n $branch ]]; then
|
||||
mvn org.codehaus.mojo:versions-maven-plugin:2.5:set -f "$1" -DnewVersion="${TRAVIS_TAG##v}-SNAPSHOT" -DartifactId=* -DgroupId=*
|
||||
if [[ -n $branch && -n $parent_dir ]]; then
|
||||
change_version "$parent_dir" "${TRAVIS_TAG##v}-SNAPSHOT"
|
||||
if [[ -z $GH_TOKEN ]]; then
|
||||
echo 'GH_TOKEN not set' >&2
|
||||
exit 1
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ public interface Classification {
|
|||
|
||||
/**
|
||||
* Set/Change the classification-ID. Only ID+Domain need to be unique.
|
||||
* @param id
|
||||
* @param id TODO
|
||||
*/
|
||||
void setId(String id);
|
||||
|
||||
|
|
@ -30,7 +30,7 @@ public interface Classification {
|
|||
* Set/Change a reference to the current parent classification via ID.
|
||||
* If this field would be set to NULL the classification will become
|
||||
* a parent-classification itself.
|
||||
* @param parentClassificationId
|
||||
* @param parentClassificationId TODO
|
||||
*/
|
||||
void setParentClassificationId(String parentClassificationId);
|
||||
|
||||
|
|
@ -41,7 +41,7 @@ public interface Classification {
|
|||
|
||||
/**
|
||||
* Set/Change the category of this classification.
|
||||
* @param category
|
||||
* @param category TODO
|
||||
*/
|
||||
void setCategory(String category);
|
||||
|
||||
|
|
@ -53,7 +53,7 @@ public interface Classification {
|
|||
|
||||
/**
|
||||
* Set/Change the current type of the classification.
|
||||
* @param type
|
||||
* @param type TODO
|
||||
*/
|
||||
void setType(String type);
|
||||
|
||||
|
|
@ -98,7 +98,7 @@ public interface Classification {
|
|||
|
||||
/**
|
||||
* Set/Change the classification name.
|
||||
* @param name
|
||||
* @param name TODO
|
||||
*/
|
||||
void setName(String name);
|
||||
|
||||
|
|
@ -110,7 +110,7 @@ public interface Classification {
|
|||
|
||||
/**
|
||||
* Set/Change the classification description.
|
||||
* @param description
|
||||
* @param description TODO
|
||||
*/
|
||||
void setDescription(String description);
|
||||
|
||||
|
|
@ -122,7 +122,7 @@ public interface Classification {
|
|||
|
||||
/**
|
||||
* Set/Change the numeric priority of a classification.
|
||||
* @param priority
|
||||
* @param priority TODO
|
||||
*/
|
||||
void setPriority(int priority);
|
||||
|
||||
|
|
@ -134,7 +134,7 @@ public interface Classification {
|
|||
|
||||
/**
|
||||
* Set/Change the security level.
|
||||
* @param serviceLevel
|
||||
* @param serviceLevel TODO
|
||||
*/
|
||||
void setServiceLevel(String serviceLevel);
|
||||
|
||||
|
|
@ -146,7 +146,7 @@ public interface Classification {
|
|||
|
||||
/**
|
||||
* Set/Change the 1. custom-attribute.
|
||||
* @param custom1
|
||||
* @param custom1 TODO
|
||||
*/
|
||||
void setCustom1(String custom1);
|
||||
|
||||
|
|
@ -158,7 +158,7 @@ public interface Classification {
|
|||
|
||||
/**
|
||||
* Set/Change the 2. custom-attribute.
|
||||
* @param custom2
|
||||
* @param custom2 TODO
|
||||
*/
|
||||
void setCustom2(String custom2);
|
||||
|
||||
|
|
@ -170,7 +170,7 @@ public interface Classification {
|
|||
|
||||
/**
|
||||
* Set/Change the 3. custom-attribute.
|
||||
* @param custom3
|
||||
* @param custom3 TODO
|
||||
*/
|
||||
void setCustom3(String custom3);
|
||||
|
||||
|
|
@ -182,7 +182,7 @@ public interface Classification {
|
|||
|
||||
/**
|
||||
* Set/Change the 4. custom-attribute.
|
||||
* @param custom4
|
||||
* @param custom4 TODO
|
||||
*/
|
||||
void setCustom4(String custom4);
|
||||
|
||||
|
|
@ -194,7 +194,7 @@ public interface Classification {
|
|||
|
||||
/**
|
||||
* Set/Change the 5. custom-attribute.
|
||||
* @param custom5
|
||||
* @param custom5 TODO
|
||||
*/
|
||||
void setCustom5(String custom5);
|
||||
|
||||
|
|
@ -207,7 +207,7 @@ public interface Classification {
|
|||
|
||||
/**
|
||||
* Set/Change the 6. custom-attribute.
|
||||
* @param custom6
|
||||
* @param custom6 TODO
|
||||
*/
|
||||
void setCustom6(String custom6);
|
||||
|
||||
|
|
@ -219,7 +219,7 @@ public interface Classification {
|
|||
|
||||
/**
|
||||
* Set/Change the 7. custom-attribute.
|
||||
* @param custom7
|
||||
* @param custom7 TODO
|
||||
*/
|
||||
void setCustom7(String custom7);
|
||||
|
||||
|
|
@ -231,7 +231,7 @@ public interface Classification {
|
|||
|
||||
/**
|
||||
* Set/Change the 8. custom-attribute.
|
||||
* @param custom8
|
||||
* @param custom8 TODO
|
||||
*/
|
||||
void setCustom8(String custom8);
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,8 @@ public final class LoggerUtils {
|
|||
|
||||
/**
|
||||
* make a String for logging from a list of objects.
|
||||
* @param list
|
||||
* @param list TODO
|
||||
* @param <T> TODO
|
||||
* @return A String representation of the list.
|
||||
*/
|
||||
public static <T> String listToString(List<T> list) {
|
||||
|
|
@ -39,6 +40,8 @@ public final class LoggerUtils {
|
|||
* make a String for logging from a map.
|
||||
*
|
||||
* @param map the map to be stringified
|
||||
* @param <K> TODO
|
||||
* @param <V> TODO
|
||||
* @return A String representation of the map.
|
||||
*/
|
||||
public static <K, V> String mapToString(Map<K, V> map) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue