diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6567a38f..f21207e0 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -30,8 +30,11 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - - name: Setup Go with cache - uses: jfrog/.github/actions/install-go-with-cache@main + - name: Setup Go + uses: actions/setup-go@v5 + with: + go-version: 1.22.x + cache: false - name: Install local Artifactory uses: jfrog/.github/actions/install-local-artifactory@main diff --git a/build.gradle b/build.gradle index 35ebaaaf..14729690 100644 --- a/build.gradle +++ b/build.gradle @@ -106,9 +106,9 @@ subprojects { } implementation 'commons-codec:commons-codec:1.13' implementation 'org.apache.commons:commons-lang3:3.18.0' - implementation 'com.fasterxml.jackson.core:jackson-core:2.19.1' - implementation 'com.fasterxml.jackson.core:jackson-databind:2.19.1' - implementation 'com.fasterxml.jackson.core:jackson-annotations:2.19.1' + implementation 'com.fasterxml.jackson.core:jackson-core:2.21.1' + implementation 'com.fasterxml.jackson.core:jackson-databind:2.21.1' + implementation 'com.fasterxml.jackson.core:jackson-annotations:2.21' api 'org.jfrog.filespecs:file-specs-java:1.1.2' } diff --git a/services/build.gradle b/services/build.gradle index be76d9c8..0d7a2dac 100644 --- a/services/build.gradle +++ b/services/build.gradle @@ -15,7 +15,7 @@ dependencies { * https://github.com/jfrog/artifactory-client-java/issues/43 * https://github.com/jfrog/artifactory-client-java/issues/232 */ - testRuntimeOnly group: 'ch.qos.logback', name: 'logback-classic', version: '1.3.15' + testRuntimeOnly group: 'ch.qos.logback', name: 'logback-classic', version: '1.3.16' } task createReleasePropertiesFile(type: Exec) { diff --git a/services/src/test/groovy/org/jfrog/artifactory/client/CustomPropertiesRepositoryTests.groovy b/services/src/test/groovy/org/jfrog/artifactory/client/CustomPropertiesRepositoryTests.groovy index 23a061a7..92c8a015 100644 --- a/services/src/test/groovy/org/jfrog/artifactory/client/CustomPropertiesRepositoryTests.groovy +++ b/services/src/test/groovy/org/jfrog/artifactory/client/CustomPropertiesRepositoryTests.groovy @@ -3,6 +3,7 @@ package org.jfrog.artifactory.client import org.jfrog.artifactory.client.model.RepositoryType import org.jfrog.artifactory.client.model.impl.RepositoryTypeImpl import org.jfrog.artifactory.client.model.repository.settings.RepositorySettings +import org.jfrog.artifactory.client.model.repository.settings.impl.GenericRepositorySettingsImpl import org.testng.annotations.BeforeMethod import org.testng.annotations.Test @@ -14,6 +15,9 @@ class CustomPropertiesRepositoryTests extends BaseRepositoryTests { @Override RepositorySettings getRepositorySettings(RepositoryType repositoryType) { + if (repositoryType == RepositoryTypeImpl.VIRTUAL) { + return new GenericRepositorySettingsImpl() + } return null }