diff --git a/build.gradle b/build.gradle index 8dd167dd6..f36616030 100644 --- a/build.gradle +++ b/build.gradle @@ -110,7 +110,7 @@ apply plugin: 'propdeps' apply plugin: 'idea' group = 'faforever' -version = '1.1.4' +version = '1.1.5' sourceCompatibility = 1.8 targetCompatibility = 1.8 diff --git a/src/main/resources/config/application-dev.yml b/src/main/resources/config/application-dev.yml index 0aaba090b..f2fdab1f2 100644 --- a/src/main/resources/config/application-dev.yml +++ b/src/main/resources/config/application-dev.yml @@ -22,9 +22,7 @@ faf-api: file-url-format: ${FEATURED_MOD_URL_FORMAT:http://content.test.faforever.com/faf/updaterNew/%s/%s} bireus-url-format: ${FEATURED_MOD_BIREUS_URL_FORMAT:https://content.test.faforever.com/repositories/%s} git-hub: - access-token: ${GITHUB_ACCESS_TOKEN:none} deployment-environment: ${GITHUB_DEPLOYMENT_ENVIRONMENT:development} - webhook-secret: ${GITHUB_WEBHOOK_SECRET:none} deployment: forged-alliance-exe-path: ${FORGED_ALLIANCE_EXE_PATH} repositories-directory: ${REPOSITORIES_DIRECTORY:build/cache/repos} diff --git a/src/main/resources/config/application-prod.yml b/src/main/resources/config/application-prod.yml index 95edaf429..c7fb3aa0e 100644 --- a/src/main/resources/config/application-prod.yml +++ b/src/main/resources/config/application-prod.yml @@ -23,9 +23,7 @@ faf-api: file-url-format: ${FEATURED_MOD_URL_FORMAT} bireus-url-format: ${FEATURED_MOD_BIREUS_URL_FORMAT} git-hub: - access-token: ${GITHUB_ACCESS_TOKEN:false} deployment-environment: ${GITHUB_DEPLOYMENT_ENVIRONMENT:production} - webhook-secret: ${GITHUB_WEBHOOK_SECRET:false} deployment: forged-alliance-exe-path: ${FORGED_ALLIANCE_EXE_PATH} repositories-directory: ${REPOSITORIES_DIRECTORY} diff --git a/src/main/resources/config/application.yml b/src/main/resources/config/application.yml index a82bed69f..1f00aeca6 100644 --- a/src/main/resources/config/application.yml +++ b/src/main/resources/config/application.yml @@ -15,6 +15,9 @@ faf-api: client-id: ${MAUTIC_CLIENT_ID:false} client-secret: ${MAUTIC_CLIENT_SECRET:false} access-token-url: ${MAUTIC_ACCESS_TOKEN_URL:false} + git-hub: + access-token: ${GITHUB_ACCESS_TOKEN:false} + webhook-secret: ${GITHUB_WEBHOOK_SECRET:false} spring: application: