diff --git a/.github/workflows/test.yml b/.github/workflows/integration-test.yml similarity index 84% rename from .github/workflows/test.yml rename to .github/workflows/integration-test.yml index 0343c64..a153849 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/integration-test.yml @@ -1,6 +1,12 @@ name: Execute tests on different DBs -on: [push] +on: + workflow_dispatch: +### disable execution until ITs are fixed +# pull_request: +# branches: +# - develop +# - master jobs: test: @@ -8,7 +14,7 @@ jobs: steps: - name: Set up OpenJDK 21 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '21' distribution: 'corretto' @@ -25,9 +31,9 @@ jobs: echo "Docker Compose is installed." fi - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Docker Containers - uses: adambirds/docker-compose-action@v1.3.0 + uses: adambirds/docker-compose-action@v1.5.0 with: compose-file: | ./docker/mongodb/docker-compose.yml @@ -36,7 +42,7 @@ jobs: down-flags: "--volumes" - name: Setup DynamoDB Local - uses: rrainn/dynamodb-action@v2.0.1 + uses: rrainn/dynamodb-action@v4.0.0 with: dbPath: # undefined by default, if this is undefined inMemory will be used sharedDb: # undefined by default diff --git a/.github/workflows/maven.yml b/.github/workflows/maven-central-deploy.yml similarity index 72% rename from .github/workflows/maven.yml rename to .github/workflows/maven-central-deploy.yml index 62ce4e7..bec1dcd 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven-central-deploy.yml @@ -2,16 +2,22 @@ name: Deploy to maven central on: push: branches: [master, develop] - workflow_dispatch: + workflow_dispatch: + +env: + JAVA_DISTRIBUTION: zulu + JAVA_VERSION: 11 + jobs: - build: + maven-deploy-maven-central: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Maven Central Repository - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: - java-version: 11 + java-version: ${{ env.JAVA_VERSION }} + distribution: ${{ env.JAVA_DISTRIBUTION }} server-id: ossrh server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD diff --git a/.github/workflows/readme.txt b/.github/workflows/readme.txt deleted file mode 100644 index d9c4ff5..0000000 --- a/.github/workflows/readme.txt +++ /dev/null @@ -1,2 +0,0 @@ -Scripts per processi workflow di gitHub - diff --git a/.github/workflows/smeup.yml b/.github/workflows/smeup-deploy.yml similarity index 78% rename from .github/workflows/smeup.yml rename to .github/workflows/smeup-deploy.yml index 08ec2f2..e565866 100644 --- a/.github/workflows/smeup.yml +++ b/.github/workflows/smeup-deploy.yml @@ -2,22 +2,23 @@ name: Deploy to nexus on: push: branches: [master, develop] + env: - DISTRIBUTION: zulu + JAVA_DISTRIBUTION: zulu JAVA_VERSION: 11 jobs: - deploy-jardis-server: + maven-deploy-nexus: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set smeup nexus settings for snapshots if: ${{ github.ref == 'refs/heads/develop' }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: - distribution: ${{ env.DISTRIBUTION }} + distribution: ${{ env.JAVA_DISTRIBUTION }} java-version: ${{ env.JAVA_VERSION }} server-id: snapshots cache: 'maven' @@ -26,9 +27,9 @@ jobs: - name: Set smeup nexus settings for releases if: ${{ github.ref == 'refs/heads/master' }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: - distribution: ${{ env.DISTRIBUTION }} + distribution: ${{ env.JAVA_DISTRIBUTION }} java-version: ${{ env.JAVA_VERSION }} server-id: releases cache: 'maven' @@ -40,5 +41,3 @@ jobs: env: NEXUS_USER: ${{ secrets.NEXUS_USER }} NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }} - - diff --git a/manager/pom.xml b/manager/pom.xml index fe6f95b..f0d8da6 100644 --- a/manager/pom.xml +++ b/manager/pom.xml @@ -55,7 +55,7 @@ org.hsqldb hsqldb - 2.5.0 + 2.7.4 test diff --git a/sql/pom.xml b/sql/pom.xml index 23bce63..40a64e7 100644 --- a/sql/pom.xml +++ b/sql/pom.xml @@ -49,14 +49,14 @@ org.hsqldb hsqldb - 2.5.0 + 2.7.4 test mysql mysql-connector-java - 8.0.18 + 8.0.33 test