#320: switch default branch from develop to master

devonfw · Jan 7, 2021 · 466368d · 466368d
1 parent c2396e7
commit 466368d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -27,7 +27,7 @@
     <revision>dev</revision>
     <changelist>-SNAPSHOT</changelist>
     <github.repository>devon4j</github.repository>
-    <github.default.branch>develop</github.default.branch>
+    <github.default.branch>master</github.default.branch>
     <devon4j.version>${revision}${changelist}</devon4j.version>
     <spring.boot.version>2.3.3.RELEASE</spring.boot.version>
     <!-- Spring boot and spring cloud version has to match -->