diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml deleted file mode 100644 index 58768d14..00000000 --- a/.github/release-drafter.yml +++ /dev/null @@ -1,38 +0,0 @@ -name-template: '$RESOLVED_VERSION' -tag-template: '$RESOLVED_VERSION' -categories: - - title: '🚀 Features' - collapse-after: 5 - labels: - - 'feature' - - 'enhancement' - - title: '🐛 Bug Fixes' - collapse-after: 5 - labels: - - 'fix' - - 'bugfix' - - 'bug' - - title: '🧰 Maintenance' - collapse-after: 5 - labels: - - 'chore' - - 'wip' -exclude-labels: - - 'skip-release' -change-template: '- $TITLE (#$NUMBER)' -change-title-escapes: '\<*_&' # You can add # and @ to disable mentions, and add ` to disable code blocks. -version-resolver: - major: - labels: - - 'major' - minor: - labels: - - 'minor' - patch: - labels: - - 'patch' - default: patch -template: | - ## Changes - - $CHANGES diff --git a/.github/workflows/.new-release.yml.swp b/.github/workflows/.new-release.yml.swp deleted file mode 100644 index f67440c0..00000000 Binary files a/.github/workflows/.new-release.yml.swp and /dev/null differ diff --git a/.github/workflows/delete-packages.yml b/.github/workflows/delete-packages.yml deleted file mode 100644 index 3ed7a643..00000000 --- a/.github/workflows/delete-packages.yml +++ /dev/null @@ -1,104 +0,0 @@ -name: Delete Packages - -on: - workflow_dispatch: - inputs: - VERSION: - description: 'Version to delete' - required: true - default: '4.0.0' - is_SNAPSHOT: - description: 'Set to true to delete snapshots' - required: true - default: false - type: boolean - -jobs: - delete_custom_components_packages: - runs-on: ubuntu-latest - permissions: - contents: read - packages: write - - steps: - - - name: Checkout the code - uses: actions/checkout@v3 - - - name: Set up JDK 11 - uses: actions/setup-java@v3 - with: - java-version: '11' - distribution: 'temurin' - - - name: Check version to delete - id: check_version - run: | - if ${{ inputs.is_SNAPSHOT }} == 'true'; then - echo "Version: ${{ inputs.VERSION }}" - echo "VERSION_TO_DELETE=${{ inputs.VERSION }}-SNAPSHOT" >> "$GITHUB_OUTPUT" - else - echo "Version: ${{ inputs.VERSION }}" - echo "VERSION_TO_DELETE=${{ inputs.VERSION }}" >> "$GITHUB_OUTPUT" - fi - - - name: Print version - run: | - echo "Version to delete: ${{ steps.check_version.outputs.VERSION_TO_DELETE }}" - - - name: Delete packages - uses: smartsquaregmbh/delete-old-packages@v0.7.0 - with: - organization: assimbly - type: maven - keep: 0 - version-pattern: "^${{ steps.check_version.outputs.VERSION_TO_DELETE }}$" - names: | - org.assimbly.oauth2token - org.assimbly.replace - org.assimbly.xmltocsv - org.assimbly.pdftotext - org.assimbly.hl7 - org.assimbly.xmltojson - org.assimbly.googledrive - org.assimbly.multipart - org.assimbly.smb - org.assimbly.formtoxml - org.assimbly.simplereplace - org.assimbly.pdf - org.assimbly.sql - org.assimbly.sandbox - org.assimbly.throttling - org.assimbly.xmltoexcel - org.assimbly.mail - org.assimbly.soap - org.assimbly.globalvariables - - - name: Delete packages - uses: smartsquaregmbh/delete-old-packages@v0.7.0 - with: - organization: assimbly - type: maven - keep: 0 - version-pattern: "^${{ steps.check_version.outputs.VERSION_TO_DELETE }}$" - names: | - org.assimbly.docconverter - org.assimbly.csvtoxml - org.assimbly.amazon - org.assimbly.edifactcommon - org.assimbly.auth - org.assimbly.exceltoxml - org.assimbly.edifact - org.assimbly.cookies - org.assimbly.encoder - org.assimbly.enrich - org.assimbly.aggregate - org.assimbly.edifactdotweb - org.assimbly.edi - org.assimbly.aleris - org.assimbly.smooksnoxml - org.assimbly.archive - org.assimbly.fmuta - org.assimbly.flv - org.assimbly.edifactstandards - org.assimbly.custom-components \ No newline at end of file diff --git a/.github/workflows/manual-update-version.yml b/.github/workflows/manual-update-version.yml deleted file mode 100644 index 7acc61fe..00000000 --- a/.github/workflows/manual-update-version.yml +++ /dev/null @@ -1,45 +0,0 @@ -name: Manual Version Update - -on: - workflow_dispatch: - inputs: - BRANCH: - required: true - default: 'develop' - type: choice - options: - - develop - - main - VERSION: - description: 'Version' - required: true - default: '4.0.0' - -jobs: - update_version: - runs-on: ubuntu-latest - - steps: - - - name: Checkout the code - uses: actions/checkout@v3 - with: - ref: ${{ inputs.BRANCH }} - - - name: Update POM Version - env: - VERSION: ${{ inputs.VERSION }} - run: | - echo "Updating to version: $VERSION" - mvn versions:set -DnewVersion=$VERSION - mvn versions:set-property -Dproperty=assimbly.version -DnewVersion=$VERSION - - - name: Diff check - run: git diff - - - name: Add & Commit - uses: EndBug/add-and-commit@v9.1.1 - with: - add: '.' - default_author: github_actions - push: origin HEAD:develop --force diff --git a/.github/workflows/new-release.yml b/.github/workflows/new-release.yml deleted file mode 100644 index 62e027e6..00000000 --- a/.github/workflows/new-release.yml +++ /dev/null @@ -1,171 +0,0 @@ -name: New Release Workflow - -on: - - release: - types: [ released ] - -jobs: - - publish_prod_packages: - - name: Publish Production Packages - runs-on: ubuntu-latest - steps: - - - name: Checkout code - uses: actions/checkout@v3 - with: - ref: 'main' - - - name: Setup Java - uses: actions/setup-java@v3 - with: - java-version: '11' - distribution: 'temurin' - - - name: Setup Maven settings.xml - uses: whelk-io/maven-settings-xml-action@v20 - with: - - repositories: > - [ - { - "id": "maven", - "name": "Maven Central", - "url": "https://repo1.maven.org/maven2" - }, - { - "id": "github", - "name": "Assimbly Base Repository", - "url": "https://maven.pkg.github.com/assimbly/base", - "snapshots": { - "enabled": "true" - } - }, - { - "id": "github", - "name": "Assimbly Runtime Repository", - "url": "https://maven.pkg.github.com/assimbly/runtime", - "snapshots": { - "enabled": "true" - } - }, - { - "id": "github", - "name": "Assimbly Custom-Components Repository", - "url": "https://maven.pkg.github.com/assimbly/custom-components", - "snapshots": { - "enabled": "true" - } - }, - { - "id": "aurea", - "name": "Aurea Sonic Repository", - "url": "https://int-factory.aurea.com/nexus/content/repositories/sonic-releases/" - } - ] - - servers: > - [ - { - "id": "github", - "username": "assimbly", - "password": "${{ secrets.GITHUB_TOKEN }}" - } - ] - - - name: Update to production version - env: - VERSION: ${{ github.ref_name }} - run: | - echo "Updating to version: ${VERSION}" - mvn versions:set -DgenerateBackupPoms=false -DnewVersion=${VERSION} - mvn versions:set-property -Dproperty=assimbly.version -DnewVersion=${VERSION} - - - name: Publish package - run: mvn --batch-mode deploy -DskipTests - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - publish_snapshot_packages: - - name: Publish Snapshot Packages - runs-on: ubuntu-latest - steps: - - - name: Checkout code - uses: actions/checkout@v3 - with: - ref: 'develop' - - - name: Setup Java - uses: actions/setup-java@v3 - with: - java-version: '11' - distribution: 'temurin' - - - name: Setup Maven settings.xml - uses: whelk-io/maven-settings-xml-action@v20 - with: - - repositories: > - [ - { - "id": "maven", - "name": "Maven Central", - "url": "https://repo1.maven.org/maven2" - }, - { - "id": "github", - "name": "Assimbly Base Repository", - "url": "https://maven.pkg.github.com/assimbly/base", - "snapshots": { - "enabled": "true" - } - }, - { - "id": "github", - "name": "Assimbly Runtime Repository", - "url": "https://maven.pkg.github.com/assimbly/runtime", - "snapshots": { - "enabled": "true" - } - }, - { - "id": "github", - "name": "Assimbly Custom-Components Repository", - "url": "https://maven.pkg.github.com/assimbly/custom-components", - "snapshots": { - "enabled": "true" - } - }, - { - "id": "aurea", - "name": "Aurea Sonic Repository", - "url": "https://int-factory.aurea.com/nexus/content/repositories/sonic-releases/" - } - ] - - servers: > - [ - { - "id": "github", - "username": "assimbly", - "password": "${{ secrets.GITHUB_TOKEN }}" - } - ] - - - name: Update to snapshot version - env: - SNAPSHOT_VERSION: ${{ github.ref_name }}-SNAPSHOT - run: | - echo "Updating to version: ${SNAPSHOT_VERSION}" - mvn versions:set -DgenerateBackupPoms=false -DnewVersion=${SNAPSHOT_VERSION} - mvn versions:set-property -Dproperty=assimbly.version -DnewVersion=${SNAPSHOT_VERSION} - - - name: Publish package - run: mvn --batch-mode deploy -DskipTests - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - diff --git a/.github/workflows/release-daily-develop-snapshot.yml b/.github/workflows/release-daily-develop-snapshot.yml new file mode 100644 index 00000000..31e15aee --- /dev/null +++ b/.github/workflows/release-daily-develop-snapshot.yml @@ -0,0 +1,39 @@ +name: Release Daily Development Snapshot + +on: + schedule: + - cron: '0 1 * * *' + + workflow_dispatch: + +jobs: + getversion: + runs-on: ubuntu-latest + outputs: + milestone: "${{ steps.maven-version.outputs.milestone }}" + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + ref: develop + + - name: Set up JDK 21 + uses: actions/setup-java@v4 + with: + java-version: '21' + distribution: 'temurin' + + - name: Get Maven Project Version + id: maven-version + run: | + VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) + echo "Maven version: $VERSION" + echo "milestone=$VERSION" >> $GITHUB_OUTPUT + + call-release: + needs: getversion + uses: ./.github/workflows/release.yml + secrets: inherit + with: + branch: 'develop' + milestone: ${{needs.getversion.outputs.milestone}} diff --git a/.github/workflows/release-daily-next-snapshot.yml b/.github/workflows/release-daily-next-snapshot.yml new file mode 100644 index 00000000..ad2587d4 --- /dev/null +++ b/.github/workflows/release-daily-next-snapshot.yml @@ -0,0 +1,39 @@ +name: Release Daily Next Snapshot + +on: + #schedule: + # - cron: '0 1 * * *' + + workflow_dispatch: + +jobs: + getversion: + runs-on: ubuntu-latest + outputs: + milestone: "${{ steps.maven-version.outputs.milestone }}" + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + ref: develop + + - name: Set up JDK 21 + uses: actions/setup-java@v4 + with: + java-version: '21' + distribution: 'temurin' + + - name: Get Maven Project Version + id: maven-version + run: | + VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) + echo "Maven version: $VERSION" + echo "milestone=$VERSION" >> $GITHUB_OUTPUT + + call-release: + needs: getversion + uses: ./.github/workflows/release.yml + secrets: inherit + with: + branch: 'next' + milestone: ${{needs.getversion.outputs.milestone}} diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml deleted file mode 100644 index 500caf72..00000000 --- a/.github/workflows/release-drafter.yml +++ /dev/null @@ -1,27 +0,0 @@ -name: Release Drafter - -on: - workflow_call: - inputs: - branch: - description: 'Branch to use' - default: 'main' - type: string - milestone: - description: 'Milestone to use as version' - type: string - -permissions: - contents: read - -jobs: - update_release_draft: - permissions: - contents: write - pull-requests: write - runs-on: ubuntu-latest - steps: - - name: Draft a Release - uses: release-drafter/release-drafter@v5 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/release-finish.yml b/.github/workflows/release-finish.yml deleted file mode 100644 index 7844014f..00000000 --- a/.github/workflows/release-finish.yml +++ /dev/null @@ -1,175 +0,0 @@ -name: Finish Release - -on: - workflow_dispatch: - inputs: - branch: - description: 'Branch to use' - default: 'develop' - type: string - milestone: - description: 'Milestone to use as version' - type: string - - workflow_call: - inputs: - branch: - description: 'Branch to use' - default: 'develop' - type: string - milestone: - description: 'Milestone to use as version' - type: string - -jobs: - - create-new-branch: - - runs-on: ubuntu-latest - - permissions: - contents: write - packages: write - - steps: - - - name: Checkout the code - uses: actions/checkout@v3 - with: - repository: assimbly/custom-components - ref: "develop" - fetch-depth: 0 - token: ${{ secrets.RELEASE_TOKEN }} - - - name: create a new branch - run: | - export GIT_TRACE_PACKET=1 - export GIT_TRACE=1 - export GIT_CURL_VERBOSE=1 - git config --global core.compression 0 - git config --global push.autoSetupRemote true - git config --local user.email "raymondmeester@gmail.com" - git config --local user.name "skin27" - git fetch --all - git checkout -b ${{inputs.milestone}} - - - name: Push changes - uses: ad-m/github-push-action@master - with: - github_token: ${{ secrets.RELEASE_TOKEN }} - repository: assimbly/custom-components - branch: ${{ inputs.milestone }} - force_with_lease: true - - - call-update-version: - needs: create-new-branch - uses: ./.github/workflows/update-version.yml - secrets: inherit - with: - branch: "${{ inputs.milestone }}" - milestone: "${{ inputs.milestone }}" - - merge-new-branch: - - needs: call-update-version - runs-on: ubuntu-latest - - permissions: - contents: write - packages: write - - steps: - - - name: Checkout the code - uses: actions/checkout@v3 - with: - repository: assimbly/custom-components - ref: main - fetch-depth: 0 - token: ${{ secrets.RELEASE_TOKEN }} - - - name: merge new branch - run: | - git fetch --all - git config --global push.autoSetupRemote true - git config --local user.email "raymondmeester@gmail.com" - git config --local user.name "skin27" - git merge origin/${{inputs.milestone}} - git push - - delete-old-packages: - - needs: merge-new-branch - runs-on: ubuntu-latest - permissions: - contents: read - packages: write - - steps: - - - name: Delete older snapshots - uses: smartsquaregmbh/delete-old-packages@v0.7.0 - with: - organization: assimbly - type: maven - keep: 0 - token: ${{ secrets.MAVEN_TOKEN }} - semver-pattern: ${{ inputs.milestone }} - names: | - org.assimbly.custom-components - org.assimbly.smooksnoxml - org.assimbly.auth - org.assimbly.aggregate - org.assimbly.aleris - org.assimbly.amazon - org.assimbly.archive - org.assimbly.cookies - org.assimbly.csvtoxml - org.assimbly.docconverter - org.assimbly.edi - org.assimbly.edifact - org.assimbly.edifactcommon - org.assimbly.edifactdotweb - org.assimbly.edifactstandards - org.assimbly.encoder - org.assimbly.enrich - org.assimbly.exceltoxml - org.assimbly.flv - org.assimbly.fmuta - - - name: Delete older snapshots 2 - uses: smartsquaregmbh/delete-old-packages@v0.7.0 - with: - organization: assimbly - type: maven - keep: 0 - token: ${{ secrets.MAVEN_TOKEN }} - semver-pattern: ${{ inputs.milestone }} - names: | - org.assimbly.formtoxml - org.assimbly.googledrive - org.assimbly.hl7 - org.assimbly.mail - org.assimbly.multipart - org.assimbly.oauth2token - org.assimbly.pdf - org.assimbly.pdftotext - org.assimbly.replace - org.assimbly.sandbox - org.assimbly.simplereplace - org.assimbly.smb - org.assimbly.soap - org.assimbly.sql - org.assimbly.tenantvariables - org.assimbly.throttling - org.assimbly.xmltocsv - org.assimbly.xmltoexcel - org.assimbly.xmltojson - - call-release-jars: - needs: delete-old-packages - uses: ./.github/workflows/release-jars.yml - secrets: inherit - with: - branch: 'main' \ No newline at end of file diff --git a/.github/workflows/release-jars.yml b/.github/workflows/release-jars.yml deleted file mode 100644 index cb3987ad..00000000 --- a/.github/workflows/release-jars.yml +++ /dev/null @@ -1,74 +0,0 @@ -name: Release Jars - -on: - workflow_dispatch: - workflow_call: - inputs: - branch: - description: 'Branch to use' - default: 'develop' - type: string - -jobs: - release_jars: - - runs-on: ubuntu-latest - permissions: - contents: read - packages: write - - steps: - - - name: Checkout the code - uses: actions/checkout@v3 - with: - repository: assimbly/custom-components - ref: ${{ inputs.branch }} - fetch-depth: 0 - token: ${{ secrets.RELEASE_TOKEN }} - - - name: Set up JDK 11 - uses: actions/setup-java@v3 - with: - java-version: '11' - distribution: 'temurin' - - - name: Setup Maven settings.xml - uses: whelk-io/maven-settings-xml-action@v20 - - with: - - repositories: > - [ - { - "id": "maven", - "name": "Maven Central", - "url": "https://repo1.maven.org/maven2" - }, - { - "id": "github", - "name": "Assimbly Base Repository", - "url": "https://maven.pkg.github.com/assimbly/base", - "snapshots": { - "enabled": "true" - } - }, - { - "id": "aurea", - "name": "Aurea Sonic Repository", - "url": "https://int-factory.aurea.com/nexus/content/repositories/sonic-releases/" - } - ] - servers: > - [ - { - "id": "github", - "username": "assimbly", - "password": "${{ secrets.MAVEN_TOKEN }}" - } - ] - - - name: Publish package - run: mvn --batch-mode deploy -DskipTests - env: - GITHUB_TOKEN: ${{ secrets.MAVEN_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/release-snapshots.yml b/.github/workflows/release-snapshots.yml deleted file mode 100644 index eb20f4f8..00000000 --- a/.github/workflows/release-snapshots.yml +++ /dev/null @@ -1,80 +0,0 @@ -name: Release Snapshots - -on: - workflow_dispatch: - schedule: - - cron: '0 1 * * *' - -jobs: - delete_old_snapshots: - - runs-on: ubuntu-latest - permissions: - contents: read - packages: write - - steps: - - - name: Delete older snapshots - uses: smartsquaregmbh/delete-old-packages@v0.7.0 - with: - organization: assimbly - type: maven - keep: 0 - version-pattern: "^\\S+\\-SNAPSHOT$" - names: | - org.assimbly.custom-components - org.assimbly.smooksnoxml - org.assimbly.auth - org.assimbly.aggregate - org.assimbly.aleris - org.assimbly.amazon - org.assimbly.archive - org.assimbly.cookies - org.assimbly.csvtoxml - org.assimbly.docconverter - org.assimbly.edi - org.assimbly.edifact - org.assimbly.edifactcommon - org.assimbly.edifactdotweb - org.assimbly.edifactstandards - org.assimbly.encoder - org.assimbly.enrich - org.assimbly.exceltoxml - org.assimbly.flv - org.assimbly.fmuta - - - name: Delete older snapshots 2 - uses: smartsquaregmbh/delete-old-packages@v0.7.0 - with: - organization: assimbly - type: maven - keep: 0 - version-pattern: "^\\S+\\-SNAPSHOT$" - names: | - org.assimbly.formtoxml - org.assimbly.googledrive - org.assimbly.hl7 - org.assimbly.mail - org.assimbly.multipart - org.assimbly.oauth2token - org.assimbly.pdf - org.assimbly.pdftotext - org.assimbly.replace - org.assimbly.sandbox - org.assimbly.simplereplace - org.assimbly.smb - org.assimbly.soap - org.assimbly.sql - org.assimbly.tenantvariables - org.assimbly.throttling - org.assimbly.xmltocsv - org.assimbly.xmltoexcel - org.assimbly.xmltojson - - call-release-jars: - needs: delete_old_snapshots - uses: ./.github/workflows/release-jars.yml - secrets: inherit - with: - branch: 'develop' diff --git a/.github/workflows/release-start.yml b/.github/workflows/release-start.yml deleted file mode 100644 index e1951d30..00000000 --- a/.github/workflows/release-start.yml +++ /dev/null @@ -1,33 +0,0 @@ -name: Start Release - -on: - workflow_dispatch: - inputs: - branch: - description: 'Branch to use' - default: 'develop' - type: string - milestone: - description: 'Milestone to use as version' - type: string - -jobs: - release: - - runs-on: ubuntu-latest - permissions: - contents: read - packages: write - - steps: - - - name: Start release - run: echo "Start release of base" - - call-update-version: - needs: release - uses: ./.github/workflows/update-version.yml - secrets: inherit - with: - branch: '${{inputs.branch}}' - milestone: '${{inputs.milestone}}' \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 00000000..a2fbe266 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,145 @@ +name: Release + +on: + workflow_dispatch: + inputs: + branch: + description: 'Branch to use' + type: string + default: 'develop' + milestone: + description: 'Milestone to use as version' + type: string + required: true + + workflow_call: + inputs: + branch: + description: 'Branch to use' + type: string + default: 'develop' + milestone: + description: 'Milestone to use as version' + type: string + required: true + +jobs: + delete_old_snapshots: + + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + + steps: + + - name: Delete packages + uses: smartsquaregmbh/delete-old-packages@v0.8.1 + with: + organization: assimbly + type: maven + keep: 0 + semver-pattern: "${{inputs.milestone}}" + names: | + org.assimbly.oauth2token + org.assimbly.replace + org.assimbly.xmltocsv + org.assimbly.pdftotext + org.assimbly.xmltojson + org.assimbly.googledrive + org.assimbly.multipart + org.assimbly.smb + org.assimbly.formtoxml + org.assimbly.simplereplace + org.assimbly.pdf + org.assimbly.sql + org.assimbly.sandbox + org.assimbly.xmltoexcel + org.assimbly.mail + org.assimbly.soap + org.assimbly.tenantvariables + org.assimbly.oriflame + org.assimbly.docconverter + org.assimbly.csvtoxml + org.assimbly.amazon + org.assimbly.edifactcommon + org.assimbly.auth + org.assimbly.exceltoxml + org.assimbly.edifact + org.assimbly.cookies + org.assimbly.encoder + org.assimbly.enrich + org.assimbly.aggregate + org.assimbly.edifactdotweb + org.assimbly.edi + org.assimbly.smooksnoxml + org.assimbly.flv + org.assimbly.edifactstandards + org.assimbly.jsontoxmllegacy + org.assimbly.xmltojsonlegacy + org.assimbly.custom-components + + release-jars: + needs: delete_old_snapshots + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + + steps: + + - name: Checkout the code + uses: actions/checkout@v4 + with: + repository: ${{ github.repository }} + ref: ${{ inputs.branch }} + fetch-depth: 0 + token: ${{ secrets.RELEASE_TOKEN }} + + + - name: Set up JDK 21 + uses: actions/setup-java@v4 + with: + java-version: '21' + distribution: 'temurin' + + - name: Setup Maven settings.xml + uses: whelk-io/maven-settings-xml-action@v22 + + with: + + repositories: > + [ + { + "id": "maven", + "name": "Maven Central", + "url": "https://repo1.maven.org/maven2" + }, + { + "id": "github", + "name": "Assimbly Base Repository", + "url": "https://maven.pkg.github.com/assimbly/base", + "snapshots": { + "enabled": "true" + } + }, + { + "id": "aurea", + "name": "Aurea Sonic Repository", + "url": "https://int-factory.aurea.com/nexus/content/repositories/sonic-releases/" + } + ] + servers: > + [ + { + "id": "github", + "username": "assimbly", + "password": "${{ secrets.MAVEN_TOKEN }}" + } + ] + + - name: Publish package + run: mvn --batch-mode deploy -DskipTests + env: + GITHUB_TOKEN: ${{ secrets.MAVEN_TOKEN }} + diff --git a/.github/workflows/update-version.yml b/.github/workflows/update-version.yml index a6da743d..454289e8 100644 --- a/.github/workflows/update-version.yml +++ b/.github/workflows/update-version.yml @@ -3,23 +3,17 @@ name: Update Version Number on: workflow_dispatch: inputs: - branch: - description: 'Branch to use' - default: 'develop' - type: string milestone: description: 'Milestone to use as version' type: string + required: true workflow_call: inputs: - branch: - description: 'Branch to use' - default: 'develop' - type: string milestone: description: 'Milestone to use as version' type: string + required: true jobs: update_version: @@ -33,10 +27,10 @@ jobs: steps: - name: Checkout the code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: - repository: assimbly/custom-components - ref: ${{ inputs.branch }} + repository: ${{ github.repository }} + ref: ${{ github.ref_name }} fetch-depth: 0 token: ${{ secrets.RELEASE_TOKEN }} @@ -63,6 +57,6 @@ jobs: uses: ad-m/github-push-action@master with: github_token: ${{ secrets.RELEASE_TOKEN }} - repository: assimbly/custom-components - branch: ${{ inputs.branch }} + repository: ${{ github.repository }} + ref: ${{ github.ref_name }} force_with_lease: true \ No newline at end of file diff --git a/pdf/src/test/java/org/assimbly/pdf/PdfComponentTest.java b/pdf/src/test/java/org/assimbly/pdf/PdfComponentTest.java index b7f556f2..8231ecdc 100644 --- a/pdf/src/test/java/org/assimbly/pdf/PdfComponentTest.java +++ b/pdf/src/test/java/org/assimbly/pdf/PdfComponentTest.java @@ -5,11 +5,11 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.model.language.ConstantExpression; +import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.http.impl.bootstrap.HttpServer; import org.apache.http.impl.bootstrap.ServerBootstrap; import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; import org.assimbly.pdf.handler.BasicValidationHandler; import org.apache.camel.test.junit5.CamelTestSupport; @@ -17,6 +17,7 @@ import static org.junit.jupiter.api.Assertions.*; +import java.io.File; import java.util.Objects; public class PdfComponentTest extends CamelTestSupport { @@ -28,9 +29,7 @@ public class PdfComponentTest extends CamelTestSupport { private HttpServer localServer; - @BeforeEach - @Override - public void setUp() throws Exception { + public void startServer() throws Exception { localServer = ServerBootstrap.bootstrap(). setHttpProcessor(null). setConnectionReuseStrategy(null). @@ -40,14 +39,10 @@ public void setUp() throws Exception { registerHandler("/pdfs/flowid", new BasicValidationHandler("GET", "tenant=tenant&uuid=12345", IOUtils.toByteArray(classLoader.getResourceAsStream("template.pdf")))) .create(); localServer.start(); - - super.setUp(); } @AfterEach - @Override - public void tearDown() throws Exception { - super.tearDown(); + public void stopServer() throws Exception { if (localServer != null) { localServer.stop(); @@ -55,7 +50,8 @@ public void tearDown() throws Exception { } @Override - protected RouteBuilder createRouteBuilder() { + protected RouteBuilder createRouteBuilder() throws Exception { + startServer(); return new RouteBuilder() { @Override public void configure() throws Exception { diff --git a/pdf/src/test/resources/expected/output.pdf b/pdf/src/test/resources/expected/output.pdf index 07e61fed..a79eb815 100644 Binary files a/pdf/src/test/resources/expected/output.pdf and b/pdf/src/test/resources/expected/output.pdf differ diff --git a/pom.xml b/pom.xml index cbe2b228..49c74c51 100644 --- a/pom.xml +++ b/pom.xml @@ -70,22 +70,22 @@ 1.78.1 1.9.26 4.0.5 - 4.7.0 - 1.10.0 - v3-rev20240809-2.0.0 + 4.8.0 + 1.11.0 + v3-rev20240914-2.0.0 1.5.0 1.36.0 2.5.1 - 6.6.0.Final + 6.6.1.Final 4.5.14 4.5.14 3.29.2-GA 2.0.0 2.1.3 2.1.3 - 2.1.38 + 2.1.39 0.8.0 - 1.0.4 + 1.0.5 2.5.2.Final 0.8.11 3.3.3 diff --git a/sql/src/test/java/org/assimbly/sql/SqlComponentTest.java b/sql/src/test/java/org/assimbly/sql/SqlComponentTest.java index 6a0cf370..c797c993 100644 --- a/sql/src/test/java/org/assimbly/sql/SqlComponentTest.java +++ b/sql/src/test/java/org/assimbly/sql/SqlComponentTest.java @@ -33,11 +33,10 @@ public class SqlComponentTest extends CamelTestSupport { private final String database = "mysql_test"; private final String connectionType = "mysql"; private final String escapeChars = "true"; - private String query = ""; private String query2 = ""; - private DocumentBuilder builder; + private MySQLDatabase mysqlDatabase; @AfterEach public void after(){ @@ -58,20 +57,14 @@ public void before() throws ParserConfigurationException { DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); builder = factory.newDocumentBuilder(); - MySQLDatabase mysqlDatabase = new MySQLDatabase(); + mysqlDatabase = new MySQLDatabase(); mysqlDatabase.create(); mysqlDatabase.insertMockData(); mysqlDatabase.createStoredProcedure(); - } - @Override - public void setUp() throws Exception { - - super.setUp(); } - protected RouteBuilder createCustomRouteBuilder() throws Exception { return new RouteBuilder() { @Override @@ -80,6 +73,7 @@ public void configure() throws Exception { .to("sql-custom://" + username + "@" + url + "?password=" + password + "&database=" + database + "&connectionType=" + connectionType + "&query=RAW(" + query + ")") .to("mock:out"); + from("direct:executeWithHeaders") .setHeader("product_id", new ConstantExpression("id")) .setHeader("product_name", new ConstantExpression("name")) diff --git a/tenantvariables/src/main/java/org/assimbly/tenantvariables/domain/TenantVariable.java b/tenantvariables/src/main/java/org/assimbly/tenantvariables/domain/TenantVariable.java index 103180bc..a71aed46 100644 --- a/tenantvariables/src/main/java/org/assimbly/tenantvariables/domain/TenantVariable.java +++ b/tenantvariables/src/main/java/org/assimbly/tenantvariables/domain/TenantVariable.java @@ -14,6 +14,7 @@ public class TenantVariable { public static final String CREATED_AT_FIELD = "createdAt"; public static final String CREATED_BY_FIELD = "createdBy"; public static final String VALUES_FIELD = "values"; + public static final String TAG_IDS_FIELD = "tag_ids"; private ObjectId _id; private String name; @@ -22,15 +23,19 @@ public class TenantVariable { private List values; + private List tagIds; + public TenantVariable(){ this._id = new ObjectId(); this.values = new ArrayList<>(); + this.tagIds = new ArrayList<>(); } public TenantVariable(String name){ this._id = new ObjectId(); this.name = name; this.values = new ArrayList<>(); + this.tagIds = new ArrayList<>(); } public List getValues() { @@ -71,6 +76,8 @@ public static TenantVariable fromDocument(Document document) { tenantVariable.put(environmentValue); } + tenantVariable.setTagIds(document.getList(TAG_IDS_FIELD, ObjectId.class)); + return tenantVariable; } @@ -95,6 +102,8 @@ public Document toDocument() { } document.append(VALUES_FIELD, valuesList); + document.append(TAG_IDS_FIELD, this.getTagIds()); + return document; } @@ -125,4 +134,12 @@ public String getCreatedBy() { } public void setCreatedBy(String createdBy) { this.createdBy = createdBy; } + + public List getTagIds() { + return tagIds; + } + + public void setTagIds(List tagIds) { + this.tagIds = tagIds; + } } \ No newline at end of file diff --git a/tenantvariables/src/test/java/org/assimbly/tenantvariables/EnvironmentVariables.java b/tenantvariables/src/test/java/org/assimbly/tenantvariables/EnvironmentVariables.java new file mode 100644 index 00000000..61b06a2c --- /dev/null +++ b/tenantvariables/src/test/java/org/assimbly/tenantvariables/EnvironmentVariables.java @@ -0,0 +1,8 @@ +package org.assimbly.tenantvariables; + +//Need this class because Mockito cannot mock java.lang.System's static methods. +public class EnvironmentVariables { + public static String getEnv(String key) { + return System.getenv(key); + } +} \ No newline at end of file diff --git a/tenantvariables/src/test/java/org/assimbly/tenantvariables/TenantVariablesEncryptionTest.java b/tenantvariables/src/test/java/org/assimbly/tenantvariables/TenantVariablesEncryptionTest.java index 6d15f160..ea8ee4ef 100644 --- a/tenantvariables/src/test/java/org/assimbly/tenantvariables/TenantVariablesEncryptionTest.java +++ b/tenantvariables/src/test/java/org/assimbly/tenantvariables/TenantVariablesEncryptionTest.java @@ -17,11 +17,12 @@ public class TenantVariablesEncryptionTest { private static TenantVariablesProcessor processor; + @BeforeAll - public static void setup(){ + public static void setup() { processor = new TenantVariablesProcessor(); - try (MockedStatic mockedSystem = Mockito.mockStatic(System.class)) { - mockedSystem.when(() -> System.getenv("ASSIMBLY_ENCRYPTION_SECRET")).thenReturn("assimblyassimblyassimblyassimbly"); + try (MockedStatic mockedEnv = Mockito.mockStatic(EnvironmentVariables.class)) { + mockedEnv.when(() -> EnvironmentVariables.getEnv("ASSIMBLY_ENCRYPTION_SECRET")).thenReturn("assimblyassimblyassimblyassimbly"); } } diff --git a/tenantvariables/src/test/java/org/assimbly/tenantvariables/TenantVariablesTest.java b/tenantvariables/src/test/java/org/assimbly/tenantvariables/TenantVariablesTest.java index 65ee1b90..40139307 100644 --- a/tenantvariables/src/test/java/org/assimbly/tenantvariables/TenantVariablesTest.java +++ b/tenantvariables/src/test/java/org/assimbly/tenantvariables/TenantVariablesTest.java @@ -4,7 +4,6 @@ import org.apache.camel.CamelExecutionException; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.impl.engine.ExplicitCamelContextNameStrategy; import org.apache.camel.model.language.ConstantExpression; import org.apache.camel.support.DefaultExchange; @@ -86,16 +85,6 @@ public class TenantVariablesTest extends CamelTestSupport { private static final String TENANT = "default"; - @AfterEach - @Override - public void tearDown() throws Exception { - try { - super.tearDown(); - } catch (Exception e) { - // TODO: follow up reported issue with this method after upgrading Camel - } - } - @AfterEach public void after(){ List variables = MongoDao.findAll(TENANT); @@ -114,18 +103,8 @@ public static void afterAll(){ } } - @Override @BeforeEach - public void setUp() throws Exception { - // Starts the CamelContext - super.setUp(); - - // Start Camel - context = new DefaultCamelContext(); - context.addRoutes(createRouteBuilder()); - context.start(); - - template = context.createProducerTemplate(); + public void setMongoDao() throws Exception { MongoDao.updateTenantVariable(createVariable(), TENANT, false); MongoDao.updateTenantVariable(createEncryptedVariable(), TENANT, false); diff --git a/xmltojsonlegacy/pom.xml b/xmltojsonlegacy/pom.xml index b26722d7..b124b97c 100644 --- a/xmltojsonlegacy/pom.xml +++ b/xmltojsonlegacy/pom.xml @@ -23,6 +23,11 @@ + + org.abstractj.kalium + kalium + 0.8.0 +