From d65ee6fe1d568b9d4d7cdadb8da3ee8becf86e58 Mon Sep 17 00:00:00 2001
From: adoptium-bot <81295168+adoptium-bot@users.noreply.github.com>
Date: Sat, 23 Sep 2023 13:24:44 +0200
Subject: [PATCH] Reimport after updating to default config v0.2.0.

---
 otterdog/adoptium.jsonnet | 100 +++++++++++++++++++++++++++++---------
 1 file changed, 77 insertions(+), 23 deletions(-)

diff --git a/otterdog/adoptium.jsonnet b/otterdog/adoptium.jsonnet
index 767923f..667f9f5 100644
--- a/otterdog/adoptium.jsonnet
+++ b/otterdog/adoptium.jsonnet
@@ -46,8 +46,8 @@ orgs.newOrg('adoptium') {
   _repositories+:: [
     orgs.newRepo('.github') {
       allow_auto_merge: true,
-      allow_merge_commit: false,
       allow_update_branch: false,
+      delete_branch_on_merge: false,
       dependabot_alerts_enabled: false,
       web_commit_signoff_required: false,
       branch_protection_rules: [
@@ -55,22 +55,26 @@ orgs.newOrg('adoptium') {
       ],
     },
     orgs.newRepo('Incubator') {
+      allow_merge_commit: true,
       allow_update_branch: false,
+      delete_branch_on_merge: false,
       dependabot_alerts_enabled: false,
       description: "Adoptium Incubator project",
       web_commit_signoff_required: false,
     },
     orgs.newRepo('STF') {
-      allow_merge_commit: false,
       allow_update_branch: false,
       default_branch: "master",
+      delete_branch_on_merge: false,
       description: "The System Test Framework for executing https://github.com/adoptium/aqa-systemtest",
       homepage: "",
       web_commit_signoff_required: false,
     },
     orgs.newRepo('TKG') {
+      allow_merge_commit: true,
       allow_update_branch: false,
       default_branch: "master",
+      delete_branch_on_merge: false,
       dependabot_security_updates_enabled: true,
       description: "TestKitGen (TKG)",
       homepage: "",
@@ -80,8 +84,10 @@ orgs.newOrg('adoptium') {
       ],
     },
     orgs.newRepo('aarch32-jdk8u') {
+      allow_merge_commit: true,
       allow_update_branch: false,
       default_branch: "master",
+      delete_branch_on_merge: false,
       dependabot_alerts_enabled: false,
       description: "JDK8u mirror (aarch32 port). This source code is an unmodified mirror of source code obtained from OpenJDK https://github.com/openjdk/aarch32-port-jdk8u. It has been and may still be used to create builds that are untested and incompatible with the Java SE specification. You should not deploy or write to this code, but instead use the tested and certified Java SE compatible version of the code that is available at https://adoptium.net.",
       homepage: "",
@@ -95,7 +101,9 @@ orgs.newOrg('adoptium') {
       web_commit_signoff_required: false,
     },
     orgs.newRepo('adoptium') {
+      allow_merge_commit: true,
       allow_update_branch: false,
+      delete_branch_on_merge: false,
       dependabot_alerts_enabled: false,
       has_discussions: true,
       homepage: "https://adoptium.net",
@@ -109,18 +117,16 @@ orgs.newOrg('adoptium') {
       web_commit_signoff_required: false,
     },
     orgs.newRepo('adoptium-support') {
-      allow_merge_commit: false,
       allow_update_branch: false,
       default_branch: "master",
+      delete_branch_on_merge: false,
       description: "For end-user problems reported with our binary distributions",
       has_discussions: true,
       web_commit_signoff_required: false,
     },
     orgs.newRepo('adoptium.net') {
       allow_auto_merge: true,
-      allow_merge_commit: false,
       allow_update_branch: false,
-      delete_branch_on_merge: true,
       dependabot_security_updates_enabled: true,
       description: "Adoptium Website",
       homepage: "https://adoptium.net",
@@ -140,16 +146,20 @@ orgs.newOrg('adoptium') {
       ],
     },
     orgs.newRepo('alpine-jdk8u') {
+      allow_merge_commit: true,
       allow_update_branch: false,
       default_branch: "master",
+      delete_branch_on_merge: false,
       dependabot_security_updates_enabled: true,
       description: "JDK8u mirror. This source code is an unmodified mirror of source code obtained from OpenJDK https://github.com/openjdk/jdk8u. It has been and may still be used to create builds that are untested and incompatible with the Java SE specification. You should not deploy or write to this code, but instead use the tested and certified Java SE compatible",
       homepage: "",
       web_commit_signoff_required: false,
     },
     orgs.newRepo('api.adoptium.net') {
-      allow_update_branch: false,
+      allow_merge_commit: true,
       allow_squash_merge: false,
+      allow_update_branch: false,
+      delete_branch_on_merge: false,
       dependabot_alerts_enabled: false,
       description: "Adoptium API 🚀",
       homepage: "https://api.adoptium.net",
@@ -214,25 +224,25 @@ orgs.newOrg('adoptium') {
       ],
     },
     orgs.newRepo('aqa-systemtest') {
-      allow_merge_commit: false,
       allow_update_branch: false,
       default_branch: "master",
+      delete_branch_on_merge: false,
       description: "Java load testing and other full system application tests",
       web_commit_signoff_required: false,
     },
     orgs.newRepo('aqa-test-tools') {
-      allow_merge_commit: false,
       allow_update_branch: false,
       default_branch: "master",
+      delete_branch_on_merge: false,
       dependabot_security_updates_enabled: true,
       description: "Home of Test Results Summary Service (TRSS) and PerfNext.  These tools are designed to improve our ability to monitor and triage tests at the Adoptium project.  The code is generic enough that it is extensible for use by any project that needs to monitor multiple CI servers and aggregate their results.",
       homepage: "",
       web_commit_signoff_required: false,
     },
     orgs.newRepo('aqa-tests') {
-      allow_merge_commit: false,
       allow_update_branch: false,
       default_branch: "master",
+      delete_branch_on_merge: false,
       dependabot_security_updates_enabled: true,
       description: "Home of test infrastructure for Adoptium builds",
       homepage: "https://adoptium.net/aqavit",
@@ -288,16 +298,18 @@ orgs.newOrg('adoptium') {
       ],
     },
     orgs.newRepo('build-jdk') {
+      allow_merge_commit: true,
       allow_update_branch: false,
       default_branch: "master",
+      delete_branch_on_merge: false,
       dependabot_security_updates_enabled: true,
       description: "Github action for building JDKs that utilizes the build scripts from the openjdk-build repo",
       web_commit_signoff_required: false,
     },
     orgs.newRepo('bumblebench') {
-      allow_merge_commit: false,
       allow_update_branch: false,
       default_branch: "master",
+      delete_branch_on_merge: false,
       dependabot_security_updates_enabled: true,
       description: "A microbenchmarking test framework for Eclipse Adoptium",
       homepage: "",
@@ -310,9 +322,9 @@ orgs.newOrg('adoptium') {
     },
     orgs.newRepo('ci-jenkins-pipelines') {
       allow_auto_merge: true,
-      allow_merge_commit: false,
       allow_update_branch: false,
       default_branch: "master",
+      delete_branch_on_merge: false,
       dependabot_alerts_enabled: false,
       description: "jenkins pipeline build scripts",
       homepage: "",
@@ -350,9 +362,7 @@ orgs.newOrg('adoptium') {
     },
     orgs.newRepo('containers') {
       allow_auto_merge: true,
-      allow_merge_commit: false,
       allow_update_branch: false,
-      delete_branch_on_merge: true,
       dependabot_alerts_enabled: false,
       description: "Repo containing the dockerfiles and scripts to produce the official eclipse-temurin containers.",
       has_wiki: false,
@@ -376,8 +386,8 @@ orgs.newOrg('adoptium') {
     },
     orgs.newRepo('dash.adoptium.net') {
       allow_auto_merge: true,
-      allow_merge_commit: false,
       allow_update_branch: false,
+      delete_branch_on_merge: false,
       dependabot_alerts_enabled: false,
       description: "Download tracking dashboard",
       homepage: "https://dash.adoptium.net/",
@@ -433,16 +443,18 @@ orgs.newOrg('adoptium') {
       ],
     },
     orgs.newRepo('emt4j') {
+      allow_merge_commit: true,
       allow_update_branch: false,
       default_branch: "master",
+      delete_branch_on_merge: false,
       dependabot_alerts_enabled: false,
       description: "Eclipse Migration Toolkit for Java",
       web_commit_signoff_required: false,
     },
     orgs.newRepo('github-release-scripts') {
-      allow_merge_commit: false,
       allow_update_branch: false,
       default_branch: "master",
+      delete_branch_on_merge: false,
       dependabot_security_updates_enabled: true,
       description: "Scripts for release artefacts to GitHub releases",
       homepage: "",
@@ -455,9 +467,9 @@ orgs.newOrg('adoptium') {
       ],
     },
     orgs.newRepo('infrastructure') {
-      allow_merge_commit: false,
       allow_update_branch: false,
       default_branch: "master",
+      delete_branch_on_merge: false,
       dependabot_security_updates_enabled: true,
       description: "This repo contains all information about machine maintenance.",
       homepage: "",
@@ -491,8 +503,8 @@ orgs.newOrg('adoptium') {
     },
     orgs.newRepo('installer') {
       allow_auto_merge: true,
+      allow_merge_commit: true,
       default_branch: "master",
-      delete_branch_on_merge: true,
       dependabot_security_updates_enabled: true,
       description: "Installer scripts for Eclipse Temurin binaries",
       homepage: "",
@@ -515,30 +527,38 @@ orgs.newOrg('adoptium') {
       ],
     },
     orgs.newRepo('jdk') {
+      allow_merge_commit: true,
       allow_update_branch: false,
       default_branch: "master",
+      delete_branch_on_merge: false,
       dependabot_alerts_enabled: false,
       description: "JDK mirror from https://github.com/openjdk/jdk",
       homepage: "",
       web_commit_signoff_required: false,
     },
     orgs.newRepo('jdk11u') {
+      allow_merge_commit: true,
       allow_update_branch: false,
       default_branch: "master",
+      delete_branch_on_merge: false,
       dependabot_alerts_enabled: false,
       description: "JDK11u mirror. This source code is an unmodified mirror of source code obtained from OpenJDK https://github.com/openjdk/jdk11u. It has been and may still be used to create builds that are untested and incompatible with the Java SE specification. You should not deploy or write to this code, but instead use the tested and certified Java SE compatible version of the code that is available at https://adoptium.net.",
       homepage: "",
       web_commit_signoff_required: false,
     },
     orgs.newRepo('jdk11u-fast-startup-incubator') {
+      allow_merge_commit: true,
       allow_update_branch: false,
       default_branch: "master",
+      delete_branch_on_merge: false,
       dependabot_alerts_enabled: false,
       web_commit_signoff_required: false,
     },
     orgs.newRepo('jdk16u') {
+      allow_merge_commit: true,
       allow_update_branch: false,
       default_branch: "master",
+      delete_branch_on_merge: false,
       dependabot_alerts_enabled: false,
       description: "JDK16u mirror. This source code is an unmodified mirror of source code obtained from OpenJDK https://github.com/openjdk/jdk16u. It has been and may still be used to create builds that are untested and incompatible with the Java SE specification. You should not deploy or write to this code, but instead use the tested and certified Java SE compatible version of the code that is available at https://adoptium.net.",
       homepage: "",
@@ -552,8 +572,10 @@ orgs.newOrg('adoptium') {
       web_commit_signoff_required: false,
     },
     orgs.newRepo('jdk17u') {
+      allow_merge_commit: true,
       allow_update_branch: false,
       default_branch: "master",
+      delete_branch_on_merge: false,
       dependabot_alerts_enabled: false,
       description: "JDK17u mirror. This source code is an unmodified mirror of source code obtained from OpenJDK https://github.com/openjdk/jdk17u. It has been and may still be used to create builds that are untested and incompatible with the Java SE specification. You should not deploy or write to this code, but instead use the tested and certified Java SE compatible version of the code that is available at https://adoptium.net.",
       homepage: "",
@@ -566,8 +588,10 @@ orgs.newOrg('adoptium') {
       web_commit_signoff_required: false,
     },
     orgs.newRepo('jdk18u') {
+      allow_merge_commit: true,
       allow_update_branch: false,
       default_branch: "master",
+      delete_branch_on_merge: false,
       dependabot_alerts_enabled: false,
       description: "JDK18u mirror. This source code is an unmodified mirror of source code obtained from OpenJDK https://github.com/openjdk/jdk18u. It has been and may still be used to create builds that are untested and incompatible with the Java SE specification. You should not deploy or write to this code, but instead use the tested and certified Java SE compatible version of the code that is available at https://adoptium.net.",
       web_commit_signoff_required: false,
@@ -580,8 +604,10 @@ orgs.newOrg('adoptium') {
       web_commit_signoff_required: false,
     },
     orgs.newRepo('jdk19u') {
+      allow_merge_commit: true,
       allow_update_branch: false,
       default_branch: "dev",
+      delete_branch_on_merge: false,
       dependabot_security_updates_enabled: true,
       secret_scanning: "disabled",
       secret_scanning_push_protection: "disabled",
@@ -594,23 +620,29 @@ orgs.newOrg('adoptium') {
       web_commit_signoff_required: false,
     },
     orgs.newRepo('jdk20u') {
+      allow_merge_commit: true,
       allow_update_branch: false,
       default_branch: "master",
+      delete_branch_on_merge: false,
       dependabot_security_updates_enabled: true,
       secret_scanning: "disabled",
       secret_scanning_push_protection: "disabled",
       web_commit_signoff_required: false,
     },
     orgs.newRepo('jdk21') {
+      allow_merge_commit: true,
       allow_update_branch: false,
       default_branch: "master",
+      delete_branch_on_merge: false,
       dependabot_security_updates_enabled: true,
       secret_scanning_push_protection: "disabled",
       web_commit_signoff_required: false,
     },
     orgs.newRepo('jdk8u') {
+      allow_merge_commit: true,
       allow_update_branch: false,
       default_branch: "master",
+      delete_branch_on_merge: false,
       dependabot_alerts_enabled: false,
       description: "JDK8u mirror. This source code is an unmodified mirror of source code obtained from OpenJDK https://github.com/openjdk/jdk8u. It has been and may still be used to create builds that are untested and incompatible with the Java SE specification. You should not deploy or write to this code, but instead use the tested and certified Java SE compatible version of the code that is available at https://adoptium.net.",
       homepage: "",
@@ -626,9 +658,9 @@ orgs.newOrg('adoptium') {
       web_commit_signoff_required: false,
     },
     orgs.newRepo('jenkins-helper') {
-      allow_merge_commit: false,
       allow_update_branch: false,
       default_branch: "master",
+      delete_branch_on_merge: false,
       description: "Jenkins Node helper API and helper jobs ",
       homepage: "",
       topics+: [
@@ -643,8 +675,10 @@ orgs.newOrg('adoptium') {
       ],
     },
     orgs.newRepo('jmc-build') {
+      allow_merge_commit: true,
       allow_update_branch: false,
       default_branch: "master",
+      delete_branch_on_merge: false,
       dependabot_security_updates_enabled: true,
       description: "Contains the Adoptium specific source code overrides and build pipeline script for the Java Mission Control project.",
       has_wiki: false,
@@ -664,8 +698,8 @@ orgs.newOrg('adoptium') {
     },
     orgs.newRepo('marketplace-data') {
       allow_auto_merge: true,
+      allow_merge_commit: true,
       allow_update_branch: false,
-      delete_branch_on_merge: true,
       dependabot_security_updates_enabled: true,
       description: "The official source of Marketplace data (JSON) for feeding Eclipse Temurin binaries to the Marketplace API 💾",
       has_issues: false,
@@ -687,9 +721,9 @@ orgs.newOrg('adoptium') {
       ],
     },
     orgs.newRepo('mirror-scripts') {
-      allow_merge_commit: false,
       allow_update_branch: false,
       default_branch: "master",
+      delete_branch_on_merge: false,
       dependabot_alerts_enabled: false,
       description: "OpenJDK source mirroring scripts used by",
       homepage: "https://ci.adoptium.net/view/git-mirrors/job/git-mirrors/job/adoptium/",
@@ -711,8 +745,10 @@ orgs.newOrg('adoptium') {
       ],
     },
     orgs.newRepo('run-aqa') {
+      allow_merge_commit: true,
       allow_update_branch: false,
       default_branch: "master",
+      delete_branch_on_merge: false,
       dependabot_security_updates_enabled: true,
       description: "Repository for the Github Action that enables the running of the Adoptium Quality Assurance (AQA) tests",
       homepage: "",
@@ -724,9 +760,9 @@ orgs.newOrg('adoptium') {
     },
     orgs.newRepo('temurin-build') {
       allow_auto_merge: true,
-      allow_merge_commit: false,
       allow_update_branch: false,
       default_branch: "master",
+      delete_branch_on_merge: false,
       dependabot_security_updates_enabled: true,
       description: "Eclipse Temurin™ build scripts - common across all releases/versions",
       homepage: "",
@@ -774,11 +810,11 @@ orgs.newOrg('adoptium') {
     },
     orgs.newRepo('temurin-cpe-generator') {
       allow_auto_merge: true,
-      allow_merge_commit: false,
       allow_update_branch: false,
-      web_commit_signoff_required: false,
+      delete_branch_on_merge: false,
       description: "A tool to generate NIST CPE directory entries for Eclipse Temurin using the Adoptium API.",
       homepage: "https://adoptium.net/temurin",
+      web_commit_signoff_required: false,
       branch_protection_rules: [
         orgs.newBranchProtectionRule('main') {
           required_approving_review_count: 1,
@@ -786,58 +822,76 @@ orgs.newOrg('adoptium') {
       ],
     },
     orgs.newRepo('temurin11-binaries') {
+      allow_merge_commit: true,
       allow_update_branch: false,
+      delete_branch_on_merge: false,
       description: "Temurin 11 binaries",
       has_issues: false,
       web_commit_signoff_required: false,
     },
     orgs.newRepo('temurin16-binaries') {
+      allow_merge_commit: true,
       allow_update_branch: false,
+      delete_branch_on_merge: false,
       description: "Temurin 16 binaries",
       has_issues: false,
       web_commit_signoff_required: false,
     },
     orgs.newRepo('temurin17-binaries') {
+      allow_merge_commit: true,
       allow_update_branch: false,
+      delete_branch_on_merge: false,
       description: "Temurin 17 binaries",
       has_issues: false,
       web_commit_signoff_required: false,
     },
     orgs.newRepo('temurin18-binaries') {
+      allow_merge_commit: true,
       allow_update_branch: false,
+      delete_branch_on_merge: false,
       description: "Temurin 18 binaries",
       has_issues: false,
       web_commit_signoff_required: false,
     },
     orgs.newRepo('temurin19-binaries') {
+      allow_merge_commit: true,
       allow_update_branch: false,
+      delete_branch_on_merge: false,
       description: "Temurin 19 binaries",
       has_issues: false,
       web_commit_signoff_required: false,
     },
     orgs.newRepo('temurin20-binaries') {
+      allow_merge_commit: true,
       allow_update_branch: false,
+      delete_branch_on_merge: false,
       dependabot_security_updates_enabled: true,
       description: "Temurin 20 binaries",
       has_issues: false,
       web_commit_signoff_required: false,
     },
     orgs.newRepo('temurin21-binaries') {
+      allow_merge_commit: true,
       allow_update_branch: false,
+      delete_branch_on_merge: false,
       dependabot_security_updates_enabled: true,
       description: "Temurin 21 binaries",
       has_issues: false,
       web_commit_signoff_required: false,
     },
     orgs.newRepo('temurin22-binaries') {
+      allow_merge_commit: true,
       allow_update_branch: false,
+      delete_branch_on_merge: false,
       dependabot_security_updates_enabled: true,
       description: "Temurin 22 binaries",
       has_issues: false,
       web_commit_signoff_required: false,
     },
     orgs.newRepo('temurin8-binaries') {
+      allow_merge_commit: true,
       allow_update_branch: false,
+      delete_branch_on_merge: false,
       description: "Temurin 8 binaries",
       has_issues: false,
       web_commit_signoff_required: false,