chore: organization from organisation bug

Author: gerardnico

.copier-answers.yml

@@ -7,7 +7,7 @@ copyright_owner: combostrap
 copyright_year: 2025
 dependency_manager: none
 license_type: Apache-2.0
-organisation_name: combostrap
+organization_name: combostrap
 package_manager: none
 project_name: devfiles
 releaser: jreleaser

.envrc

@@ -11,17 +11,17 @@ echo ""
 # Project Environment are common project variables used in script
 ###################
 # Project Root
-export ORGANISATION_NAME="combostrap"
+export ORGANIZATION_NAME="combostrap"
 # Name used in env
-export ORGANISATION_ENV_NAME="COMBOSTRAP"
+export ORGANIZATION_ENV_NAME="COMBOSTRAP"
 # Name used in path
-export ORGANISATION_PATH_NAME="combostrap"
+export ORGANIZATION_PATH_NAME="combostrap"
 # Name of the project use as identifier with the organization name
 export PROJECT_NAME="devfiles"
 # Used by script to get the root
 export PROJECT_ROOT="$PWD"
 # ProjectId
-export PROJECT_ID="$ORGANISATION_NAME/$PROJECT_NAME"
+export PROJECT_ID="$ORGANIZATION_NAME/$PROJECT_NAME"
 # The package manager
 export PACKAGE_MANAGER="none"
 
@@ -32,7 +32,7 @@ source "$PROJECT_ROOT/.envrc.devf.sh"
 echo "Project:"
 export COL_PROP_LENGTH=17
 devf_print_props "Project Root" "${PROJECT_ROOT}"
-devf_print_props "Organisation Name" "${ORGANISATION_NAME}"
+devf_print_props "Organization Name" "${ORGANIZATION_NAME}"
 devf_print_props "Package Manager" "${PACKAGE_MANAGER}"
 
 #################
@@ -43,7 +43,7 @@ devf_print_props "Package Manager" "${PACKAGE_MANAGER}"
 echo ""
 echo "Devfiles: "
 export DEVF_PREFIX="DEVF"
-DEVF_DIR_VAR_NAME="${DEVF_PREFIX}_${ORGANISATION_ENV_NAME}_DIR"
+DEVF_DIR_VAR_NAME="${DEVF_PREFIX}_${ORGANIZATION_ENV_NAME}_DIR"
 export DEVF_DIR
 DEVF_DIR="${!DEVF_DIR_VAR_NAME:-}"
 if [ "$DEVF_DIR" != "" ]; then
@@ -55,7 +55,7 @@ fi
 if [ ! -d "$DEVF_DIR" ]; then
 
   devf_echo_yellow "DEVF_DIR ($DEVF_DIR) does not exist."
-  DEVF_REPO_URI_VAR_NAME="${DEVF_PREFIX}_${ORGANISATION_ENV_NAME}_URI"
+  DEVF_REPO_URI_VAR_NAME="${DEVF_PREFIX}_${ORGANIZATION_ENV_NAME}_URI"
   DEVF_REPO_URI="${!DEVF_REPO_URI_VAR_NAME:-https://github.com/combostrap/devfiles}"
   devf_echo_yellow "Clone $DEVF_REPO_URI to $DEVF_DIR? Y(Yes-Default)/N(No)"
   read -r CLONE
@@ -186,7 +186,7 @@ echo ""
 echo "Env: "
 export COL_PROP_LENGTH=17
 devf_print_props "PROJECT_ROOT" "$PROJECT_ROOT"
-devf_print_props "ORGANISATION_NAME" "$ORGANISATION_NAME"
+devf_print_props "ORGANIZATION_NAME" "$ORGANIZATION_NAME"
 devf_print_props "DEVF_DIR" "$DEVF_DIR"
 
 # Last EOL before direnv output

README.md

@@ -107,7 +107,7 @@ All secrets are located under the organization name.
 Example for a GitHub token:
 
 ```bash
-pass "$ORGANISATION_PATH_NAME/github/release-token"
+pass "$ORGANIZATION_PATH_NAME/github/release-token"
 ```
 
 Note:
@@ -225,9 +225,9 @@ In your scripts, you can use the following env:
 | `PROJECT_ID`             | The organization name / project name                                 |
 | `PROJECT_NAME`           | The project name                                                     |
 | `PROJECT_ROOT`           | The root directory of the git repo (ie `GIT_ROOT` without submodule) |
-| `ORGANISATION_NAME`      | The organization name                                                |
-| `ORGANISATION_ENV_NAME`  | The organization name in a env format                                |
-| `ORGANISATION_PATH_NAME` | The organization name in a file path format                          |
+| `ORGANIZATION_NAME`      | The organization name                                                |
+| `ORGANIZATION_ENV_NAME`  | The organization name in a env format                                |
+| `ORGANIZATION_PATH_NAME` | The organization name in a file path format                          |
 
 ### Git Hooks and Pre-commit
 

copier-template/.envrc.jinja2

