Rename 'develop' -> '1.x'

.github/workflows/codeql-analysis.yml

@@ -13,10 +13,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ develop, main ]
+    branches: [ 1.x, main ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ develop, main ]
+    branches: [ 1.x, main ]
   schedule:
     - cron: '25 13 * * 2'
 

.github/workflows/jdk11.yml

@@ -2,9 +2,9 @@ name: JDK11 Build (Ubuntu 20.04 default)
 
 on:
     push:
-      branches: [ develop, main ]
+      branches: [ 1.x, main ]
     pull_request:
-      branches: [ develop, main ]
+      branches: [ 1.x, main ]
 
 jobs:
   build:

.github/workflows/jdk8.yml

@@ -2,9 +2,9 @@ name: JDK8 Build (Ubuntu 18.04)
 
 on:
     push:
-      branches: [ develop, main ]
+      branches: [ 1.x, main ]
     pull_request:
-      branches: [ develop, main ]
+      branches: [ 1.x, main ]
 
 jobs:
   build:

.github/workflows/macos.yml

@@ -5,9 +5,9 @@ name: macOS Build
 
 on:
   push:
-    branches: [ develop, main ]
+    branches: [ 1.x, main ]
   pull_request:
-    branches: [ develop, main ]
+    branches: [ 1.x, main ]
 
 jobs:
   build:

.github/workflows/qa.yml

@@ -2,9 +2,9 @@ name: Quality Assurance Checks
 
 on:
     push:
-      branches: [ develop, main ]
+      branches: [ 1.x, main ]
     pull_request:
-      branches: [ develop, main ]
+      branches: [ 1.x, main ]
 
 jobs:
   build:

.github/workflows/windows.yml

@@ -5,9 +5,9 @@ name: Windows Build
 
 on:
   push:
-    branches: [ develop, main ]
+    branches: [ 1.x, main ]
   pull_request:
-    branches: [ develop, main ]
+    branches: [ 1.x, main ]
 
 jobs:
   build:

CONTRIBUTING.md

@@ -1,20 +1,22 @@
 # How to Contribute
 
-As a new project, there are many areas where jMISB could use your help.
+There are many areas where jMISB could use your help.
 To get an idea of some of the things on our road map, see the
 [issues board](https://github.com/WestRidgeSystems/jmisb/issues). New contributors
 are encouraged to get started on smaller tasks, which we will tag using the
 `good first issue` label.
 
 ## Development Guidelines
 
-* If you develop a new feature or enhancement, please create a branch off of
-the `develop` branch for your changes, and create a pull request when you
-believe it is ready for review.
+* There are currently two development branches to which all pull requests should
+go: `1.x` and `2.x`.
 
-* If you are fixing a bug, you may either branch off `develop`, or
-off `master` if you need to patch a prior release (perhaps because
-you're using the release in your own project).
+* `1.x` is in maintenance mode, so preferably PRs for new features should go into 
+`2.x`.
+
+* If you are fixing a bug, you may submit the PR against either branch. Once
+approved on that branch, we will ensure it gets merged into the other branch, 
+if appropriate.
 
 * On your branch, please only make changes for the single issue you are
 working on. If you find yourself tempted to make other enhancements along the

README.md

@@ -1,7 +1,7 @@
 # jMISB
 
 ![Build Status](https://github.com/WestRidgeSystems/jmisb/actions/workflows/jdk11.yml/badge.svg)
-[![codecov](https://codecov.io/gh/WestRidgeSystems/jmisb/branch/develop/graph/badge.svg?token=SWXQJKERQY)](https://codecov.io/gh/WestRidgeSystems/jmisb)
+[![codecov](https://codecov.io/gh/WestRidgeSystems/jmisb/branch/main/graph/badge.svg?token=SWXQJKERQY)](https://codecov.io/gh/WestRidgeSystems/jmisb)
 [![CodeQL](https://github.com/WestRidgeSystems/jmisb/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/WestRidgeSystems/jmisb/actions/workflows/codeql-analysis.yml)
 [![Maven Central](https://maven-badges-generator.herokuapp.com/maven-central/org.jmisb/jmisb/badge.svg)](https://maven-badges-generator.herokuapp.com/maven-central/org.jmisb/jmisb)
 [![Gitter](https://badges.gitter.im/jmisb/community.svg)](https://gitter.im/jmisb/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)