From 466368dbeb229a27f53c1f3ad1dd93fd2f5df418 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=CC=88rg=20Hohwiller?= Date: Thu, 7 Jan 2021 16:51:31 +0100 Subject: [PATCH] #320: switch default branch from develop to master --- .travis.yml | 4 ++-- pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5b5c5045..b7ae921b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,9 +26,9 @@ jobs: include: - stage: Build script: - - mvn install && ([[ $TRAVIS_BRANCH != "develop" ]] || [[ $TRAVIS_PULL_REQUEST != "false" ]] || mvn --settings .mvn/settings.xml -DskipTests=true -Darchetype.test.skip=true deploy) + - mvn install && ([[ $TRAVIS_BRANCH != "master" ]] || [[ $TRAVIS_PULL_REQUEST != "false" ]] || mvn --settings .mvn/settings.xml -DskipTests=true -Darchetype.test.skip=true deploy) - stage: Documentation - if: (branch = develop) AND (type = push) + if: (branch = master) AND (type = push) script: # Exit devon4j folder - cd .. diff --git a/pom.xml b/pom.xml index 2cd21178..04723e43 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ dev -SNAPSHOT devon4j - develop + master ${revision}${changelist} 2.3.3.RELEASE