Merge remote-tracking branch 'origin/dev'

# Conflicts:
#	utils/utils.go

artifactory/services/fspatterns/utils.go

@@ -8,7 +8,6 @@ import (
 	"strings"
 
 	biutils "github.com/jfrog/build-info-go/utils"
-	serviceutils "github.com/jfrog/jfrog-client-go/artifactory/services/utils"
 	"github.com/jfrog/jfrog-client-go/utils"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 	"github.com/jfrog/jfrog-client-go/utils/io/fileutils"
@@ -30,14 +29,15 @@ func ListFiles(rootPath string, isRecursive, includeDirs, isSymlink bool, exclud
 	return filterFiles(paths, excludePathPattern)
 }
 
-// Transform to regexp and prepare Exclude patterns to be used
-func PrepareExcludePathPattern(params serviceutils.FileGetter) string {
+// Transform to regexp and prepare Exclude patterns to be used, exclusion patterns must be absolute paths.
+func PrepareExcludePathPattern(exclusions []string, patternType utils.PatternType, isRecursive bool) string {
 	excludePathPattern := ""
-	for _, singleExclusion := range params.GetExclusions() {
+
+	for _, singleExclusion := range exclusions {
 		if len(singleExclusion) > 0 {
 			singleExclusion = utils.ReplaceTildeWithUserHome(singleExclusion)
-			singleExclusion = utils.ConvertLocalPatternToRegexp(singleExclusion, params.GetPatternType())
-			if params.IsRecursive() && strings.HasSuffix(singleExclusion, fileutils.GetFileSeparator()) {
+			singleExclusion = utils.ConvertLocalPatternToRegexp(singleExclusion, patternType)
+			if isRecursive && strings.HasSuffix(singleExclusion, fileutils.GetFileSeparator()) {
 				singleExclusion += "*"
 			}
 			excludePathPattern += fmt.Sprintf(`(%s)|`, singleExclusion)

artifactory/services/upload.go

@@ -300,7 +300,7 @@ func addEscapingParenthesesForUpload(pattern, target, targetPathInArchive string
 }
 
 func scanFilesByPattern(uploadParams UploadParams, rootPath string, progressMgr ioutils.ProgressMgr, vcsCache *clientutils.VcsCache, dataHandlerFunc UploadDataHandlerFunc) error {
-	excludePathPattern := fspatterns.PrepareExcludePathPattern(uploadParams)
+	excludePathPattern := fspatterns.PrepareExcludePathPattern(uploadParams.Exclusions, uploadParams.GetPatternType(), uploadParams.IsRecursive())
 	patternRegex, err := regexp.Compile(uploadParams.GetPattern())
 	if errorutils.CheckError(err) != nil {
 		return err

utils/utils.go

@@ -26,7 +26,7 @@ import (
 const (
 	Development = "development"
 	Agent       = "jfrog-client-go"
-	Version     = "1.31.1"
+	Version     = "1.31.2"
 )
 
 // In order to limit the number of items loaded from a reader into the memory, we use a buffers with this size limit.