Consolidate development to a single main branch

kobylynskyi · kobylynskyi · commit 544499d9821b · 2023-03-30T22:09:46.000-04:00
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -4,70 +4,70 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
-    target-branch: "develop"
+    target-branch: "main"
     reviewers:
       - "kobylynskyi"
 
   - package-ecosystem: "gradle"
     directory: "plugins/gradle/graphql-java-codegen-gradle-plugin/"
     schedule:
       interval: "weekly"
-    target-branch: "develop"
+    target-branch: "main"
     reviewers:
       - "kobylynskyi"
 
   - package-ecosystem: "maven"
     directory: "plugins/maven/graphql-java-codegen-maven-plugin/"
     schedule:
       interval: "weekly"
-    target-branch: "develop"
+    target-branch: "main"
     reviewers:
       - "kobylynskyi"
 
   - package-ecosystem: "gradle"
     directory: "plugins/gradle/example-client/"
     schedule:
       interval: "monthly"
-    target-branch: "develop"
+    target-branch: "main"
     reviewers:
       - "kobylynskyi"
 
   - package-ecosystem: "gradle"
     directory: "plugins/gradle/example-server/"
     schedule:
       interval: "monthly"
-    target-branch: "develop"
+    target-branch: "main"
     reviewers:
       - "kobylynskyi"
 
   - package-ecosystem: "gradle"
     directory: "plugins/gradle/example-client-kotlin/"
     schedule:
       interval: "monthly"
-    target-branch: "develop"
+    target-branch: "main"
     reviewers:
       - "kobylynskyi"
 
   - package-ecosystem: "maven"
     directory: "plugins/maven/example-client/"
     schedule:
       interval: "monthly"
-    target-branch: "develop"
+    target-branch: "main"
     reviewers:
       - "kobylynskyi"
 
   - package-ecosystem: "maven"
     directory: "plugins/maven/example-server/"
     schedule:
       interval: "monthly"
-    target-branch: "develop"
+    target-branch: "main"
     reviewers:
       - "kobylynskyi"
 
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       interval: "monthly"
-    target-branch: "develop"
+    target-branch: "main"
     reviewers:
       - "kobylynskyi"
diff --git a/.github/workflows/check-code-style.yml b/.github/workflows/check-code-style.yml
@@ -3,12 +3,10 @@ name: Check Code Style
 on:
   push:
     branches:
-      - master
-      - develop
+      - main
   pull_request:
     branches:
-      - master
-      - develop
+      - main
 
 jobs:
   check-code-style:
diff --git a/.github/workflows/github.yml b/.github/workflows/github.yml
@@ -3,13 +3,10 @@ name: Build
 on:
   push:
     branches:
-      - master
-      - develop
-      - java-11-17
+      - main
   pull_request:
     branches:
-      - master
-      - develop
+      - main
 
 jobs:
   build:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,7 +9,7 @@ on:
         required: true
       release_branch:
         description: 'Release branch'
-        default: 'master'
+        default: 'main'
         required: true
       publish_library:
         description: 'Publish library'
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -17,7 +17,7 @@ Please follow the steps below in order to make the changes:
 
 1. Clone the repository
 2. Set the local java version to 1.8
-3. Checkout **develop** branch.
+3. Checkout **main** branch.
 4. Open repository in your favourite IDE.
 5. Enable and configure CheckStyle plugin in your IDE (for IntelliJ it is CheckStyle-IDEA).
    Import [graphql-codegen-check-style.xml](config/checkstyle/graphql-codegen-check-style.xml) as a .
