From 52b7409cf498d95f4fa443c47d56d6864784b790 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Catal=C3=A3o?= Date: Tue, 25 Apr 2023 06:16:48 +0100 Subject: [PATCH 01/21] Added snapshots to base --- .github/workflows/maven-publish.yml | 74 +++++++++++++++++++++++++++-- activemqBase/pom.xml | 2 +- camelBase/pom.xml | 2 +- camelComponents/pom.xml | 2 +- commonBase/pom.xml | 2 +- databaseDrivers/pom.xml | 2 +- extra/pom.xml | 2 +- pom.xml | 4 +- springBase/pom.xml | 2 +- testBase/pom.xml | 2 +- utils/pom.xml | 2 +- 11 files changed, 82 insertions(+), 14 deletions(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 23dbbe5..0acf35a 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -2,6 +2,9 @@ name: Publish package to GitHub Packages on: release: types: [ released ] + push: + branches: + - 'snapshots-tests' jobs: publish: @@ -10,12 +13,77 @@ jobs: contents: read packages: write steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 + + - name: Checkout the code + uses: actions/checkout@v3 + + - name: Setup Java + uses: actions/setup-java@v3 with: java-version: '11' distribution: 'adopt' + + - 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": "$GITHUB_ACTOR", + "password": "$GITHUB_TOKEN" + } + ] + + - name: Remove HTTP blocker from the built in settings.xml + run: | + export MAVEN_PATH=$(mvn -X | grep "home" | head -1 | cut -d " " -f 3) + echo "this is the path: $MAVEN_PATH" + echo '' > "$MAVEN_PATH/conf/settings.xml" + echo '' >> "$MAVEN_PATH/conf/settings.xml" + echo '' >> "$MAVEN_PATH/conf/settings.xml" + cat $MAVEN_PATH/conf/settings.xml + - name: Publish package - run: ./bin/mac/deploy.sh + run: maven clean deploy env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/activemqBase/pom.xml b/activemqBase/pom.xml index ce48bba..4c92c8a 100644 --- a/activemqBase/pom.xml +++ b/activemqBase/pom.xml @@ -8,7 +8,7 @@ base org.assimbly - 4.0.0 + 4.0.0-SNAPSHOT activemq-base diff --git a/camelBase/pom.xml b/camelBase/pom.xml index 71a7e1c..b90405d 100644 --- a/camelBase/pom.xml +++ b/camelBase/pom.xml @@ -8,7 +8,7 @@ base org.assimbly - 4.0.0 + 4.0.0-SNAPSHOT camel-base diff --git a/camelComponents/pom.xml b/camelComponents/pom.xml index e744c80..b44c68b 100644 --- a/camelComponents/pom.xml +++ b/camelComponents/pom.xml @@ -8,7 +8,7 @@ base org.assimbly - 4.0.0 + 4.0.0-SNAPSHOT camel-components diff --git a/commonBase/pom.xml b/commonBase/pom.xml index 7305f9c..497e6bd 100644 --- a/commonBase/pom.xml +++ b/commonBase/pom.xml @@ -8,7 +8,7 @@ base org.assimbly - 4.0.0 + 4.0.0-SNAPSHOT common-base diff --git a/databaseDrivers/pom.xml b/databaseDrivers/pom.xml index d59f09f..4d4c488 100644 --- a/databaseDrivers/pom.xml +++ b/databaseDrivers/pom.xml @@ -8,7 +8,7 @@ base org.assimbly - 4.0.0 + 4.0.0-SNAPSHOT database-drivers diff --git a/extra/pom.xml b/extra/pom.xml index f14423d..064833b 100644 --- a/extra/pom.xml +++ b/extra/pom.xml @@ -8,7 +8,7 @@ base org.assimbly - 4.0.0 + 4.0.0-SNAPSHOT extra diff --git a/pom.xml b/pom.xml index 7b1200d..06cb889 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ org.assimbly.camelconnector http://maven.apache.org - 4.0.0 + 4.0.0-SNAPSHOT activemqBase @@ -41,7 +41,7 @@ 1.0 1.4.0 - 4.0.0 + 4.0.0-SNAPSHOT 5.18.1 2.28.0 2.0.0 diff --git a/springBase/pom.xml b/springBase/pom.xml index 39a72bb..9684a5e 100644 --- a/springBase/pom.xml +++ b/springBase/pom.xml @@ -8,7 +8,7 @@ base org.assimbly - 4.0.0 + 4.0.0-SNAPSHOT spring-base diff --git a/testBase/pom.xml b/testBase/pom.xml index b577f4b..1ed8dcd 100644 --- a/testBase/pom.xml +++ b/testBase/pom.xml @@ -5,7 +5,7 @@ base org.assimbly - 4.0.0 + 4.0.0-SNAPSHOT 4.0.0 diff --git a/utils/pom.xml b/utils/pom.xml index 7c40b14..f269dc3 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -4,7 +4,7 @@ base org.assimbly - 4.0.0 + 4.0.0-SNAPSHOT utils From 001806d1c6331ca3c806dbb8114372b032d15618 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Catal=C3=A3o?= Date: Tue, 25 Apr 2023 06:23:04 +0100 Subject: [PATCH 02/21] Updated maven publish action --- .github/workflows/maven-publish.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 0acf35a..9e02e3f 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -7,12 +7,14 @@ on: - 'snapshots-tests' jobs: + publish: runs-on: ubuntu-latest permissions: contents: read packages: write - steps: + + steps: - name: Checkout the code uses: actions/checkout@v3 @@ -83,7 +85,7 @@ jobs: echo '' >> "$MAVEN_PATH/conf/settings.xml" cat $MAVEN_PATH/conf/settings.xml - - name: Publish package - run: maven clean deploy - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + - name: Build and Deploy + uses: jamesdbloom/action-maven@master + with: + args: clean deploy -DskipTests=true \ No newline at end of file From 1ee7fc7734cea94105000d162a3904a0936b6ba5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Catal=C3=A3o?= Date: Tue, 25 Apr 2023 06:23:47 +0100 Subject: [PATCH 03/21] Updated maven publish action --- .github/workflows/maven-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 9e02e3f..02a7529 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -14,7 +14,7 @@ jobs: contents: read packages: write - steps: + steps: - name: Checkout the code uses: actions/checkout@v3 From c48ef21152bbe669bbd95cb89c4434c4187a502f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Catal=C3=A3o?= Date: Tue, 25 Apr 2023 06:26:24 +0100 Subject: [PATCH 04/21] Updated maven publish action --- .github/workflows/maven-publish.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 02a7529..3b3a22c 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -85,7 +85,8 @@ jobs: echo '' >> "$MAVEN_PATH/conf/settings.xml" cat $MAVEN_PATH/conf/settings.xml - - name: Build and Deploy - uses: jamesdbloom/action-maven@master - with: - args: clean deploy -DskipTests=true \ No newline at end of file + - name: Publish package + run: mvn --batch-mode deploy + env: + MAVEN_USERNAME: ${{ secrets.GITHUB_ACTOR }} + MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file From 0e48cd6f3f823734162d9e8c23c3dcec0e9b4b4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Catal=C3=A3o?= Date: Tue, 25 Apr 2023 06:26:37 +0100 Subject: [PATCH 05/21] Updated maven publish action --- .github/workflows/maven-publish.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 3b3a22c..d92678b 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -85,8 +85,8 @@ jobs: echo '' >> "$MAVEN_PATH/conf/settings.xml" cat $MAVEN_PATH/conf/settings.xml - - name: Publish package - run: mvn --batch-mode deploy - env: - MAVEN_USERNAME: ${{ secrets.GITHUB_ACTOR }} - MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + - name: Publish package + run: mvn --batch-mode deploy + env: + MAVEN_USERNAME: ${{ secrets.GITHUB_ACTOR }} + MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file From cb7bbea0e0bee57fde771754a7b094dc302d6419 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Catal=C3=A3o?= Date: Tue, 25 Apr 2023 06:28:05 +0100 Subject: [PATCH 06/21] Updated maven publish action --- .github/workflows/maven-publish.yml | 60 ----------------------------- 1 file changed, 60 deletions(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index d92678b..fb475b6 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -24,67 +24,7 @@ jobs: with: java-version: '11' distribution: 'adopt' - - - 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": "$GITHUB_ACTOR", - "password": "$GITHUB_TOKEN" - } - ] - - - name: Remove HTTP blocker from the built in settings.xml - run: | - export MAVEN_PATH=$(mvn -X | grep "home" | head -1 | cut -d " " -f 3) - echo "this is the path: $MAVEN_PATH" - echo '' > "$MAVEN_PATH/conf/settings.xml" - echo '' >> "$MAVEN_PATH/conf/settings.xml" - echo '' >> "$MAVEN_PATH/conf/settings.xml" - cat $MAVEN_PATH/conf/settings.xml - - name: Publish package run: mvn --batch-mode deploy env: From 9c2646a6a6571cc6e8890a8ad56692daee2702c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Catal=C3=A3o?= Date: Tue, 25 Apr 2023 06:31:12 +0100 Subject: [PATCH 07/21] Updated maven publish action --- .github/workflows/maven-publish.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index fb475b6..8e6205d 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -28,5 +28,4 @@ jobs: - name: Publish package run: mvn --batch-mode deploy env: - MAVEN_USERNAME: ${{ secrets.GITHUB_ACTOR }} - MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file From 7bf83b3b57557495befce7438089eb9dd3a7165f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Catal=C3=A3o?= Date: Tue, 25 Apr 2023 06:36:48 +0100 Subject: [PATCH 08/21] Updated maven publish action --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 06cb889..60c5a11 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ 3.6.1 1.10.0 db2jcc4 - 1.7.0 + 1.0.4 4.2.18 8.7.0 2.10.1 From 42d3cbcf712734aeacbf86779c0b33cabc93b862 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Catal=C3=A3o?= Date: Wed, 26 Apr 2023 07:52:52 +0100 Subject: [PATCH 09/21] Updated utils pom.xml --- utils/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/pom.xml b/utils/pom.xml index f269dc3..5013c0a 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -80,11 +80,11 @@ ${tika.version} - + From 705c22aff4afb5c95543bfbb52bc72ce1306e360 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Catal=C3=A3o?= Date: Wed, 26 Apr 2023 08:04:33 +0100 Subject: [PATCH 10/21] Re-added docconverter dependency --- utils/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/pom.xml b/utils/pom.xml index 5013c0a..f269dc3 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -80,11 +80,11 @@ ${tika.version} - + From e51372cd3dc138e05b427f46b874b6ca793a352d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Catal=C3=A3o?= Date: Wed, 26 Apr 2023 08:43:18 +0100 Subject: [PATCH 11/21] Downgraded docconverter version and updated package publish action --- .github/workflows/maven-publish.yml | 16 +++++++++++++--- pom.xml | 2 +- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 23dbbe5..8e6205d 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -2,20 +2,30 @@ name: Publish package to GitHub Packages on: release: types: [ released ] + push: + branches: + - 'snapshots-tests' jobs: + publish: runs-on: ubuntu-latest permissions: contents: read packages: write + steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 + + - name: Checkout the code + uses: actions/checkout@v3 + + - name: Setup Java + uses: actions/setup-java@v3 with: java-version: '11' distribution: 'adopt' + - name: Publish package - run: ./bin/mac/deploy.sh + run: mvn --batch-mode deploy env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 7b1200d..3dfd8b1 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ 3.6.1 1.10.0 db2jcc4 - 1.7.0 + 1.6.1 4.2.18 8.7.0 2.10.1 From 302c3148f1b481dbb6963436effc9f48a2a5bf5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Catal=C3=A3o?= Date: Wed, 26 Apr 2023 11:10:29 +0100 Subject: [PATCH 12/21] Added snapshots action --- .github/workflows/snapshots.yml | 60 +++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 .github/workflows/snapshots.yml diff --git a/.github/workflows/snapshots.yml b/.github/workflows/snapshots.yml new file mode 100644 index 0000000..7c9d4f5 --- /dev/null +++ b/.github/workflows/snapshots.yml @@ -0,0 +1,60 @@ +name: Publish Snapshots + +on: + schedule: + - cron: "* 0 * * *" + push: + branches: + - 'snapshots-tests' + +jobs: + publish_base_snapshot: + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + + steps: + + - name: Checkout the code + uses: actions/checkout@v3 + with: + ref: "develop" + + - name: Set up JDK 11 + uses: actions/setup-java@v3 + with: + java-version: '11' + distribution: 'temurin' + + - name: Update POM Version + env: + VERSION: 4.0.0-SNAPSHOT + 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 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Delete older snapshots + uses: smartsquaregmbh/delete-old-packages@v0.7.0 + with: + organization: assimbly + type: maven + keep: 1 + version-pattern: "^\\S+\\-SNAPSHOT$" + names: | + org.assimbly.base + org.assimbly.common-base + org.assimbly.camel-base + org.assimbly.spring-base + org.assimbly.activemq-base + org.assimbly.test-base + org.assimbly.database-drivers + org.assimbly.camel-components + org.assimbly.utils + org.assimbly.extra \ No newline at end of file From c01f940f5fc73093632e99840e7ad40f664c565c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Catal=C3=A3o?= Date: Wed, 26 Apr 2023 11:13:01 +0100 Subject: [PATCH 13/21] Updated maven-publish.yml --- .github/workflows/maven-publish.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 8e6205d..5d8ed54 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -2,9 +2,6 @@ name: Publish package to GitHub Packages on: release: types: [ released ] - push: - branches: - - 'snapshots-tests' jobs: From f744b9462c3cc9ef0a1b274683ddd9e4a56dece8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Catal=C3=A3o?= Date: Wed, 26 Apr 2023 11:18:26 +0100 Subject: [PATCH 14/21] Updated snapshots action --- .github/workflows/snapshots.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/snapshots.yml b/.github/workflows/snapshots.yml index 7c9d4f5..3b0570b 100644 --- a/.github/workflows/snapshots.yml +++ b/.github/workflows/snapshots.yml @@ -40,6 +40,14 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + delete_older_snapshots: + needs: [publish_base_snapshot] + + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + - name: Delete older snapshots uses: smartsquaregmbh/delete-old-packages@v0.7.0 with: From 1f16ed46320f9fffc9b2a43233d0d3bf356894a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Catal=C3=A3o?= Date: Wed, 26 Apr 2023 11:22:36 +0100 Subject: [PATCH 15/21] Updated snapshots action --- .github/workflows/snapshots.yml | 102 ++++++++++++++++---------------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/.github/workflows/snapshots.yml b/.github/workflows/snapshots.yml index 3b0570b..2536c7f 100644 --- a/.github/workflows/snapshots.yml +++ b/.github/workflows/snapshots.yml @@ -8,61 +8,61 @@ on: - 'snapshots-tests' jobs: - publish_base_snapshot: - runs-on: ubuntu-latest - permissions: - contents: read - packages: write + publish_base_snapshot: + runs-on: ubuntu-latest + permissions: + contents: read + packages: write - steps: + steps: - - name: Checkout the code - uses: actions/checkout@v3 - with: - ref: "develop" - - - name: Set up JDK 11 - uses: actions/setup-java@v3 - with: - java-version: '11' - distribution: 'temurin' + - name: Checkout the code + uses: actions/checkout@v3 + with: + ref: "develop" + + - name: Set up JDK 11 + uses: actions/setup-java@v3 + with: + java-version: '11' + distribution: 'temurin' - - name: Update POM Version - env: - VERSION: 4.0.0-SNAPSHOT - run: | - echo "Updating to version: ${VERSION}" - mvn versions:set -DgenerateBackupPoms=false -DnewVersion=${VERSION} - mvn versions:set-property -Dproperty=assimbly.version -DnewVersion=${VERSION} + - name: Update POM Version + env: + VERSION: 4.0.0-SNAPSHOT + 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 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Publish package + run: mvn --batch-mode deploy + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - delete_older_snapshots: - needs: [publish_base_snapshot] +delete_older_snapshots: + needs: [publish_base_snapshot] - runs-on: ubuntu-latest - permissions: - contents: read - packages: write + runs-on: ubuntu-latest + permissions: + contents: read + packages: write - - name: Delete older snapshots - uses: smartsquaregmbh/delete-old-packages@v0.7.0 - with: - organization: assimbly - type: maven - keep: 1 - version-pattern: "^\\S+\\-SNAPSHOT$" - names: | - org.assimbly.base - org.assimbly.common-base - org.assimbly.camel-base - org.assimbly.spring-base - org.assimbly.activemq-base - org.assimbly.test-base - org.assimbly.database-drivers - org.assimbly.camel-components - org.assimbly.utils - org.assimbly.extra \ No newline at end of file + - name: Delete older snapshots + uses: smartsquaregmbh/delete-old-packages@v0.7.0 + with: + organization: assimbly + type: maven + keep: 1 + version-pattern: "^\\S+\\-SNAPSHOT$" + names: | + org.assimbly.base + org.assimbly.common-base + org.assimbly.camel-base + org.assimbly.spring-base + org.assimbly.activemq-base + org.assimbly.test-base + org.assimbly.database-drivers + org.assimbly.camel-components + org.assimbly.utils + org.assimbly.extra \ No newline at end of file From 972813826000b47b13d951f08a52a16b13bcbb24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Catal=C3=A3o?= Date: Wed, 26 Apr 2023 11:23:41 +0100 Subject: [PATCH 16/21] Updated snapshots action --- .github/workflows/snapshots.yml | 38 +++++++++++++++++---------------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/.github/workflows/snapshots.yml b/.github/workflows/snapshots.yml index 2536c7f..0230535 100644 --- a/.github/workflows/snapshots.yml +++ b/.github/workflows/snapshots.yml @@ -48,21 +48,23 @@ delete_older_snapshots: contents: read packages: write - - name: Delete older snapshots - uses: smartsquaregmbh/delete-old-packages@v0.7.0 - with: - organization: assimbly - type: maven - keep: 1 - version-pattern: "^\\S+\\-SNAPSHOT$" - names: | - org.assimbly.base - org.assimbly.common-base - org.assimbly.camel-base - org.assimbly.spring-base - org.assimbly.activemq-base - org.assimbly.test-base - org.assimbly.database-drivers - org.assimbly.camel-components - org.assimbly.utils - org.assimbly.extra \ No newline at end of file + steps: + + - name: Delete older snapshots + uses: smartsquaregmbh/delete-old-packages@v0.7.0 + with: + organization: assimbly + type: maven + keep: 1 + version-pattern: "^\\S+\\-SNAPSHOT$" + names: | + org.assimbly.base + org.assimbly.common-base + org.assimbly.camel-base + org.assimbly.spring-base + org.assimbly.activemq-base + org.assimbly.test-base + org.assimbly.database-drivers + org.assimbly.camel-components + org.assimbly.utils + org.assimbly.extra \ No newline at end of file From b09e650a138f8e3dcb69727ab7a5e0d2425b5993 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Catal=C3=A3o?= Date: Wed, 26 Apr 2023 11:24:57 +0100 Subject: [PATCH 17/21] Updated snapshots action --- .github/workflows/snapshots.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/snapshots.yml b/.github/workflows/snapshots.yml index 0230535..f64362f 100644 --- a/.github/workflows/snapshots.yml +++ b/.github/workflows/snapshots.yml @@ -40,7 +40,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} -delete_older_snapshots: + delete_older_snapshots: needs: [publish_base_snapshot] runs-on: ubuntu-latest From 419eec64c9eb44683d3c5eccc8bfccc6a7ea2060 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Catal=C3=A3o?= Date: Wed, 26 Apr 2023 11:50:02 +0100 Subject: [PATCH 18/21] Updated snapshots action --- .github/workflows/snapshots.yml | 61 +++++++++++++++++---------------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/.github/workflows/snapshots.yml b/.github/workflows/snapshots.yml index f64362f..01919a5 100644 --- a/.github/workflows/snapshots.yml +++ b/.github/workflows/snapshots.yml @@ -8,7 +8,37 @@ on: - 'snapshots-tests' jobs: + delete_older_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.base + org.assimbly.common-base + org.assimbly.camel-base + org.assimbly.spring-base + org.assimbly.activemq-base + org.assimbly.test-base + org.assimbly.database-drivers + org.assimbly.camel-components + org.assimbly.utils + org.assimbly.extra + publish_base_snapshot: + needs: [delete_older_packages] + runs-on: ubuntu-latest permissions: contents: read @@ -38,33 +68,4 @@ jobs: - name: Publish package run: mvn --batch-mode deploy env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - delete_older_snapshots: - needs: [publish_base_snapshot] - - 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: 1 - version-pattern: "^\\S+\\-SNAPSHOT$" - names: | - org.assimbly.base - org.assimbly.common-base - org.assimbly.camel-base - org.assimbly.spring-base - org.assimbly.activemq-base - org.assimbly.test-base - org.assimbly.database-drivers - org.assimbly.camel-components - org.assimbly.utils - org.assimbly.extra \ No newline at end of file + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file From 423b5aecd26cd2bc313eb9b12bd7ee9b0fa6e0a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Catal=C3=A3o?= Date: Wed, 26 Apr 2023 11:50:56 +0100 Subject: [PATCH 19/21] Updated snapshots action --- .github/workflows/snapshots.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/snapshots.yml b/.github/workflows/snapshots.yml index 01919a5..6938337 100644 --- a/.github/workflows/snapshots.yml +++ b/.github/workflows/snapshots.yml @@ -37,7 +37,7 @@ jobs: org.assimbly.extra publish_base_snapshot: - needs: [delete_older_packages] + needs: [delete_older_snapshots] runs-on: ubuntu-latest permissions: From 590d6e3d807ed356cfafc57e78aa422ee0a403e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Catal=C3=A3o?= Date: Wed, 26 Apr 2023 12:08:25 +0100 Subject: [PATCH 20/21] Updated snapshots action --- .github/workflows/snapshots.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/snapshots.yml b/.github/workflows/snapshots.yml index 6938337..6254266 100644 --- a/.github/workflows/snapshots.yml +++ b/.github/workflows/snapshots.yml @@ -2,7 +2,7 @@ name: Publish Snapshots on: schedule: - - cron: "* 0 * * *" + - cron: '0 0 * * *' push: branches: - 'snapshots-tests' From f9e6a1b0812032f7924dc999cd3b4c69ac4a9afa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Catal=C3=A3o?= Date: Wed, 3 May 2023 08:22:04 +0100 Subject: [PATCH 21/21] Updated docconverter version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f17003a..3877b62 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ 3.6.1 1.10.0 db2jcc4 - 1.6.1 + 1.7.1 4.2.18 8.7.0 2.10.1