Bring my fork up to date with base

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,7 +2,7 @@
 
 - [ ] Read the [contribution guidelines](https://github.com/openapitools/openapi-generator/blob/master/CONTRIBUTING.md).
 - [ ] Ran the shell script under `./bin/` to update Petstore sample so that CIs can verify the change. (For instance, only need to run `./bin/{LANG}-petstore.sh` and `./bin/security/{LANG}-petstore.sh` if updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates). Windows batch files can be found in `.\bin\windows\`.
-- [ ] Filed the PR against the [correct branch](https://github.com/OpenAPITools/openapi-generator/wiki/Git-Branches): `master`, `3.3.x`, `4.0.x`. Default: `master`.
+- [ ] Filed the PR against the [correct branch](https://github.com/OpenAPITools/openapi-generator/wiki/Git-Branches): `master`, `3.4.x`, `4.0.x`. Default: `master`.
 - [ ] Copied the [technical committee](https://github.com/openapitools/openapi-generator/#62---openapi-generator-technical-committee) to review the pull request if your PR is targeting a particular programming language.
 
 ### Description of the PR

CI/circle_parallel.sh

@@ -1,23 +1,27 @@
 #!/bin/bash
+#
+# A bash script to run CircleCI node/test in parallel
+#
 
 NODE_INDEX=${CIRCLE_NODE_INDEX:-0}
 
-
 if [ "$NODE_INDEX" = "1" ]; then
-  echo "Running node $NODE_INDEX to test CI/pom.xml.circleci ..."
-  cp CI/pom.xml.circleci pom.xml
+  echo "Running node $NODE_INDEX to test 'samples.circleci' defined in pom.xml ..."
+  #cp CI/pom.xml.circleci pom.xml
   java -version
-  mvn --quiet verify -Psamples
+  mvn --quiet verify -Psamples.circleci
 elif [ "$NODE_INDEX" = "2" ]; then
   echo "Running node $NODE_INDEX to test ensure-up-to-date"
-  export GO_FMT_PATH=`which gofmt`
+  java -version
+  #export GO_POST_PROCESS_FILE="/usr/local/bin/gofmt -w"
+  # not formatting the code as different go versions may format the code a bit different
   ./bin/utils/ensure-up-to-date
 else
-  echo "Running node $NODE_INDEX to test CI/pom.xml.circleci.java7 ..."
+  echo "Running node $NODE_INDEX to test 'samples.circleci.jdk7' defined in pom.xml ..."
   sudo update-java-alternatives -s java-1.7.0-openjdk-amd64
   java -version
-  cp CI/pom.xml.circleci.java7 pom.xml
-  mvn --quiet verify -Psamples
+  #cp CI/pom.xml.circleci.java7 pom.xml
+  mvn --quiet verify -Psamples.circleci.jdk7
 fi