diff --git a/build.gradle b/build.gradle
@@ -100,7 +100,7 @@ publishing {
                 licenses {
                     license {
                         name = "MIT License"
-                        url = "https://github.com/kobylynskyi/graphql-java-codegen/blob/master/LICENSE"
+                        url = "https://github.com/kobylynskyi/graphql-java-codegen/blob/main/LICENSE"
                         distribution = "repo"
                     }
                 }
diff --git a/docs/migration-to-2.0.0.md b/docs/migration-to-2.0.0.md
@@ -6,8 +6,8 @@ version 1.x.x then please follow steps below.
 
 ### 1. Update plugin and library versions
 
-As per plugin description: [Gradle](https://github.com/kobylynskyi/graphql-java-codegen/tree/master/plugins/gradle)
-, [Maven](https://github.com/kobylynskyi/graphql-java-codegen/tree/master/plugins/maven)
+As per plugin description: [Gradle](https://github.com/kobylynskyi/graphql-java-codegen/tree/main/plugins/gradle)
+, [Maven](https://github.com/kobylynskyi/graphql-java-codegen/tree/main/plugins/maven)
 
 ### 2. Update plugin configuration (only for client-side codegen)
 
diff --git a/docs/migration-to-3.0.0.md b/docs/migration-to-3.0.0.md
@@ -7,8 +7,8 @@ follow [2.0.0 migration guide](migration-to-2.0.0.md) first.
 
 ### 1. Update plugin and library versions
 
-As per plugin description: [Gradle](https://github.com/kobylynskyi/graphql-java-codegen/tree/master/plugins/gradle)
-, [Maven](https://github.com/kobylynskyi/graphql-java-codegen/tree/master/plugins/maven)
+As per plugin description: [Gradle](https://github.com/kobylynskyi/graphql-java-codegen/tree/main/plugins/gradle)
+, [Maven](https://github.com/kobylynskyi/graphql-java-codegen/tree/main/plugins/maven)
 
 ### 2. Remove `generateAsyncApis` and rename `apiAsyncReturnType`/`apiAsyncReturnListType`
 
diff --git a/docs/migration-to-4.0.0.md b/docs/migration-to-4.0.0.md
@@ -7,8 +7,8 @@ follow [3.0.0 migration guide](migration-to-3.0.0.md) first.
 
 ### 1. Update plugin and library versions
 
-As per plugin description: [Gradle](https://github.com/kobylynskyi/graphql-java-codegen/tree/master/plugins/gradle)
-, [Maven](https://github.com/kobylynskyi/graphql-java-codegen/tree/master/plugins/maven)
+As per plugin description: [Gradle](https://github.com/kobylynskyi/graphql-java-codegen/tree/main/plugins/gradle)
+, [Maven](https://github.com/kobylynskyi/graphql-java-codegen/tree/main/plugins/maven)
 
 ### 2. Change GraphQL Resolvers containing non-null GraphQL types to primitive Java types
 
diff --git a/docs/migration-to-5.0.0.md b/docs/migration-to-5.0.0.md
@@ -13,9 +13,9 @@ Otherwise - feel free to use graphql-java-codegen-5.0.0 without any breaking cha
 ### 1. Update plugin and library versions
 
 As per plugin description: 
-[Gradle](https://github.com/kobylynskyi/graphql-java-codegen/tree/master/plugins/gradle), 
-[Maven](https://github.com/kobylynskyi/graphql-java-codegen/tree/master/plugins/maven),
-[SBT](https://github.com/kobylynskyi/graphql-java-codegen/tree/master/plugins/sbt)
+[Gradle](https://github.com/kobylynskyi/graphql-java-codegen/tree/main/plugins/gradle), 
+[Maven](https://github.com/kobylynskyi/graphql-java-codegen/tree/main/plugins/maven),
+[SBT](https://github.com/kobylynskyi/graphql-java-codegen/tree/main/plugins/sbt)
 
 ### 2. Rename jsonConfigurationFile => configurationFiles
 
diff --git a/plugins/gradle/README.md b/plugins/gradle/README.md
@@ -49,7 +49,7 @@ Please refer to [Codegen Options](../../docs/codegen-options.md)
 ```groovy
 graphqlCodegen {
     // all config options: 
-    // https://github.com/kobylynskyi/graphql-java-codegen/blob/master/docs/codegen-options.md
+    // https://github.com/kobylynskyi/graphql-java-codegen/blob/main/docs/codegen-options.md
     graphqlSchemas.includePattern = "schema\\.graphqls"
     outputDir = new File("$buildDir/generated")
     packageName = "com.example.graphql.model"
@@ -78,7 +78,7 @@ You can also refer to build.gradle files in example projects: [example-client/bu
 ```kotlin
 tasks.named<GraphQLCodegenGradleTask>("graphqlCodegen") {
     // all config options: 
-    // https://github.com/kobylynskyi/graphql-java-codegen/blob/master/docs/codegen-options.md
+    // https://github.com/kobylynskyi/graphql-java-codegen/blob/main/docs/codegen-options.md
     graphqlSchemaPaths = listOf("$projectDir/src/main/resources/graphql/schema.graphqls")
     outputDir = File("$buildDir/generated")
     packageName = "com.example.graphql.model"
diff --git a/plugins/gradle/graphql-java-codegen-gradle-plugin/build.gradle b/plugins/gradle/graphql-java-codegen-gradle-plugin/build.gradle
@@ -36,7 +36,7 @@ dependencies {
 }
 
 gradlePlugin {
-    website = 'https://github.com/kobylynskyi/graphql-java-codegen/tree/master/plugins/gradle/graphql-java-codegen-gradle-plugin'
+    website = 'https://github.com/kobylynskyi/graphql-java-codegen/tree/main/plugins/gradle/graphql-java-codegen-gradle-plugin'
     vcsUrl = 'https://github.com/kobylynskyi/graphql-java-codegen'
     plugins {
         graphqlCodegen {
diff --git a/plugins/maven/README.md b/plugins/maven/README.md
@@ -28,7 +28,7 @@
                     </goals>
                     <configuration>
                         <!-- all config options: 
-                        https://github.com/kobylynskyi/graphql-java-codegen/blob/master/docs/codegen-options.md
+                        https://github.com/kobylynskyi/graphql-java-codegen/blob/main/docs/codegen-options.md
                         -->
                         <graphqlSchemas>
                             <includePattern>schema\.graphqls</includePattern>
diff --git a/plugins/maven/graphql-java-codegen-maven-plugin/pom.xml b/plugins/maven/graphql-java-codegen-maven-plugin/pom.xml
@@ -13,7 +13,7 @@
     <licenses>
         <license>
             <name>MIT License</name>
-            <url>https://github.com/kobylynskyi/graphql-java-codegen/blob/master/LICENSE.md</url>
+            <url>https://github.com/kobylynskyi/graphql-java-codegen/blob/main/LICENSE.md</url>
         </license>
     </licenses>
 
@@ -35,7 +35,7 @@
         <connection>scm:git:git://github.com/kobylynskyi/graphql-java-codegen.git</connection>
         <developerConnection>scm:git:git@github.com:kobylynskyi/graphql-java-codegen.git
         </developerConnection>
-        <url>https://github.com/kobylynskyi/graphql-java-codegen/tree/master/plugins/maven</url>
+        <url>https://github.com/kobylynskyi/graphql-java-codegen/tree/main/plugins/maven</url>
         <tag>HEAD</tag>
     </scm>
 

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ publishing {`
`100`	`100`	`licenses {`
`101`	`101`	`license {`
`102`	`102`	`name = "MIT License"`
`103`		`- url = "https://github.com/kobylynskyi/graphql-java-codegen/blob/master/LICENSE"`
	`103`	`+ url = "https://github.com/kobylynskyi/graphql-java-codegen/blob/main/LICENSE"`
`104`	`104`	`distribution = "repo"`
`105`	`105`	`}`
`106`	`106`	`}`