@@ -32,7 +32,7 @@ source "$PROJECT_ROOT/.envrc.devf.sh"
 echo "Project:"
 export COL_PROP_LENGTH=17
 devf_print_props "Project Root" "${PROJECT_ROOT}"
-devf_print_props "Organisation Name" "${ORGANIZATION_NAME}"
+devf_print_props "Organization Name" "${ORGANIZATION_NAME}"
 devf_print_props "Package Manager" "${PACKAGE_MANAGER}"
 
 #################

copier-template/.github/workflows/cd-maven-jreleaser-library.yml

@@ -16,6 +16,7 @@ jobs:
   publish:
     # Slim is one CPU vs 4 for the standard ubuntu-latest
     # Price is at the core by minutes
+    # We need to install java, and it's slower so it's maybe not a gain
     runs-on: ubuntu-slim
     steps:
 
@@ -37,6 +38,8 @@ jobs:
           java-version: '17'
           distribution: 'temurin'
 
+      # Ref
+      # https://jreleaser.org/guide/latest/examples/maven/maven-central.html#_maven
       - name: Publish package
         run: |
 
@@ -50,9 +53,14 @@ jobs:
           fi
 
           echo "Stage Artifacts"
+          # The publication profile should be in the parent or the pom
+          # as seen here: https://jreleaser.org/guide/latest/examples/maven/maven-central.html#_maven
+          # and here: https://jreleaser.org/guide/latest/examples/maven/staging-artifacts.html
+          # It will attach the maven-javadoc-plugin and maven-source-plugin
           ./mvnw --batch-mode -s .github/cd-maven-settings.xml --quiet -Ppublication
 
           # Deploy snapshot or release
+          # https://jreleaser.org/guide/latest/tools/jreleaser-maven.html#_jreleaserdeploy
           echo "Deploy snapshot or release"
           ./mvnw --batch-mode -s .github/cd-maven-settings.xml jreleaser:deploy
 

copier.yml

@@ -86,7 +86,7 @@ dependency_manager:
 # Ref: https://copier.readthedocs.io/en/stable/faq/#how-to-lock-a-computed-value
 devfiles_version:
   type: str
-  default: "v0.1.4"
+  default: "v0.1.5"
   when: false # never ask about it as it's constant
 
 # External can be used only in copier.yml not in template

dev-scripts/package-manager/maven/mvnw

@@ -3,27 +3,27 @@
 
 set -TCEeuo pipefail
 
-if [ -z "$ORGANISATION_PATH_NAME" ]; then
-  echo "ERROR: ORGANISATION_PATH_NAME environment variable is not set"
+if [ "${ORGANIZATION_PATH_NAME}" == "" ]; then
+  echo "ERROR: ORGANIZATION_PATH_NAME environment variable is not set"
   exit 1
 fi
 
 if [ "$PACKAGE_MANAGER" == "maven" ]; then
 
   # For release
   export JRELEASER_MAVENCENTRAL_USERNAME
-  JRELEASER_MAVENCENTRAL_USERNAME=$(pass "$ORGANISATION_PATH_NAME/sonatype/username")
+  JRELEASER_MAVENCENTRAL_USERNAME=$(pass "$ORGANIZATION_PATH_NAME/sonatype/username")
 
   export JRELEASER_MAVENCENTRAL_PASSWORD
-  JRELEASER_MAVENCENTRAL_PASSWORD=$(pass "$ORGANISATION_PATH_NAME/sonatype/password")
+  JRELEASER_MAVENCENTRAL_PASSWORD=$(pass "$ORGANIZATION_PATH_NAME/sonatype/password")
 
   # For snapshot
   export JRELEASER_NEXUS2_USERNAME="${JRELEASER_MAVENCENTRAL_USERNAME}"
   export JRELEASER_NEXUS2_PASSWORD="${JRELEASER_MAVENCENTRAL_PASSWORD}"
 
 fi
 
-PASSPHRASE_PATH="$ORGANISATION_PATH_NAME/gpg/software-signing-key-passphrase"
+PASSPHRASE_PATH="$ORGANIZATION_PATH_NAME/gpg/software-signing-key-passphrase"
 if ! PASSPHRASE_VALUE=$(pass "$PASSPHRASE_PATH" 2> /dev/null); then
   echo "Note: No gpg passphrase setup. No secret found at the pass path: $PASSPHRASE_PATH"
   PASSPHRASE_VALUE="yolo"
@@ -32,7 +32,7 @@ fi
 export JRELEASER_GPG_PASSPHRASE="$PASSPHRASE_VALUE"
 
 # Github
-GITHUB_TOKEN_PATH="$ORGANISATION_PATH_NAME/github/release-token"
+GITHUB_TOKEN_PATH="$ORGANIZATION_PATH_NAME/github/release-token"
 if GITHUB_TOKEN_VALUE=$(pass "$GITHUB_TOKEN_PATH"); then
   # for the docker upload
   export JRELEASER_GITHUB_TOKEN="$GITHUB_TOKEN_VALUE"