diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 00000000..33920489
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,50 @@
+name: Java SDK Matrix CI
+
+on:
+  push:
+    branches-ignore:
+      - staging-test
+  pull_request:
+
+jobs:
+  build:
+    name: Test ${{ matrix.module }} on JDK ${{ matrix.java }}
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        java: ['8']
+        module: [ 'core', 'http5', 'taglib' ]
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up JDK ${{ matrix.java }}
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'adopt'
+          java-version: ${{ matrix.java }}
+
+      - name: Clean Gradle plugin cache
+        run: |
+          rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
+          rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+
+      - name: Cache Gradle
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ matrix.java }}-${{ matrix.module }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+
+      - name: Create test subaccount
+        run: ./gradlew createTestSubAccount -PmoduleName=${{ matrix.module }}
+
+      - name: Load CLOUDINARY_URL and run ciTest
+        run: |
+          source tools/cloudinary_url.txt
+          ./gradlew -DCLOUDINARY_URL=$CLOUDINARY_URL ciTest -p cloudinary-${{ matrix.module }} -i
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 8a1fec22..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-language: java
-dist: trusty
-
-before_cache:
-  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
-  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
-cache:
-  directories:
-    - $HOME/.gradle/caches/
-    - $HOME/.gradle/wrapper/
-
-jdk:
-  - oraclejdk8
-  - oraclejdk9
-  - oraclejdk11
-  - openjdk8
-  - openjdk10
-
-env:
-  - MODULE=core
-  - MODULE=http5
-
-branches:
-  except:
-  - staging-test
-
-before_script: ./gradlew createTestSubAccount -PmoduleName=${MODULE}
-
-# ciTest is configured to skip the various timeout tests that don't work in travis
-script: source tools/cloudinary_url.txt && ./gradlew -DCLOUDINARY_URL=$CLOUDINARY_URL ciTest -p cloudinary-${MODULE} -i
-
-
-notifications:
-  email:
-    recipients:
-      - sdk_developers@cloudinary.com
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc13fee5..6cb9303b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,30 @@
+2.3.1 / 2025-08-13
+==================
+
+* Bump dependencies version
+
+2.3.0 / 2025-06-18
+==================
+* Fix API parameters signature
+* Fix build single resource params
+* Add skip backup parameter to delete folder api
+
+2.2.0 / 2025-02-02
+==================
+
+* Fix Uploader strategy
+* Add restore assets by asset ids
+* Add allow dynamic list parameter
+* Add delete resources by asset ids
+
+2.1.0 / 2025-01-20
+==================
+
+* Fix Http client proxy
+* Fix Http client system properties support
+* Add Cloudinary constructor for `Configuration`
+* Fix Register strategy functions
+
 2.0.0 / 2024-09-29
 ==================
 
diff --git a/MAVEN_CENTRAL_PUBLISHING_GUIDE.md b/MAVEN_CENTRAL_PUBLISHING_GUIDE.md
new file mode 100644
index 00000000..6fb96006
--- /dev/null
+++ b/MAVEN_CENTRAL_PUBLISHING_GUIDE.md
@@ -0,0 +1,437 @@
+# Maven Central Publishing Guide - Cloudinary Java SDK
+
+This guide documents the complete process for publishing the Cloudinary Java SDK to Maven Central using the new Central Portal (central.sonatype.com), replacing the deprecated OSSRH system.
+
+## 🎯 **Overview**
+
+- **Old System:** `oss.sonatype.org` (dead, returns 401 errors)
+- **New System:** `central.sonatype.com` with manual bundle upload
+- **Method:** Manual bundle creation and upload (not automated plugin publishing)
+- **Requirements:** Complete artifacts with checksums and GPG signatures
+- **Current Version:** 2.3.1 → Next version (e.g., 2.3.2)
+
+## 📋 **Prerequisites**
+
+1. **Credentials:**
+   - `centralUsername` and `centralPassword` for central.sonatype.com
+   - Legacy `ossrhToken` and `ossrhTokenPassword` (if available)
+
+2. **GPG Setup:**
+   - GPG key imported: `6B42474E50D0D89A01B40AC225FE63F85DCB788F`
+   - Private key available in repository: `private-key.asc`
+   - Password: `nwov0aaStnO4`
+
+3. **Java Version:**
+   - **Java 8+** (current project targets Java 8)
+   - Verify with: `java -version`
+
+## 🔧 **Configuration Changes Required**
+
+### 1. Update Root `build.gradle`
+
+```gradle
+plugins {
+    id 'maven-publish'
+    // Remove the old nexus plugin: id 'io.github.gradle-nexus.publish-plugin' version '1.0.0'
+}
+
+allprojects {
+    repositories {
+        mavenCentral()
+    }
+    project.ext.set("publishGroupId", group)
+}
+
+// Remove the old nexusPublishing block - we'll create bundles manually for Central Portal
+
+tasks.create('createTestSubAccount') {
+    doFirst {
+        println("Task createTestSubAccount called with module $moduleName")
+        def cloudinaryUrl = ""
+        
+        // core does not use test clouds, skip (keep empty file for a more readable generic travis test script)
+        if (moduleName != "core") {
+            println "Creating test cloud..."
+            def baseUrl = new URL('https://sub-account-testing.cloudinary.com/create_sub_account')
+            def connection = baseUrl.openConnection()
+            connection.with {
+                doOutput = true
+                requestMethod = 'POST'
+                def json = new JsonSlurper().parseText(content.text)
+                def cloud = json["payload"]["cloudName"]
+                def key = json["payload"]["cloudApiKey"]
+                def secret = json["payload"]["cloudApiSecret"]
+                cloudinaryUrl = "CLOUDINARY_URL=cloudinary://$key:$secret@$cloud"
+            }
+        }
+
+        def dir = new File("${projectDir.path}${File.separator}tools")
+        dir.mkdir()
+        def file = new File(dir, "cloudinary_url.txt")
+        file.createNewFile()
+        file.text = cloudinaryUrl
+
+        println("Test sub-account created successfully!")
+    }
+}
+```
+
+### 2. Create New `publish.gradle` for Modules
+
+```gradle
+apply plugin: 'maven-publish'
+apply plugin: 'signing'
+
+// Simple module-level publishing for manual upload to Central Portal
+if (hasProperty("ossrhTokenPassword") || hasProperty("centralPassword")) {
+    
+    publishing {
+        publications {
+            mavenJava(MavenPublication) {
+                // Set coordinates from gradle.properties
+                groupId = project.ext.publishGroupId
+                artifactId = project.name
+                version = project.version
+                
+                // Include JAR artifacts and components for Java
+                from components.java
+                artifact sourcesJar
+                artifact javadocJar
+                
+                pom {
+                    name = getModuleName(project.name)
+                    packaging = 'jar'
+                    description = publishDescription
+                    url = githubUrl
+                    
+                    licenses {
+                        license {
+                            name = licenseName
+                            url = licenseUrl
+                        }
+                    }
+                    
+                    developers {
+                        developer {
+                            id = developerId
+                            name = developerName
+                            email = developerEmail
+                        }
+                    }
+                    
+                    scm {
+                        connection = scmConnection
+                        developerConnection = scmDeveloperConnection
+                        url = scmUrl
+                    }
+                }
+            }
+        }
+    }
+    
+    signing {
+        // Configure GPG signing
+        useGpgCmd()
+        sign publishing.publications.mavenJava
+    }
+}
+
+// Helper function to get proper module names
+def getModuleName(artifactId) {
+    switch(artifactId) {
+        case 'cloudinary-core':
+            return 'Cloudinary Core Library'
+        case 'cloudinary-http5':
+            return 'Cloudinary Apache HTTP 5 Library'
+        case 'cloudinary-taglib':
+            return 'Cloudinary Taglib Library'
+        case 'cloudinary-test-common':
+            return 'Cloudinary Test Common Library'
+        default:
+            return 'Cloudinary Java Library'
+    }
+}
+```
+
+### 3. Update Module `build.gradle` Files
+
+For each module (cloudinary-core, cloudinary-http5, cloudinary-taglib, cloudinary-test-common), replace the publishing section:
+
+```gradle
+plugins {
+    id 'java-library'
+    // Remove: id 'signing'
+    // Remove: id 'maven-publish' 
+    // Remove: id 'io.codearte.nexus-staging' version '0.21.1'
+}
+
+apply from: "../java_shared.gradle"
+apply from: "../publish.gradle"  // Apply our new simplified publishing
+
+// Remove the entire old publishing block with nexusStaging
+// The new publish.gradle handles everything
+```
+
+### 4. Update `gradle.properties`
+
+```properties
+# Update URLs to point to new system (for documentation)
+publishRepo=https://central.sonatype.com/
+snapshotRepo=https://central.sonatype.com/
+publishDescription=Cloudinary is a cloud service that offers a solution to a web application's entire image management pipeline. Upload images to the cloud. Automatically perform smart image resizing, cropping and conversion without installing any complex software. Integrate Facebook or Twitter profile image extraction in a snap, in any dimension and style to match your website's graphics requirements. Images are seamlessly delivered through a fast CDN, and much much more. This Java library allows to easily integrate with Cloudinary in Java applications.
+githubUrl=http://github.com/cloudinary/cloudinary_java
+scmConnection=scm:git:git://github.com/cloudinary/cloudinary_java.git
+scmDeveloperConnection=scm:git:git@github.com:cloudinary/cloudinary_java.git
+scmUrl=http://github.com/cloudinary/cloudinary_java
+licenseName=MIT
+licenseUrl=http://opensource.org/licenses/MIT
+developerId=cloudinary
+developerName=Cloudinary
+developerEmail=info@cloudinary.com
+
+# Update version for next release
+group=com.cloudinary
+version=2.3.2
+
+gnsp.disableApplyOnlyOnRootProjectEnforcement=true
+
+# see https://github.com/gradle/gradle/issues/11308
+systemProp.org.gradle.internal.publish.checksums.insecure=true
+```
+
+## 🚀 **Step-by-Step Publishing Process**
+
+### Step 1: Environment Setup
+
+```bash
+# Navigate to project
+cd /Users/adimizrahi/Development/Java/cloudinary_java
+
+# Verify Java version (should be Java 8+)
+java -version
+javac -version
+
+# Set GPG environment for batch signing
+export GPG_TTY=$(tty)
+```
+
+### Step 2: Clean and Build All Artifacts
+
+```bash
+# Clean previous builds and generate all artifacts
+./gradlew clean publishToMavenLocal
+```
+
+**Expected Output:** 
+- JAR files for each module (cloudinary-core, cloudinary-http5, cloudinary-taglib, cloudinary-test-common)
+- Sources JARs (`-sources.jar`)
+- Javadoc JARs (`-javadoc.jar`)  
+- POM files with correct XML structure
+- All artifacts signed with GPG (`.asc` files)
+
+### Step 3: Verify Artifacts Generated
+
+```bash
+# Check that all 4 modules have complete artifacts (should be 7 files each)
+for module in ~/.m2/repository/com/cloudinary/cloudinary-*; do
+    if [[ -d "$module" ]]; then
+        echo "--- $(basename $module) ---"
+        ls -1 $module/2.3.2/ 2>/dev/null | grep -E "\.(jar|pom|asc)$" | wc -l
+    fi
+done
+```
+
+**Expected:** Each module should show `7` files:
+- `cloudinary-module-2.3.2.jar` + `.asc`
+- `cloudinary-module-2.3.2-sources.jar` + `.asc` 
+- `cloudinary-module-2.3.2-javadoc.jar` + `.asc`
+- `cloudinary-module-2.3.2.pom` + `.asc`
+
+### Step 4: Verify POM Files Are Valid
+
+```bash
+# Check that POM files have proper metadata
+for pom in ~/.m2/repository/com/cloudinary/cloudinary-*/2.3.2/*.pom; do
+    if [[ -f "$pom" ]]; then
+        echo "--- $(basename $pom) ---"
+        echo "Name tags: $(grep -c "<name>" "$pom")"
+        echo "Description: $(grep -c "<description>" "$pom")"
+        echo "License: $(grep -c "<license>" "$pom")"
+        echo "Developer: $(grep -c "<developer>" "$pom")"
+        echo "SCM: $(grep -c "<scm>" "$pom")"
+    fi
+done
+```
+
+**Expected:** Each POM should have all required metadata elements.
+
+### Step 5: Generate Additional Checksums
+
+```bash
+cd ~/.m2/repository
+
+# Generate MD5 and SHA1 checksums for all artifacts (Central Portal requires these)
+find com/cloudinary/cloudinary-* -name "*.jar" -o -name "*.pom" | while read file; do
+    if [[ -f "$file" ]]; then
+        echo "Processing $file"
+        md5sum "$file" | awk '{print $1}' > "$file.md5"
+        sha1sum "$file" | awk '{print $1}' > "$file.sha1"
+    fi
+done
+```
+
+### Step 6: Verify Complete File Set
+
+```bash
+cd ~/.m2/repository
+
+echo "=== FINAL FILE COUNT CHECK ==="
+echo "JAR/POM files:" && find com/cloudinary/cloudinary-* -name "*.jar" -o -name "*.pom" | wc -l
+echo "GPG signatures:" && find com/cloudinary/cloudinary-* -name "*.asc" | wc -l
+echo "MD5 checksums:" && find com/cloudinary/cloudinary-* -name "*.md5" | wc -l  
+echo "SHA1 checksums:" && find com/cloudinary/cloudinary-* -name "*.sha1" | wc -l
+```
+
+**Expected File Count:**
+- 4 modules × 4 artifacts each = **16 original files**
+- **16 GPG signatures** (`.asc`)
+- **16 MD5 checksums** (`.md5`)
+- **16 SHA1 checksums** (`.sha1`)
+- **Total: 64 files**
+
+### Step 7: Create Final Bundle
+
+```bash
+cd ~/.m2/repository
+
+# Create the complete bundle for Central Portal upload
+BUNDLE_NAME="cloudinary-java-$(grep '^version=' ~/Development/Java/cloudinary_java/gradle.properties | cut -d'=' -f2)-bundle-COMPLETE.tar.gz"
+
+tar -czf ~/"$BUNDLE_NAME" \
+$(find com/cloudinary/cloudinary-* \
+  -name "*.pom" -o -name "*.jar" \
+  -o -name "*.md5" -o -name "*.sha1" -o -name "*.asc" | \
+  grep -v maven-metadata | sort)
+```
+
+### Step 8: Verify Final Bundle
+
+```bash
+cd ~/
+
+# Check bundle size and contents
+ls -lh cloudinary-java-*-bundle-COMPLETE.tar.gz
+echo "--- File count ---"
+tar -tzf cloudinary-java-*-bundle-COMPLETE.tar.gz | wc -l
+echo "--- Sample contents ---" 
+tar -tzf cloudinary-java-*-bundle-COMPLETE.tar.gz | head -16
+echo "--- Module breakdown ---"
+tar -tzf cloudinary-java-*-bundle-COMPLETE.tar.gz | grep -E "(core|http5|taglib|test-common)" | cut -d'/' -f3 | sort | uniq -c
+```
+
+**Expected:**
+- **Size:** ~1-2MB (smaller than Android due to fewer dependencies)
+- **Files:** 64 total
+- **Modules:** 4 modules with 16 files each
+- **Contents:** Each module should have JARs, POMs, and all checksums/signatures
+
+## 📤 **Upload to Central Portal**
+
+### Manual Upload Process
+
+1. **Login:** Go to https://central.sonatype.com/
+2. **Credentials:** Use `centralUsername` and `centralPassword`
+3. **Upload:** Navigate to "Upload Component" or "Publish"
+4. **Bundle:** Select the `.tar.gz` file created in Step 7
+5. **Publishing Type:** Choose "USER_MANAGED"
+6. **Publication Name:** "Cloudinary Java SDK v{version}"
+
+### Expected Validation
+
+The Central Portal will validate:
+- ✅ **POM structure** (proper XML with required metadata)
+- ✅ **Artifact integrity** (MD5/SHA1 checksums match)
+- ✅ **Signatures** (GPG signatures valid)
+- ✅ **Completeness** (all required files present)
+- ✅ **Java compatibility** (JAR files are valid)
+
+## 🛠 **Troubleshooting**
+
+### Common Issues & Solutions
+
+1. **GPG Signing Issues:**
+   - **Cause:** TTY or batch mode problems
+   - **Solution:** `export GPG_TTY=$(tty)` and use `--batch --yes` flags
+   - **Alternative:** Use `signing { useGpgCmd() }` in Gradle
+
+2. **Missing Dependencies in POM:**
+   - **Cause:** Gradle not including transitive dependencies
+   - **Solution:** Verify `from components.java` includes dependencies
+   - **Check:** Examine generated POM files for `<dependencies>` section
+
+3. **Version Conflicts:**
+   - **Cause:** Old artifacts in local repository
+   - **Solution:** `./gradlew clean` and delete `~/.m2/repository/com/cloudinary/`
+
+4. **Module Configuration Issues:**
+   - **Cause:** Inconsistent `build.gradle` files between modules
+   - **Solution:** Ensure all modules apply `publish.gradle` consistently
+
+5. **Bundle Upload Failures:**
+   - **Cause:** Missing or corrupted files in bundle
+   - **Solution:** Verify all 64 files present and re-create bundle
+
+## 📋 **Module-Specific Information**
+
+### Cloudinary Core (`cloudinary-core`)
+- **Artifact ID:** `cloudinary-core`
+- **Description:** Core Cloudinary functionality
+- **Dependencies:** Minimal (mostly standard Java libraries)
+
+### Cloudinary HTTP5 (`cloudinary-http5`)
+- **Artifact ID:** `cloudinary-http5`
+- **Description:** Apache HTTP Client 5 implementation
+- **Dependencies:** `cloudinary-core`, Apache HTTP Components
+
+### Cloudinary Taglib (`cloudinary-taglib`)
+- **Artifact ID:** `cloudinary-taglib`
+- **Description:** JSP Taglib for Cloudinary
+- **Dependencies:** `cloudinary-core`, Servlet API
+
+### Cloudinary Test Common (`cloudinary-test-common`)
+- **Artifact ID:** `cloudinary-test-common`  
+- **Description:** Shared test utilities
+- **Dependencies:** `cloudinary-core`, JUnit, test frameworks
+
+## 📝 **Version Update Checklist**
+
+For publishing a new version:
+
+- [ ] Update `version` in `gradle.properties`
+- [ ] Update this guide with new version number
+- [ ] Run complete publishing process (Steps 1-8)
+- [ ] Verify all 64 files in final bundle (4 modules × 16 files)
+- [ ] Upload to Central Portal
+- [ ] Verify publication appears on Maven Central
+- [ ] Update GitHub releases and tags
+- [ ] Test artifacts can be consumed by dependent projects
+
+## 🔗 **References**
+
+- **Central Portal:** https://central.sonatype.com/
+- **Migration Guide:** https://central.sonatype.org/publish/publish-guide/
+- **Gradle Publishing:** https://docs.gradle.org/current/userguide/publishing_maven.html
+
+---
+
+**Last Updated:** [Current Date]  
+**Tested Version:** 2.3.2  
+**Success Rate:** ✅ To be tested with this process 
+
+## 🚨 **Key Differences from Android SDK**
+
+1. **No AAR files** - Uses JAR files instead
+2. **Java components** - Uses `components.java` instead of `components.release`
+3. **Simpler setup** - No Android-specific build tools required
+4. **Standard Maven structure** - Follows typical Java library patterns
+5. **Fewer files per module** - 16 files per module vs 24 for Android modules
diff --git a/README.md b/README.md
index 4e44ba97..1b28b43b 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ For the complete documentation, see the [Java SDK Guide](https://cloudinary.com/
 | SDK Version    | Java 6+ | Java 8 |
 |----------------|---------|--------|
 | 1.1.0 - 1.39.0 | V       |        |
-| 2.0.0          |         | V      |
+| 2.0.0+         |         | V      |
 
   
 
@@ -39,13 +39,10 @@ The cloudinary_java library is available in [Maven Central](https://mvnrepositor
 <dependency>
     <groupId>com.cloudinary</groupId>
     <artifactId>cloudinary-http45</artifactId>
-    <version>2.0.0</version>
+    <version>2.3.1</version>
 </dependency>
 ```
 
-Alternatively, download cloudinary_java from [here](https://repo1.maven.org/maven2/com/cloudinary/cloudinary-core/1.30.0/cloudinary-core-1.30.0.jar) and [here](https://repo1.maven.org/maven2/com/cloudinary/cloudinary-http44/1.30.0/cloudinary-http44-1.30.0.jar)
-and see [build.gradle](https://github.com/cloudinary/cloudinary_java/blob/master/cloudinary-http44/build.gradle) for library dependencies.
-
 ## Usage
 ### Setup
 
diff --git a/build.gradle b/build.gradle
index 5b9d6f04..ae30f0db 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,30 +1,18 @@
 import groovy.json.JsonSlurper
 
 plugins {
-    id 'io.github.gradle-nexus.publish-plugin' version '1.0.0'
+    id 'maven-publish'
+    // Removed old nexus plugin - we'll create bundles manually for Central Portal
 }
 
 allprojects {
-
     repositories {
         mavenCentral()
     }
-
     project.ext.set("publishGroupId", group)
 }
 
-nexusPublishing {
-    transitionCheckOptions {
-        maxRetries.set(150)
-        delayBetween.set(Duration.ofSeconds(5))
-    }
-    repositories {
-        sonatype {
-            username = project.hasProperty("ossrhToken") ? project.ext["ossrhToken"] : ""
-            password = project.hasProperty("ossrhTokenPassword") ? project.ext["ossrhTokenPassword"] : ""
-        }
-    }
-}
+// Removed nexusPublishing block - we'll create bundles manually for Central Portal upload
 
 tasks.create('createTestSubAccount') {
     doFirst {
diff --git a/cloudinary-core/build.gradle b/cloudinary-core/build.gradle
index 01ac348b..67379690 100644
--- a/cloudinary-core/build.gradle
+++ b/cloudinary-core/build.gradle
@@ -1,8 +1,5 @@
 plugins {
     id 'java-library'
-    id 'signing'
-    id 'maven-publish'
-    id 'io.codearte.nexus-staging' version '0.21.1'
 }
 
 task ciTest( type: Test )
@@ -14,88 +11,6 @@ dependencies {
 }
 
 apply from: "../java_shared.gradle"
+apply from: "../publish.gradle"
 
-if (hasProperty("ossrhPassword")) {
-    signing {
-        sign configurations.archives
-    }
-
-
-    nexusStaging {
-        packageGroup = group
-        username = project.hasProperty("ossrhToken") ? project.ext["ossrhToken"] : ""
-        password = project.hasProperty("ossrhTokenPassword") ? project.ext["ossrhTokenPassword"] : ""
-    }
-
-    publishing {
-        publications {
-            mavenJava(MavenPublication) {
-                from components.java
-                artifact sourcesJar
-                artifact javadocJar
-                pom {
-                    name = 'Cloudinary Core Library'
-                    packaging = 'jar'
-                    groupId = publishGroupId
-                    artifactId = 'cloudinary-core'
-                    description = publishDescription
-                    url = githubUrl
-                    licenses {
-                        license {
-                            name = licenseName
-                            url = licenseUrl
-                        }
-                    }
-
-                    developers {
-                        developer {
-                            id = developerId
-                            name = developerName
-                            email = developerEmail
-                        }
-                    }
-                    scm {
-                        connection = scmConnection
-                        developerConnection = scmDeveloperConnection
-                        url = scmUrl
-                    }
-                }
-
-                pom.withXml {
-                    def pomFile = file("${project.buildDir}/generated-pom.xml")
-                    writeTo(pomFile)
-                    def pomAscFile = signing.sign(pomFile).signatureFiles[0]
-                    artifact(pomAscFile) {
-                        classifier = null
-                        extension = 'pom.asc'
-                    }
-                }
-
-                // create the signed artifacts
-                project.tasks.signArchives.signatureFiles.each {
-                    artifact(it) {
-                        def matcher = it.file =~ /-(sources|javadoc)\.jar\.asc$/
-                        if (matcher.find()) {
-                            classifier = matcher.group(1)
-                        } else {
-                            classifier = null
-                        }
-                        extension = 'jar.asc'
-                    }
-                }
-            }
-        }
-
-        model {
-            tasks.generatePomFileForMavenJavaPublication {
-                destination = file("$buildDir/generated-pom.xml")
-            }
-            tasks.publishMavenJavaPublicationToMavenLocal {
-                dependsOn project.tasks.signArchives
-            }
-            tasks.publishMavenJavaPublicationToSonatypeRepository {
-                dependsOn project.tasks.signArchives
-            }
-        }
-    }
-}
\ No newline at end of file
+// Publishing configuration moved to ../publish.gradle
\ No newline at end of file
diff --git a/cloudinary-core/src/main/java/com/cloudinary/Api.java b/cloudinary-core/src/main/java/com/cloudinary/Api.java
index 9dbacde9..c84be0d6 100644
--- a/cloudinary-core/src/main/java/com/cloudinary/Api.java
+++ b/cloudinary-core/src/main/java/com/cloudinary/Api.java
@@ -162,7 +162,7 @@ public ApiResponse resourceByAssetID(String assetId, Map options) throws Excepti
         if(options.get("fields") != null) {
             options.put("fields", StringUtils.join(ObjectUtils.asArray(options.get("fields")), ","));
         }
-        Map params = ObjectUtils.only(options, "tags", "context", "moderations", "fields");
+        Map params = buildResourceDetailParams(options);
         ApiResponse response = callApi(HttpMethod.GET, Arrays.asList("resources", assetId), params, options);
         return response;
     }
@@ -209,15 +209,19 @@ public ApiResponse resource(String public_id, Map options) throws Exception {
         if (options == null) options = ObjectUtils.emptyMap();
         String resourceType = ObjectUtils.asString(options.get("resource_type"), "image");
         String type = ObjectUtils.asString(options.get("type"), "upload");
+        Map params = buildResourceDetailParams(options);
 
-        ApiResponse response = callApi(HttpMethod.GET, Arrays.asList("resources", resourceType, type, public_id),
-                ObjectUtils.only(options, "exif", "colors", "faces", "coordinates",
-                        "image_metadata", "pages", "phash", "max_results", "quality_analysis", "cinemagraph_analysis",
-                        "accessibility_analysis", "versions", "media_metadata", "derived_next_cursor"), options);
+        ApiResponse response = callApi(HttpMethod.GET, Arrays.asList("resources", resourceType, type, public_id), params, options);
 
         return response;
     }
 
+    private Map buildResourceDetailParams(Map options) {
+        return ObjectUtils.only(options, "exif", "colors", "faces", "coordinates",
+                        "image_metadata", "pages", "phash", "max_results", "quality_analysis", "cinemagraph_analysis",
+                        "accessibility_analysis", "versions", "media_metadata", "derived_next_cursor");
+    }
+
     public ApiResponse update(String public_id, Map options) throws Exception {
         if (options == null) options = ObjectUtils.emptyMap();
         String resourceType = ObjectUtils.asString(options.get("resource_type"), "image");
@@ -240,6 +244,13 @@ public ApiResponse deleteResources(Iterable<String> publicIds, Map options) thro
         return callApi(HttpMethod.DELETE, Arrays.asList("resources", resourceType, type), params, options);
     }
 
+    public ApiResponse deleteResourcesByAssetIds(Iterable<String> assetIds, Map options) throws Exception {
+        if (options == null) options = ObjectUtils.emptyMap();
+        Map params = ObjectUtils.only(options, "keep_original", "invalidate", "next_cursor", "transformations");
+        params.put("asset_ids", assetIds);
+        return callApi(HttpMethod.DELETE, Arrays.asList("resources"), params, options);
+    }
+
     public ApiResponse deleteDerivedByTransformation(Iterable<String> publicIds, List<Transformation> transformations, Map options) throws Exception {
         if (options == null) options = ObjectUtils.emptyMap();
         String resourceType = ObjectUtils.asString(options.get("resource_type"), "image");
@@ -338,7 +349,7 @@ public ApiResponse updateUploadPreset(String name, Map options) throws Exception
         if (options == null) options = ObjectUtils.emptyMap();
         Map params = Util.buildUploadParams(options);
         Util.clearEmpty(params);
-        params.putAll(ObjectUtils.only(options, "unsigned", "disallow_public_id", "live"));
+        params.putAll(ObjectUtils.only(options, "unsigned", "disallow_public_id"));
         return callApi(HttpMethod.PUT, Arrays.asList("upload_presets", name), params, options);
     }
 
@@ -346,7 +357,7 @@ public ApiResponse createUploadPreset(Map options) throws Exception {
         if (options == null) options = ObjectUtils.emptyMap();
         Map params = Util.buildUploadParams(options);
         Util.clearEmpty(params);
-        params.putAll(ObjectUtils.only(options, "name", "unsigned", "disallow_public_id", "live"));
+        params.putAll(ObjectUtils.only(options, "name", "unsigned", "disallow_public_id"));
         return callApi(HttpMethod.POST, Arrays.asList("upload_presets"), params, options);
     }
 
@@ -386,6 +397,14 @@ public ApiResponse restore(Iterable<String> publicIds, Map options) throws Excep
         return response;
     }
 
+    public ApiResponse restoreByAssetIds(Iterable<String> assetIds, Map options) throws Exception {
+        if (options == null)
+            options = ObjectUtils.emptyMap();
+        Map params = new HashMap<String, Object>();
+        params.put("asset_ids", assetIds);
+        return callApi(HttpMethod.POST, Arrays.asList("resources", "restore"), params, options);
+    }
+
     public ApiResponse uploadMappings(Map options) throws Exception {
         if (options == null)
             options = ObjectUtils.emptyMap();
@@ -645,8 +664,10 @@ public ApiResponse updateResourcesAccessModeByTag(String accessMode, String tag,
      * @throws Exception When the folder isn't empty or doesn't exist.
      */
     public ApiResponse deleteFolder(String folder, Map options) throws Exception {
+        if (options == null || options.isEmpty()) options = ObjectUtils.asMap();
         List<String> uri = Arrays.asList("folders", folder);
-        return callApi(HttpMethod.DELETE, uri, Collections.<String, Object>emptyMap(), options);
+        Map params = ObjectUtils.only(options, "skip_backup");
+        return callApi(HttpMethod.DELETE, uri, params, options);
     }
 
     /**
diff --git a/cloudinary-core/src/main/java/com/cloudinary/AuthToken.java b/cloudinary-core/src/main/java/com/cloudinary/AuthToken.java
index aa8cf213..a5114dd3 100644
--- a/cloudinary-core/src/main/java/com/cloudinary/AuthToken.java
+++ b/cloudinary-core/src/main/java/com/cloudinary/AuthToken.java
@@ -5,13 +5,10 @@
 
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
 import java.nio.charset.Charset;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
 import java.util.*;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 /**
diff --git a/cloudinary-core/src/main/java/com/cloudinary/Cloudinary.java b/cloudinary-core/src/main/java/com/cloudinary/Cloudinary.java
index 9bdbe122..1e69c4fe 100644
--- a/cloudinary-core/src/main/java/com/cloudinary/Cloudinary.java
+++ b/cloudinary-core/src/main/java/com/cloudinary/Cloudinary.java
@@ -20,7 +20,7 @@
 @SuppressWarnings({"rawtypes", "unchecked"})
 public class Cloudinary {
 
-    private static List<String> UPLOAD_STRATEGIES = new ArrayList<String>(Arrays.asList(
+    public static List<String> UPLOAD_STRATEGIES = new ArrayList<String>(Arrays.asList(
             "com.cloudinary.android.UploaderStrategy",
             "com.cloudinary.http5.UploaderStrategy"));
     public static List<String> API_STRATEGIES = new ArrayList<String>(Arrays.asList(
@@ -32,7 +32,7 @@ public class Cloudinary {
     public final static String AKAMAI_SHARED_CDN = "res.cloudinary.com";
     public final static String SHARED_CDN = AKAMAI_SHARED_CDN;
 
-    public final static String VERSION = "2.0.0";
+    public final static String VERSION = "2.3.1";
     static String USER_AGENT_PREFIX = "CloudinaryJava";
     public final static String USER_AGENT_JAVA_VERSION = "(Java " + System.getProperty("java.version") + ")";
 
@@ -59,14 +59,14 @@ public SearchFolders searchFolders() {
 
     public static void registerUploaderStrategy(String className) {
         if (!UPLOAD_STRATEGIES.contains(className)) {
-            UPLOAD_STRATEGIES.add(className);
+            UPLOAD_STRATEGIES.add(0, className);
         }
 
     }
 
     public static void registerAPIStrategy(String className) {
         if (!API_STRATEGIES.contains(className)) {
-            API_STRATEGIES.add(className);
+            API_STRATEGIES.add(0, className);
         }
     }
 
@@ -85,22 +85,21 @@ private void loadStrategies() {
     }
 
     public Cloudinary(Map config) {
-        this.config = new Configuration(config);
-        loadStrategies();
+        this(new Configuration(config));
     }
 
     public Cloudinary(String cloudinaryUrl) {
-        this.config = Configuration.from(cloudinaryUrl);
-        loadStrategies();
+        this(Configuration.from(cloudinaryUrl));
     }
 
     public Cloudinary() {
-        String cloudinaryUrl = System.getProperty("CLOUDINARY_URL", System.getenv("CLOUDINARY_URL"));
-        if (cloudinaryUrl != null) {
-            this.config = Configuration.from(cloudinaryUrl);
-        } else {
-            this.config = new Configuration();
-        }
+        this(System.getProperty("CLOUDINARY_URL", System.getenv("CLOUDINARY_URL")) != null
+                ? Configuration.from(System.getProperty("CLOUDINARY_URL", System.getenv("CLOUDINARY_URL")))
+                : new Configuration());
+    }
+
+    public Cloudinary(Configuration config) {
+        this.config = config;
         loadStrategies();
     }
 
@@ -131,8 +130,8 @@ public String signedPreloadedImage(Map result) {
                 + (result.containsKey("format") ? "." + result.get("format") : "") + "#" + result.get("signature");
     }
 
-    public String apiSignRequest(Map<String, Object> paramsToSign, String apiSecret) {
-        return Util.produceSignature(paramsToSign, apiSecret, config.signatureAlgorithm);
+    public String apiSignRequest(Map<String, Object> paramsToSign, String apiSecret, int signatureVersion) {
+        return Util.produceSignature(paramsToSign, apiSecret, config.signatureAlgorithm, signatureVersion);
     }
 
     /**
@@ -207,7 +206,7 @@ public void signRequest(Map<String, Object> params, Map<String, Object> options)
         if (apiSecret == null)
             throw new IllegalArgumentException("Must supply api_secret");
         Util.clearEmpty(params);
-        params.put("signature", this.apiSignRequest(params, apiSecret));
+        params.put("signature", this.apiSignRequest(params, apiSecret, this.config.signatureVersion));
         params.put("api_key", apiKey);
     }
 
diff --git a/cloudinary-core/src/main/java/com/cloudinary/Configuration.java b/cloudinary-core/src/main/java/com/cloudinary/Configuration.java
index 07280d89..7586ae46 100644
--- a/cloudinary-core/src/main/java/com/cloudinary/Configuration.java
+++ b/cloudinary-core/src/main/java/com/cloudinary/Configuration.java
@@ -21,6 +21,7 @@ public class Configuration {
     public final static String USER_AGENT = "cld-android-" + VERSION;
     public static final boolean DEFAULT_IS_LONG_SIGNATURE = false;
     public static final SignatureAlgorithm DEFAULT_SIGNATURE_ALGORITHM = SignatureAlgorithm.SHA1;
+    public static final int DEFAULT_SIGNATURE_VERSION = 2;
 
     private static final String CONFIG_PROP_SIGNATURE_ALGORITHM = "signature_algorithm";
 
@@ -48,6 +49,7 @@ public class Configuration {
     public boolean forceVersion = true;
     public boolean longUrlSignature = DEFAULT_IS_LONG_SIGNATURE;
     public SignatureAlgorithm signatureAlgorithm = DEFAULT_SIGNATURE_ALGORITHM;
+    public int signatureVersion = DEFAULT_SIGNATURE_VERSION;
     public String oauthToken = null;
     public Boolean analytics;
     public Configuration() {
@@ -75,6 +77,7 @@ private Configuration(
             boolean forceVersion,
             boolean longUrlSignature,
             SignatureAlgorithm signatureAlgorithm,
+            int signatureVersion,
             String oauthToken,
             boolean analytics) {
         this.cloudName = cloudName;
@@ -98,6 +101,7 @@ private Configuration(
         this.forceVersion = forceVersion;
         this.longUrlSignature = longUrlSignature;
         this.signatureAlgorithm = signatureAlgorithm;
+        this.signatureVersion = signatureVersion;
         this.oauthToken = oauthToken;
         this.analytics = analytics;
     }
@@ -140,6 +144,7 @@ public void update(Map config) {
         }
         this.longUrlSignature = ObjectUtils.asBoolean(config.get("long_url_signature"), DEFAULT_IS_LONG_SIGNATURE);
         this.signatureAlgorithm = SignatureAlgorithm.valueOf(ObjectUtils.asString(config.get(CONFIG_PROP_SIGNATURE_ALGORITHM), DEFAULT_SIGNATURE_ALGORITHM.name()));
+        this.signatureVersion = ObjectUtils.asInteger(config.get("signature_version"), DEFAULT_SIGNATURE_VERSION);
         this.oauthToken = (String) config.get("oauth_token");
 
     }
@@ -173,6 +178,7 @@ public Map<String, Object> asMap() {
         map.put("properties", new HashMap<String,Object>(properties));
         map.put("long_url_signature", longUrlSignature);
         map.put(CONFIG_PROP_SIGNATURE_ALGORITHM, signatureAlgorithm.toString());
+        map.put("signature_version", signatureVersion);
         map.put("oauth_token", oauthToken);
         map.put("analytics", analytics);
         return map;
@@ -206,6 +212,7 @@ public Configuration(Configuration other) {
         this.properties.putAll(other.properties);
         this.longUrlSignature = other.longUrlSignature;
         this.signatureAlgorithm = other.signatureAlgorithm;
+        this.signatureVersion = other.signatureVersion;
         this.oauthToken = other.oauthToken;
         this.analytics = other.analytics;
     }
@@ -320,6 +327,7 @@ public static class Builder {
         private boolean forceVersion = true;
         private boolean longUrlSignature = DEFAULT_IS_LONG_SIGNATURE;
         private SignatureAlgorithm signatureAlgorithm = DEFAULT_SIGNATURE_ALGORITHM;
+        private int signatureVersion = DEFAULT_SIGNATURE_VERSION;
         private String oauthToken = null;
         private boolean analytics;
 
@@ -360,6 +368,7 @@ public Configuration build() {
                             forceVersion,
                             longUrlSignature,
                             signatureAlgorithm,
+                            signatureVersion,
                             oauthToken,
                             analytics);
             configuration.clientHints = clientHints;
@@ -500,6 +509,11 @@ public Builder setSignatureAlgorithm(SignatureAlgorithm signatureAlgorithm) {
             return this;
         }
 
+        public Builder setSignatureVersion(int signatureVersion) {
+            this.signatureVersion = signatureVersion;
+            return this;
+        }
+
         public Builder setOAuthToken(String oauthToken) {
             this.oauthToken = oauthToken;
             return this;
@@ -535,6 +549,7 @@ public Builder from(Configuration other) {
             this.forceVersion = other.forceVersion;
             this.longUrlSignature = other.longUrlSignature;
             this.signatureAlgorithm = other.signatureAlgorithm;
+            this.signatureVersion = other.signatureVersion;
             this.oauthToken = other.oauthToken;
             this.analytics = other.analytics;
             return this;
diff --git a/cloudinary-core/src/main/java/com/cloudinary/Search.java b/cloudinary-core/src/main/java/com/cloudinary/Search.java
index 2ba3ac8b..369830c6 100644
--- a/cloudinary-core/src/main/java/com/cloudinary/Search.java
+++ b/cloudinary-core/src/main/java/com/cloudinary/Search.java
@@ -6,7 +6,6 @@
 import com.cloudinary.utils.StringUtils;
 import org.cloudinary.json.JSONObject;
 
-import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
diff --git a/cloudinary-core/src/main/java/com/cloudinary/SmartUrlEncoder.java b/cloudinary-core/src/main/java/com/cloudinary/SmartUrlEncoder.java
index bcd8f654..2f20414f 100644
--- a/cloudinary-core/src/main/java/com/cloudinary/SmartUrlEncoder.java
+++ b/cloudinary-core/src/main/java/com/cloudinary/SmartUrlEncoder.java
@@ -3,7 +3,9 @@
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 
-public class SmartUrlEncoder {
+public final class SmartUrlEncoder {
+    private SmartUrlEncoder() {}
+
     public static String encode(String input) {
         try {
             return URLEncoder.encode(input, "UTF-8").replace("%2F", "/").replace("%3A", ":").replace("+", "%20");
diff --git a/cloudinary-core/src/main/java/com/cloudinary/Url.java b/cloudinary-core/src/main/java/com/cloudinary/Url.java
index 6517bd28..5365c996 100644
--- a/cloudinary-core/src/main/java/com/cloudinary/Url.java
+++ b/cloudinary-core/src/main/java/com/cloudinary/Url.java
@@ -13,7 +13,6 @@
 import java.util.regex.Pattern;
 import java.util.zip.CRC32;
 
-import com.cloudinary.utils.Analytics;
 import com.cloudinary.utils.Base64Coder;
 import com.cloudinary.utils.ObjectUtils;
 import com.cloudinary.utils.StringUtils;
diff --git a/cloudinary-core/src/main/java/com/cloudinary/Util.java b/cloudinary-core/src/main/java/com/cloudinary/Util.java
index c5fcb1f0..e4d6544d 100644
--- a/cloudinary-core/src/main/java/com/cloudinary/Util.java
+++ b/cloudinary-core/src/main/java/com/cloudinary/Util.java
@@ -8,7 +8,9 @@
 import java.security.NoSuchAlgorithmException;
 import java.util.*;
 
-public class Util {
+public final class Util {
+    private Util() {}
+
     static final String[] BOOLEAN_UPLOAD_OPTIONS = new String[]{"backup", "exif", "faces", "colors", "image_metadata", "use_filename", "unique_filename",
             "eager_async", "invalidate", "discard_original_filename", "overwrite", "phash", "return_delete_token", "async", "quality_analysis", "cinemagraph_analysis",
             "accessibility_analysis", "use_filename_as_display_name", "use_asset_folder_as_public_id_prefix", "unique_display_name", "media_metadata", "visual_search",
@@ -73,6 +75,7 @@ public static final Map<String, Object> buildUploadParams(Map options) {
             params.put("similarity_search", (String) options.get("similarity_search"));
             params.put("auto_tagging", (String) options.get("auto_tagging"));
             params.put("access_control", (String) options.get("access_control"));
+            params.put("metadata", (String) options.get("metadata"));
         }
         return params;
     }
@@ -364,8 +367,8 @@ public static byte[] getUTF8Bytes(String string) {
      * @param apiSecret     secret value
      * @return hex-string representation of signature calculated based on provided parameters map and secret
      */
-    public static String produceSignature(Map<String, Object> paramsToSign, String apiSecret) {
-        return produceSignature(paramsToSign, apiSecret, SignatureAlgorithm.SHA1);
+    public static String produceSignature(Map<String, Object> paramsToSign, String apiSecret, int signatureVersion) {
+        return produceSignature(paramsToSign, apiSecret, SignatureAlgorithm.SHA1, signatureVersion);
     }
 
     /**
@@ -382,22 +385,42 @@ public static String produceSignature(Map<String, Object> paramsToSign, String a
      * @param signatureAlgorithm type of hashing algorithm to use for calculation of HMAC
      * @return hex-string representation of signature calculated based on provided parameters map and secret
      */
-    public static String produceSignature(Map<String, Object> paramsToSign, String apiSecret, SignatureAlgorithm signatureAlgorithm) {
-        Collection<String> params = new ArrayList<String>();
-        for (Map.Entry<String, Object> param : new TreeMap<String, Object>(paramsToSign).entrySet()) {
-            if (param.getValue() instanceof Collection) {
-                params.add(param.getKey() + "=" + StringUtils.join((Collection) param.getValue(), ","));
-            } else if (param.getValue() instanceof Object[]) {
-                params.add(param.getKey() + "=" + StringUtils.join((Object[]) param.getValue(), ","));
-            } else {
-                if (StringUtils.isNotBlank(param.getValue())) {
-                    params.add(param.getKey() + "=" + param.getValue().toString());
-                }
+    public static String produceSignature(Map<String, Object> paramsToSign, String apiSecret, SignatureAlgorithm signatureAlgorithm, int signatureVersion) {
+        Collection<String> flattenedParams = flattenAndSanitizeParams(paramsToSign, signatureVersion);
+        String toSign = StringUtils.join(flattenedParams, "&") + apiSecret;
+        byte[] hash = Util.hash(toSign, signatureAlgorithm);
+        return StringUtils.encodeHexString(hash);
+    }
+
+    private static Collection<String> flattenAndSanitizeParams(Map<String, Object> paramsToSign, int signatureVersion) {
+        Collection<String> params = new ArrayList<>();
+
+        for (Map.Entry<String, Object> entry : new TreeMap<>(paramsToSign).entrySet()) {
+            Object value = entry.getValue();
+            String rawValue = null;
+
+            if (value instanceof Collection) {
+                rawValue = StringUtils.join((Collection) value, ",");
+            } else if (value instanceof Object[]) {
+                rawValue = StringUtils.join((Object[]) value, ",");
+            } else if (value != null && StringUtils.isNotBlank(value.toString())) {
+                rawValue = value.toString();
+            }
+
+            if (rawValue != null) {
+                String sanitizedValue = (signatureVersion == 2)
+                        ? escapeAmpersand(rawValue)
+                        : rawValue;
+
+                params.add(entry.getKey() + "=" + sanitizedValue);
             }
         }
-        String to_sign = StringUtils.join(params, "&");
-        byte[] hash = Util.hash(to_sign + apiSecret, signatureAlgorithm);
-        return StringUtils.encodeHexString(hash);
+
+        return params;
+    }
+
+    private static String escapeAmpersand(String input) {
+        return input.replace("&", "%26");
     }
 
     /**
diff --git a/cloudinary-core/src/main/java/com/cloudinary/api/signing/ApiResponseSignatureVerifier.java b/cloudinary-core/src/main/java/com/cloudinary/api/signing/ApiResponseSignatureVerifier.java
index 1dbae00d..f6d7da67 100644
--- a/cloudinary-core/src/main/java/com/cloudinary/api/signing/ApiResponseSignatureVerifier.java
+++ b/cloudinary-core/src/main/java/com/cloudinary/api/signing/ApiResponseSignatureVerifier.java
@@ -60,6 +60,6 @@ public ApiResponseSignatureVerifier(String secretKey, SignatureAlgorithm signatu
     public boolean verifySignature(String publicId, String version, String signature) {
         return Util.produceSignature(ObjectUtils.asMap(
                 "public_id", emptyIfNull(publicId),
-                "version", emptyIfNull(version)), secretKey, signatureAlgorithm).equals(signature);
+                "version", emptyIfNull(version)), secretKey, signatureAlgorithm, 1).equals(signature);
     }
 }
diff --git a/cloudinary-core/src/main/java/com/cloudinary/metadata/MetadataField.java b/cloudinary-core/src/main/java/com/cloudinary/metadata/MetadataField.java
index 4f3bdf33..7fe81c43 100644
--- a/cloudinary-core/src/main/java/com/cloudinary/metadata/MetadataField.java
+++ b/cloudinary-core/src/main/java/com/cloudinary/metadata/MetadataField.java
@@ -18,6 +18,7 @@ public class MetadataField<T> extends JSONObject {
     public static final String VALIDATION = "validation";
     public static final String RESTRICTIONS = "restrictions";
     public static final String DEFAULT_DISABLED = "default_disabled";
+    public static final String ALLOW_DYNAMIC_LIST_VALUES = "allow_dynamic_list_values";
 
     public MetadataField(MetadataFieldType type) {
         put(TYPE, type.toString());
@@ -148,4 +149,10 @@ public void setRestrictions(Restrictions restrictions) {
     public void setDefaultDisabled(Boolean disabled) {
         put(DEFAULT_DISABLED, disabled);
     }
+
+    /**
+     * Set the value indicating whether the dynamic list values should allow
+     * @param allowDynamicListValues The value to set.
+     */
+    public void setAllowDynamicListValues(Boolean allowDynamicListValues) {put(ALLOW_DYNAMIC_LIST_VALUES, allowDynamicListValues);}
 }
\ No newline at end of file
diff --git a/cloudinary-core/src/main/java/com/cloudinary/metadata/MetadataRule.java b/cloudinary-core/src/main/java/com/cloudinary/metadata/MetadataRule.java
index 65edbed4..4df82ded 100644
--- a/cloudinary-core/src/main/java/com/cloudinary/metadata/MetadataRule.java
+++ b/cloudinary-core/src/main/java/com/cloudinary/metadata/MetadataRule.java
@@ -2,7 +2,6 @@
 
 import com.cloudinary.utils.ObjectUtils;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/cloudinary-core/src/main/java/com/cloudinary/strategies/AbstractApiStrategy.java b/cloudinary-core/src/main/java/com/cloudinary/strategies/AbstractApiStrategy.java
index 8878bf2c..0342f5bc 100644
--- a/cloudinary-core/src/main/java/com/cloudinary/strategies/AbstractApiStrategy.java
+++ b/cloudinary-core/src/main/java/com/cloudinary/strategies/AbstractApiStrategy.java
@@ -2,12 +2,7 @@
 
 import com.cloudinary.Api;
 import com.cloudinary.Api.HttpMethod;
-import com.cloudinary.SmartUrlEncoder;
 import com.cloudinary.api.ApiResponse;
-import com.cloudinary.utils.Base64Coder;
-import com.cloudinary.utils.ObjectUtils;
-import com.cloudinary.utils.StringUtils;
-import java.util.Arrays;
 import java.util.Map;
 
 
diff --git a/cloudinary-core/src/main/java/com/cloudinary/utils/Base64Map.java b/cloudinary-core/src/main/java/com/cloudinary/utils/Base64Map.java
index d5e755f9..f9948974 100644
--- a/cloudinary-core/src/main/java/com/cloudinary/utils/Base64Map.java
+++ b/cloudinary-core/src/main/java/com/cloudinary/utils/Base64Map.java
@@ -3,7 +3,9 @@
 import java.util.HashMap;
 import java.util.Map;
 
-public class Base64Map {
+public final class Base64Map {
+    private Base64Map() {}
+
     public static Map<String, String> values;
 
     static {
diff --git a/cloudinary-core/src/main/java/com/cloudinary/utils/HtmlEscape.java b/cloudinary-core/src/main/java/com/cloudinary/utils/HtmlEscape.java
index 2be36583..39ba901e 100644
--- a/cloudinary-core/src/main/java/com/cloudinary/utils/HtmlEscape.java
+++ b/cloudinary-core/src/main/java/com/cloudinary/utils/HtmlEscape.java
@@ -16,7 +16,8 @@
  *         this program code.
  */
 
-public class HtmlEscape {
+public final class HtmlEscape {
+    private HtmlEscape() {}
 
     private static char[] hex = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
 
diff --git a/cloudinary-core/src/main/java/com/cloudinary/utils/ObjectUtils.java b/cloudinary-core/src/main/java/com/cloudinary/utils/ObjectUtils.java
index 437c04db..2dc607f6 100644
--- a/cloudinary-core/src/main/java/com/cloudinary/utils/ObjectUtils.java
+++ b/cloudinary-core/src/main/java/com/cloudinary/utils/ObjectUtils.java
@@ -11,7 +11,9 @@
 import java.util.*;
 
 
-public class ObjectUtils {
+public final class ObjectUtils {
+    private ObjectUtils() {}
+
     /**
      * Formats a Date as an ISO-8601 string representation.
      * @param date Date to format
diff --git a/cloudinary-core/src/main/java/com/cloudinary/utils/StringUtils.java b/cloudinary-core/src/main/java/com/cloudinary/utils/StringUtils.java
index 0d25bacb..f8a21231 100644
--- a/cloudinary-core/src/main/java/com/cloudinary/utils/StringUtils.java
+++ b/cloudinary-core/src/main/java/com/cloudinary/utils/StringUtils.java
@@ -8,7 +8,9 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public class StringUtils {
+public final class StringUtils {
+    private StringUtils() {}
+
     public static final String EMPTY = "";
 
     /**
diff --git a/cloudinary-core/src/test/java/com/cloudinary/AuthTokenTest.java b/cloudinary-core/src/test/java/com/cloudinary/AuthTokenTest.java
index 468c43bb..49fd8d35 100644
--- a/cloudinary-core/src/test/java/com/cloudinary/AuthTokenTest.java
+++ b/cloudinary-core/src/test/java/com/cloudinary/AuthTokenTest.java
@@ -1,6 +1,5 @@
 package com.cloudinary;
 
-import com.cloudinary.utils.Analytics;
 import com.cloudinary.utils.ObjectUtils;
 
 import org.hamcrest.CoreMatchers;
@@ -11,7 +10,6 @@
 import org.junit.Test;
 import org.junit.rules.TestName;
 
-import java.io.UnsupportedEncodingException;
 import java.util.Calendar;
 import java.util.Collections;
 import java.util.Map;
diff --git a/cloudinary-core/src/test/java/com/cloudinary/UtilTest.java b/cloudinary-core/src/test/java/com/cloudinary/UtilTest.java
index 6794e277..e9fb9e9b 100644
--- a/cloudinary-core/src/test/java/com/cloudinary/UtilTest.java
+++ b/cloudinary-core/src/test/java/com/cloudinary/UtilTest.java
@@ -159,4 +159,21 @@ public void testRemoveStartingChars(){
         assertEquals("bcde", StringUtils.removeStartingChars("aaaaaabcde", 'a'));
         assertEquals("bcdeaa", StringUtils.removeStartingChars("aaaaaabcdeaa", 'a'));
     }
+
+    @Test
+    public void testBuildUploadParamsForwardsMetadataWhenSigned() {
+        String signatureKey = "signature";
+        String timestampKey = "timestamp";
+        String metadataKey = "metadata";
+
+        Map<String, Object> params = Util.buildUploadParams(
+            ObjectUtils.asMap(
+                signatureKey, "abc-signature",
+                timestampKey, "1782744652",
+                metadataKey, "delete_date=2026-07-06"
+            )
+        );
+
+        assertEquals("delete_date=2026-07-06", params.get(metadataKey));
+    }
 }
diff --git a/cloudinary-core/src/test/java/com/cloudinary/test/CloudinaryTest.java b/cloudinary-core/src/test/java/com/cloudinary/test/CloudinaryTest.java
index 9e436183..c40a3ea2 100644
--- a/cloudinary-core/src/test/java/com/cloudinary/test/CloudinaryTest.java
+++ b/cloudinary-core/src/test/java/com/cloudinary/test/CloudinaryTest.java
@@ -18,7 +18,6 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.lang.reflect.Type;
-import java.lang.reflect.ParameterizedType;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URLDecoder;
@@ -1439,14 +1438,14 @@ public void testCloudinaryUrlEmptyScheme() {
     @Test
     public void testApiSignRequestSHA1() {
         cloudinary.config.signatureAlgorithm = SignatureAlgorithm.SHA1;
-        String signature = cloudinary.apiSignRequest(ObjectUtils.asMap("cloud_name", "dn6ot3ged", "timestamp", 1568810420, "username", "user@cloudinary.com"), "hdcixPpR2iKERPwqvH6sHdK9cyac");
+        String signature = cloudinary.apiSignRequest(ObjectUtils.asMap("cloud_name", "dn6ot3ged", "timestamp", 1568810420, "username", "user@cloudinary.com"), "hdcixPpR2iKERPwqvH6sHdK9cyac", cloudinary.config.signatureVersion);
         assertEquals("14c00ba6d0dfdedbc86b316847d95b9e6cd46d94", signature);
     }
 
     @Test
     public void testApiSignRequestSHA256() {
         cloudinary.config.signatureAlgorithm = SignatureAlgorithm.SHA256;
-        String signature = cloudinary.apiSignRequest(ObjectUtils.asMap("cloud_name", "dn6ot3ged", "timestamp", 1568810420, "username", "user@cloudinary.com"), "hdcixPpR2iKERPwqvH6sHdK9cyac");
+        String signature = cloudinary.apiSignRequest(ObjectUtils.asMap("cloud_name", "dn6ot3ged", "timestamp", 1568810420, "username", "user@cloudinary.com"), "hdcixPpR2iKERPwqvH6sHdK9cyac", cloudinary.config.signatureVersion);
         assertEquals("45ddaa4fa01f0c2826f32f669d2e4514faf275fe6df053f1a150e7beae58a3bd", signature);
     }
 
@@ -1465,6 +1464,20 @@ public void testDownloadBackedupAsset() throws UnsupportedEncodingException, URI
         assertNotNull(params.get("timestamp"));
     }
 
+    @Test
+    public void testRegisterUploaderStrategy() {
+        String className = "myUploadStrategy";
+        Cloudinary.registerUploaderStrategy(className);
+        assertEquals(className, Cloudinary.UPLOAD_STRATEGIES.get(0));
+    }
+
+    @Test
+    public void testRegisterApiStrategy() {
+        String className = "myApiStrategy";
+        Cloudinary.registerAPIStrategy(className);
+        assertEquals(className, Cloudinary.API_STRATEGIES.get(0));
+    }
+
     private void assertFieldsEqual(Object a, Object b) throws IllegalAccessException {
         assertEquals("Two objects must be the same class", a.getClass(), b.getClass());
         Field[] fields = a.getClass().getFields();
diff --git a/cloudinary-http5/build.gradle b/cloudinary-http5/build.gradle
index b58b6c36..ceeab84e 100644
--- a/cloudinary-http5/build.gradle
+++ b/cloudinary-http5/build.gradle
@@ -1,11 +1,9 @@
 plugins {
     id 'java-library'
-    id 'signing'
-    id 'maven-publish'
-    id 'io.codearte.nexus-staging' version '0.21.1'
 }
 
 apply from: "../java_shared.gradle"
+apply from: "../publish.gradle"
 
 task ciTest( type: Test ) {
     useJUnit {
@@ -18,96 +16,13 @@ task ciTest( type: Test ) {
 
 dependencies {
     compile project(':cloudinary-core')
-    compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.1'
+    compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.18.0'
     api group: 'org.apache.httpcomponents.client5', name: 'httpclient5', version: '5.3.1'
-    api group: 'org.apache.httpcomponents.core5', name: 'httpcore5', version: '5.2.5'
+    api group: 'org.apache.httpcomponents.core5', name: 'httpcore5', version: '5.3.5'
     testCompile project(':cloudinary-test-common')
     testCompile group: 'org.hamcrest', name: 'java-hamcrest', version: '2.0.0.0'
     testCompile group: 'pl.pragmatists', name: 'JUnitParams', version: '1.0.5'
     testCompile group: 'junit', name: 'junit', version: '4.12'
 }
 
-if (hasProperty("ossrhPassword")) {
-
-    signing {
-        sign configurations.archives
-    }
-
-    nexusStaging {
-        packageGroup = group
-        username = project.hasProperty("ossrhToken") ? project.ext["ossrhToken"] : ""
-        password = project.hasProperty("ossrhTokenPassword") ? project.ext["ossrhTokenPassword"] : ""
-    }
-
-    publishing {
-        publications {
-            mavenJava(MavenPublication) {
-                from components.java
-                artifact sourcesJar
-                artifact javadocJar
-                pom {
-                    name = 'Cloudinary Apache HTTP 5 Library'
-                    packaging = 'jar'
-                    groupId = publishGroupId
-                    artifactId = 'cloudinary-http5'
-                    description = publishDescription
-                    url = githubUrl
-                    licenses {
-                        license {
-                            name = licenseName
-                            url = licenseUrl
-                        }
-                    }
-
-                    developers {
-                        developer {
-                            id = developerId
-                            name = developerName
-                            email = developerEmail
-                        }
-                    }
-                    scm {
-                        connection = scmConnection
-                        developerConnection = scmDeveloperConnection
-                        url = scmUrl
-                    }
-                }
-
-                pom.withXml {
-                    def pomFile = file("${project.buildDir}/generated-pom.xml")
-                    writeTo(pomFile)
-                    def pomAscFile = signing.sign(pomFile).signatureFiles[0]
-                    artifact(pomAscFile) {
-                        classifier = null
-                        extension = 'pom.asc'
-                    }
-                }
-
-                // create the signed artifacts
-                project.tasks.signArchives.signatureFiles.each {
-                    artifact(it) {
-                        def matcher = it.file =~ /-(sources|javadoc)\.jar\.asc$/
-                        if (matcher.find()) {
-                            classifier = matcher.group(1)
-                        } else {
-                            classifier = null
-                        }
-                        extension = 'jar.asc'
-                    }
-                }
-            }
-        }
-
-        model {
-            tasks.generatePomFileForMavenJavaPublication {
-                destination = file("$buildDir/generated-pom.xml")
-            }
-            tasks.publishMavenJavaPublicationToMavenLocal {
-                dependsOn project.tasks.signArchives
-            }
-            tasks.publishMavenJavaPublicationToSonatypeRepository {
-                dependsOn project.tasks.signArchives
-            }
-        }
-    }
-}
+// Publishing configuration moved to ../publish.gradle
diff --git a/cloudinary-http5/src/main/java/com/cloudinary/http5/ApiStrategy.java b/cloudinary-http5/src/main/java/com/cloudinary/http5/ApiStrategy.java
index 2852225d..9c0145e9 100644
--- a/cloudinary-http5/src/main/java/com/cloudinary/http5/ApiStrategy.java
+++ b/cloudinary-http5/src/main/java/com/cloudinary/http5/ApiStrategy.java
@@ -7,17 +7,21 @@
 import com.cloudinary.http5.api.Response;
 import com.cloudinary.strategies.AbstractApiStrategy;
 import com.cloudinary.utils.ObjectUtils;
-import com.cloudinary.utils.StringUtils;
 import org.apache.hc.client5.http.classic.methods.*;
+import org.apache.hc.client5.http.config.RequestConfig;
 import org.apache.hc.client5.http.entity.UrlEncodedFormEntity;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
+import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
 import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.client5.http.io.HttpClientConnectionManager;
 import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.NameValuePair;
 import org.apache.hc.core5.http.io.entity.EntityUtils;
 import org.apache.hc.core5.http.io.entity.StringEntity;
 import org.apache.hc.core5.net.URIBuilder;
+import org.apache.hc.core5.util.Timeout;
 import org.cloudinary.json.JSONException;
 import org.cloudinary.json.JSONObject;
 
@@ -25,7 +29,6 @@
 import java.lang.reflect.Constructor;
 import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -38,15 +41,42 @@ public class ApiStrategy extends AbstractApiStrategy {
 
     private CloseableHttpClient client;
 
-    @Override
     public void init(Api api) {
         super.init(api);
 
-        this.client = HttpClients.custom()
-                .setUserAgent(this.api.cloudinary.getUserAgent() + " ApacheHttpClient/" + APACHE_HTTP_CLIENT_VERSION)
+        HttpClientBuilder clientBuilder = HttpClients.custom();
+        clientBuilder.useSystemProperties().setUserAgent(this.api.cloudinary.getUserAgent() + " ApacheHttpClient/" + APACHE_HTTP_CLIENT_VERSION);
+
+        HttpClientConnectionManager connectionManager = (HttpClientConnectionManager) api.cloudinary.config.properties.get("connectionManager");
+        if (connectionManager != null) {
+            clientBuilder.setConnectionManager(connectionManager);
+        }
+
+        RequestConfig requestConfig = buildRequestConfig();
+
+        client = clientBuilder
+                .setDefaultRequestConfig(requestConfig)
                 .build();
     }
 
+    public RequestConfig buildRequestConfig() {
+        RequestConfig.Builder requestConfigBuilder = RequestConfig.custom();
+
+        if (api.cloudinary.config.proxyHost != null && api.cloudinary.config.proxyPort != 0) {
+            HttpHost proxy = new HttpHost(api.cloudinary.config.proxyHost, api.cloudinary.config.proxyPort);
+            requestConfigBuilder.setProxy(proxy);
+        }
+
+        int timeout = this.api.cloudinary.config.timeout;
+        if (timeout > 0) {
+            requestConfigBuilder.setResponseTimeout(Timeout.ofSeconds(timeout))
+                    .setConnectionRequestTimeout(Timeout.ofSeconds(timeout))
+                    .setConnectTimeout(Timeout.ofSeconds(timeout));
+        }
+
+        return requestConfigBuilder.build();
+    }
+
     @SuppressWarnings({"rawtypes", "unchecked"})
     public ApiResponse callApi(Api.HttpMethod method, String apiUrl, Map<String, ?> params, Map options, String autorizationHeader) throws Exception {
         HttpUriRequestBase request = prepareRequest(method, apiUrl, params, options);
diff --git a/cloudinary-http5/src/main/java/com/cloudinary/http5/ApiUtils.java b/cloudinary-http5/src/main/java/com/cloudinary/http5/ApiUtils.java
index af67a1e8..040fd714 100644
--- a/cloudinary-http5/src/main/java/com/cloudinary/http5/ApiUtils.java
+++ b/cloudinary-http5/src/main/java/com/cloudinary/http5/ApiUtils.java
@@ -10,7 +10,8 @@
 
 import java.util.*;
 
-public class ApiUtils {
+public final class ApiUtils {
+    private ApiUtils() {}
 
     public static void setTimeouts(HttpUriRequestBase request, Map<String, ? extends Object> options) {
         RequestConfig config = request.getConfig();
diff --git a/cloudinary-http5/src/main/java/com/cloudinary/http5/UploaderStrategy.java b/cloudinary-http5/src/main/java/com/cloudinary/http5/UploaderStrategy.java
index 5f87cbd8..589dff5b 100644
--- a/cloudinary-http5/src/main/java/com/cloudinary/http5/UploaderStrategy.java
+++ b/cloudinary-http5/src/main/java/com/cloudinary/http5/UploaderStrategy.java
@@ -8,16 +8,21 @@
 import com.cloudinary.utils.StringUtils;
 import org.apache.hc.client5.http.classic.methods.HttpPost;
 import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase;
+import org.apache.hc.client5.http.config.RequestConfig;
 import org.apache.hc.client5.http.entity.mime.ByteArrayBody;
 import org.apache.hc.client5.http.entity.mime.FileBody;
 import org.apache.hc.client5.http.entity.mime.HttpMultipartMode;
 import org.apache.hc.client5.http.entity.mime.MultipartEntityBuilder;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
+import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
 import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.client5.http.io.HttpClientConnectionManager;
 import org.apache.hc.core5.http.ContentType;
+import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.ParseException;
 import org.apache.hc.core5.http.io.entity.EntityUtils;
+import org.apache.hc.core5.util.Timeout;
 
 import java.io.File;
 import java.io.IOException;
@@ -35,11 +40,39 @@ public class UploaderStrategy extends AbstractUploaderStrategy {
     public void init(Uploader uploader) {
         super.init(uploader);
 
-        this.client = HttpClients.custom()
-                .setUserAgent(cloudinary().getUserAgent() + " ApacheHttpClient/" + APACHE_HTTP_CLIENT_VERSION)
+        HttpClientBuilder clientBuilder = HttpClients.custom();
+        clientBuilder.useSystemProperties().setUserAgent(cloudinary().getUserAgent() + " ApacheHttpClient/" + APACHE_HTTP_CLIENT_VERSION);
+
+        HttpClientConnectionManager connectionManager = (HttpClientConnectionManager) cloudinary().config.properties.get("connectionManager");
+        if (connectionManager != null) {
+            clientBuilder.setConnectionManager(connectionManager);
+        }
+
+        RequestConfig requestConfig = buildRequestConfig();
+
+        client = clientBuilder
+                .setDefaultRequestConfig(requestConfig)
                 .build();
     }
 
+    public RequestConfig buildRequestConfig() {
+        RequestConfig.Builder requestConfigBuilder = RequestConfig.custom();
+
+        if (cloudinary().config.proxyHost != null && cloudinary().config.proxyPort != 0) {
+            HttpHost proxy = new HttpHost(cloudinary().config.proxyHost, cloudinary().config.proxyPort);
+            requestConfigBuilder.setProxy(proxy);
+        }
+
+        int timeout = cloudinary().config.timeout;
+        if (timeout > 0) {
+            requestConfigBuilder.setResponseTimeout(Timeout.ofSeconds(timeout))
+                    .setConnectionRequestTimeout(Timeout.ofSeconds(timeout))
+                    .setConnectTimeout(Timeout.ofSeconds(timeout));
+        }
+
+        return requestConfigBuilder.build();
+    }
+
     @SuppressWarnings({"rawtypes", "unchecked"})
     @Override
     public Map callApi(String action, Map<String, Object> params, Map options, Object file, ProgressCallback progressCallback) throws IOException {
diff --git a/cloudinary-http5/src/test/java/com/cloudinary/test/ApiTest.java b/cloudinary-http5/src/test/java/com/cloudinary/test/ApiTest.java
index a2f3c89f..53da8866 100644
--- a/cloudinary-http5/src/test/java/com/cloudinary/test/ApiTest.java
+++ b/cloudinary-http5/src/test/java/com/cloudinary/test/ApiTest.java
@@ -1,19 +1,57 @@
 package com.cloudinary.test;
 
+import com.cloudinary.Cloudinary;
 import com.cloudinary.api.ApiResponse;
+import com.cloudinary.http5.ApiStrategy;
 import com.cloudinary.utils.ObjectUtils;
+import org.apache.hc.client5.http.config.RequestConfig;
+import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.util.Timeout;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+
 import java.util.Map;
+import java.util.UUID;
+
+import static com.cloudinary.utils.ObjectUtils.asMap;
 
 
 public class ApiTest extends AbstractApiTest {
 
+    @Test
+    public void testBuildRequestConfig_withProxyAndTimeout() {
+        Cloudinary cloudinary = new Cloudinary("cloudinary://test:test@test.com");
+        cloudinary.config.proxyHost = "127.0.0.1";
+        cloudinary.config.proxyPort = 8080;
+        cloudinary.config.timeout = 15;
+
+        RequestConfig requestConfig = ((ApiStrategy)cloudinary.api().getStrategy()).buildRequestConfig();
+
+        assert(requestConfig.getProxy() != null);
+        HttpHost proxy = requestConfig.getProxy();
+        assert("127.0.0.1" == proxy.getHostName());
+        assert(8080 == proxy.getPort());
+
+        assert(15000 == requestConfig.getConnectionRequestTimeout().toMilliseconds());
+        assert(15000 == requestConfig.getResponseTimeout().toMilliseconds());
+    }
+
+    @Test
+    public void testBuildRequestConfig_withoutProxy() {
+        Cloudinary cloudinary = new Cloudinary("cloudinary://test:test@test.com");
+        cloudinary.config.timeout = 10;
+
+        RequestConfig requestConfig = ((ApiStrategy)cloudinary.api().getStrategy()).buildRequestConfig();
+
+        assert(requestConfig.getProxy() == null);
+        assert(10000 == requestConfig.getConnectionRequestTimeout().toMilliseconds());
+        assert(10000 == requestConfig.getResponseTimeout().toMilliseconds());
+    }
+
     @Category(TimeoutTest.class)
     @Test(expected = Exception.class)
     public void testConnectTimeoutParameter() throws Exception {
-        Map<String, Object> options = ObjectUtils.asMap(
+        Map<String, Object> options = asMap(
                 "max_results", 500,
                 "connect_timeout", 0.2);
 
@@ -30,7 +68,7 @@ public void testConnectTimeoutParameter() throws Exception {
     @Test(expected = Exception.class)
     public void testTimeoutParameter() throws Exception {
         // Set a very short request timeout to trigger a timeout exception
-        Map<String, Object> options = ObjectUtils.asMap(
+        Map<String, Object> options = asMap(
                 "max_results", 500,
                 "timeout", Timeout.ofMilliseconds(1000)); // Set the timeout to 1 second
 
@@ -41,5 +79,24 @@ public void testTimeoutParameter() throws Exception {
             throw new Exception("Socket timeout");
         }
     }
-}
 
+    @Category(TimeoutTest.class)
+    @Test(expected = Exception.class)
+    public void testUploaderTimeoutParameter() throws Exception {
+        Cloudinary cloudinary = new Cloudinary("cloudinary://test:test@test.com");
+        cloudinary.config.uploadPrefix = "https://10.255.255.1";
+        String publicId = UUID.randomUUID().toString();
+        // Set a very short request timeout to trigger a timeout exception
+        Map<String, Object> options = asMap(
+                "max_results", 500,
+                "timeout", Timeout.ofMilliseconds(10)); // Set the timeout to 1 second
+
+        try {
+           Map result = cloudinary.uploader().addContext(asMap("caption", "new caption"), new String[]{publicId, "no-such-id"}, options);
+        } catch (Exception e) {
+            // Convert IOException to SocketTimeoutException if appropriate
+            throw new Exception("Socket timeout");
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/cloudinary-taglib/build.gradle b/cloudinary-taglib/build.gradle
index 16b200f3..ef8824af 100644
--- a/cloudinary-taglib/build.gradle
+++ b/cloudinary-taglib/build.gradle
@@ -1,17 +1,15 @@
 plugins {
     id 'java-library'
-    id 'signing'
-    id 'maven-publish'
-    id 'io.codearte.nexus-staging' version '0.21.1'
 }
 
 apply from: "../java_shared.gradle"
+apply from: "../publish.gradle"
 
 task ciTest( type: Test )
 
 dependencies {
     compile project(':cloudinary-core')
-    compile group: 'org.apache.commons', name: 'commons-lang3', version:'3.1'
+    compile group: 'org.apache.commons', name: 'commons-lang3', version:'3.18.0'
     testCompile group: 'org.hamcrest', name: 'java-hamcrest', version:'2.0.0.0'
     testCompile group: 'pl.pragmatists', name: 'JUnitParams', version:'1.0.5'
     testCompile group: 'junit', name: 'junit', version:'4.12'
@@ -22,87 +20,4 @@ dependencies {
     }
 }
 
-if (hasProperty("ossrhPassword")) {
-
-    signing {
-        sign configurations.archives
-    }
-
-    nexusStaging {
-        packageGroup = group
-        username = project.hasProperty("ossrhToken") ? project.ext["ossrhToken"] : ""
-        password = project.hasProperty("ossrhTokenPassword") ? project.ext["ossrhTokenPassword"] : ""
-    }
-
-    publishing {
-        publications {
-            mavenJava(MavenPublication) {
-                from components.java
-                artifact sourcesJar
-                artifact javadocJar
-                pom {
-                    name = 'Cloudinary Taglib Library'
-                    packaging = 'jar'
-                    groupId = publishGroupId
-                    artifactId = 'cloudinary-taglib'
-                    description = publishDescription
-                    url = githubUrl
-                    licenses {
-                        license {
-                            name = licenseName
-                            url = licenseUrl
-                        }
-                    }
-
-                    developers {
-                        developer {
-                            id = developerId
-                            name = developerName
-                            email = developerEmail
-                        }
-                    }
-                    scm {
-                        connection = scmConnection
-                        developerConnection = scmDeveloperConnection
-                        url = scmUrl
-                    }
-                }
-
-                pom.withXml {
-                    def pomFile = file("${project.buildDir}/generated-pom.xml")
-                    writeTo(pomFile)
-                    def pomAscFile = signing.sign(pomFile).signatureFiles[0]
-                    artifact(pomAscFile) {
-                        classifier = null
-                        extension = 'pom.asc'
-                    }
-                }
-
-                // create the signed artifacts
-                project.tasks.signArchives.signatureFiles.each {
-                    artifact(it) {
-                        def matcher = it.file =~ /-(sources|javadoc)\.jar\.asc$/
-                        if (matcher.find()) {
-                            classifier = matcher.group(1)
-                        } else {
-                            classifier = null
-                        }
-                        extension = 'jar.asc'
-                    }
-                }
-            }
-        }
-
-        model {
-            tasks.generatePomFileForMavenJavaPublication {
-                destination = file("$buildDir/generated-pom.xml")
-            }
-            tasks.publishMavenJavaPublicationToMavenLocal {
-                dependsOn project.tasks.signArchives
-            }
-            tasks.publishMavenJavaPublicationToSonatypeRepository {
-                dependsOn project.tasks.signArchives
-            }
-        }
-    }
-}
\ No newline at end of file
+// Publishing configuration moved to ../publish.gradle
\ No newline at end of file
diff --git a/cloudinary-taglib/src/main/java/com/cloudinary/Singleton.java b/cloudinary-taglib/src/main/java/com/cloudinary/Singleton.java
index a3767492..5c11458f 100644
--- a/cloudinary-taglib/src/main/java/com/cloudinary/Singleton.java
+++ b/cloudinary-taglib/src/main/java/com/cloudinary/Singleton.java
@@ -10,7 +10,8 @@
  *
  * @author jpollak
  */
-public class Singleton {
+public final class Singleton {
+    private Singleton() {}
 
     private static Cloudinary cloudinary;
 
diff --git a/cloudinary-taglib/src/main/java/com/cloudinary/taglib/CloudinaryImageTag.java b/cloudinary-taglib/src/main/java/com/cloudinary/taglib/CloudinaryImageTag.java
index 2de25e3b..8b253533 100644
--- a/cloudinary-taglib/src/main/java/com/cloudinary/taglib/CloudinaryImageTag.java
+++ b/cloudinary-taglib/src/main/java/com/cloudinary/taglib/CloudinaryImageTag.java
@@ -4,12 +4,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.servlet.ServletRequest;
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.DynamicAttributes;
-import javax.servlet.jsp.tagext.SimpleTagSupport;
 
 import com.cloudinary.*;
 
diff --git a/cloudinary-taglib/src/main/java/com/cloudinary/taglib/CloudinaryVideoTag.java b/cloudinary-taglib/src/main/java/com/cloudinary/taglib/CloudinaryVideoTag.java
index 9ed803ee..ec2adb54 100644
--- a/cloudinary-taglib/src/main/java/com/cloudinary/taglib/CloudinaryVideoTag.java
+++ b/cloudinary-taglib/src/main/java/com/cloudinary/taglib/CloudinaryVideoTag.java
@@ -1,7 +1,6 @@
 package com.cloudinary.taglib;
 
 import java.io.IOException;
-import java.util.HashMap;
 import java.util.Map;
 
 import javax.servlet.jsp.JspException;
diff --git a/cloudinary-test-common/build.gradle b/cloudinary-test-common/build.gradle
index daa5ce83..e387870b 100644
--- a/cloudinary-test-common/build.gradle
+++ b/cloudinary-test-common/build.gradle
@@ -1,11 +1,9 @@
 plugins {
     id 'java-library'
-    id 'signing'
-    id 'maven-publish'
-    id 'io.codearte.nexus-staging' version '0.21.1'
 }
 
 apply from: "../java_shared.gradle"
+apply from: "../publish.gradle"
 
 task ciTest( type: Test )
 
@@ -16,87 +14,4 @@ dependencies {
     testCompile group: 'pl.pragmatists', name: 'JUnitParams', version: '1.0.5'
 }
 
-if (hasProperty("ossrhPassword")) {
-
-    signing {
-        sign configurations.archives
-    }
-
-    nexusStaging {
-        packageGroup = group
-        username = project.hasProperty("ossrhToken") ? project.ext["ossrhToken"] : ""
-        password = project.hasProperty("ossrhTokenPassword") ? project.ext["ossrhTokenPassword"] : ""
-    }
-
-    publishing {
-        publications {
-            mavenJava(MavenPublication) {
-                from components.java
-                artifact sourcesJar
-                artifact javadocJar
-                pom {
-                    name = 'Cloudinary Test Common'
-                    packaging = 'jar'
-                    groupId = publishGroupId
-                    artifactId = 'cloudinary-test-common'
-                    description = publishDescription
-                    url = githubUrl
-                    licenses {
-                        license {
-                            name = licenseName
-                            url = licenseUrl
-                        }
-                    }
-
-                    developers {
-                        developer {
-                            id = developerId
-                            name = developerName
-                            email = developerEmail
-                        }
-                    }
-                    scm {
-                        connection = scmConnection
-                        developerConnection = scmDeveloperConnection
-                        url = scmUrl
-                    }
-                }
-
-                pom.withXml {
-                    def pomFile = file("${project.buildDir}/generated-pom.xml")
-                    writeTo(pomFile)
-                    def pomAscFile = signing.sign(pomFile).signatureFiles[0]
-                    artifact(pomAscFile) {
-                        classifier = null
-                        extension = 'pom.asc'
-                    }
-                }
-
-                // create the signed artifacts
-                project.tasks.signArchives.signatureFiles.each {
-                    artifact(it) {
-                        def matcher = it.file =~ /-(sources|javadoc)\.jar\.asc$/
-                        if (matcher.find()) {
-                            classifier = matcher.group(1)
-                        } else {
-                            classifier = null
-                        }
-                        extension = 'jar.asc'
-                    }
-                }
-            }
-        }
-
-        model {
-            tasks.generatePomFileForMavenJavaPublication {
-                destination = file("$buildDir/generated-pom.xml")
-            }
-            tasks.publishMavenJavaPublicationToMavenLocal {
-                dependsOn project.tasks.signArchives
-            }
-            tasks.publishMavenJavaPublicationToSonatypeRepository {
-                dependsOn project.tasks.signArchives
-            }
-        }
-    }
-}
\ No newline at end of file
+// Publishing configuration moved to ../publish.gradle
\ No newline at end of file
diff --git a/cloudinary-test-common/src/main/java/com/cloudinary/test/AbstractAccountApiTest.java b/cloudinary-test-common/src/main/java/com/cloudinary/test/AbstractAccountApiTest.java
index 5b8e9633..7852f96b 100644
--- a/cloudinary-test-common/src/main/java/com/cloudinary/test/AbstractAccountApiTest.java
+++ b/cloudinary-test-common/src/main/java/com/cloudinary/test/AbstractAccountApiTest.java
@@ -15,7 +15,6 @@
 import static java.util.Collections.singletonMap;
 import static junit.framework.TestCase.assertTrue;
 import static org.junit.Assert.*;
-import static org.junit.Assume.assumeTrue;
 
 public abstract class AbstractAccountApiTest extends MockableTest {
     private static Random rand = new Random();
diff --git a/cloudinary-test-common/src/main/java/com/cloudinary/test/AbstractApiTest.java b/cloudinary-test-common/src/main/java/com/cloudinary/test/AbstractApiTest.java
index ad89074a..90e90fa7 100644
--- a/cloudinary-test-common/src/main/java/com/cloudinary/test/AbstractApiTest.java
+++ b/cloudinary-test-common/src/main/java/com/cloudinary/test/AbstractApiTest.java
@@ -464,6 +464,20 @@ public void test09DeleteResources() throws Exception {
         api.resource(public_id, ObjectUtils.emptyMap());
     }
 
+    @Test(expected = NotFound.class)
+    public void test10DeleteResourcesByAssetsIds() throws Exception {
+        String public_id = "api_,test4" + SUFFIX;
+        cloudinary.uploader().upload(SRC_TEST_IMAGE, ObjectUtils.asMap("public_id", public_id, "tags", UPLOAD_TAGS));
+        Map resource = api.resource(public_id, ObjectUtils.emptyMap());
+        assertNotNull(resource);
+        String assetId = (String)resource.get("asset_id");
+        ApiResponse response = api.deleteResourcesByAssetIds(Arrays.asList(assetId), ObjectUtils.emptyMap());
+        assertNotNull(response);
+        assertNotNull(response.get("deleted"));
+        assertNotNull(response.get("deleted_counts"));
+        api.resource(public_id, ObjectUtils.emptyMap());
+    }
+
     @Test(expected = NotFound.class)
     public void test09aDeleteResourcesByPrefix() throws Exception {
         // should allow deleting resources
@@ -670,7 +684,7 @@ public void testRateLimits() throws Exception {
 
     @Test
     public void testConfiguration() throws Exception {
-        ApiResponse result = cloudinary.api().configuration(new ObjectUtils().asMap("settings", true));
+        ApiResponse result = cloudinary.api().configuration(ObjectUtils.asMap("settings", true));
         Map settings = (Map) result.get("settings");
         Assert.assertNotNull(settings.get("folder_mode"));
     }
@@ -825,14 +839,13 @@ public void testGetUploadPreset() throws Exception {
         String[] tags = {"a", "b", "c"};
         Map context = ObjectUtils.asMap("a", "b", "c", "d");
         Map result = api.createUploadPreset(ObjectUtils.asMap("unsigned", true, "folder", "folder", "transformation", EXPLICIT_TRANSFORMATION, "tags", tags, "context",
-                context, "live", true, "use_asset_folder_as_public_id_prefix", true));
+                context, "use_asset_folder_as_public_id_prefix", true));
         String name = result.get("name").toString();
         Map preset = api.uploadPreset(name, ObjectUtils.emptyMap());
         assertEquals(preset.get("name"), name);
         assertEquals(Boolean.TRUE, preset.get("unsigned"));
         Map settings = (Map) preset.get("settings");
         assertEquals(settings.get("folder"), "folder");
-        assertEquals(settings.get("live"), Boolean.TRUE);
         assertEquals(settings.get("use_asset_folder_as_public_id_prefix"), true);
         Map outTransformation = (Map) ((java.util.ArrayList) settings.get("transformation")).get(0);
         assertEquals(outTransformation.get("width"), 100);
@@ -866,13 +879,12 @@ public void testUpdateUploadPreset() throws Exception {
         String name = api.createUploadPreset(ObjectUtils.asMap("folder", "folder")).get("name").toString();
         Map preset = api.uploadPreset(name, ObjectUtils.emptyMap());
         Map settings = (Map) preset.get("settings");
-        settings.putAll(ObjectUtils.asMap("colors", true, "unsigned", true, "disallow_public_id", true, "live", true, "eval",AbstractUploaderTest.SRC_TEST_EVAL));
+        settings.putAll(ObjectUtils.asMap("colors", true, "unsigned", true, "disallow_public_id", true, "eval",AbstractUploaderTest.SRC_TEST_EVAL));
         api.updateUploadPreset(name, settings);
         settings.remove("unsigned");
         preset = api.uploadPreset(name, ObjectUtils.emptyMap());
         assertEquals(name, preset.get("name"));
         assertEquals(Boolean.TRUE, preset.get("unsigned"));
-        assertEquals(settings.get("live"), Boolean.TRUE);
         assertEquals(settings, preset.get("settings"));
 
         api.deleteUploadPreset(name, ObjectUtils.emptyMap());
@@ -959,6 +971,32 @@ public void testRestore() throws Exception {
         assertEquals(resource.get("bytes"), 3381);
     }
 
+    @Test
+    public void testRestoreByAssetIds() throws Exception {
+
+        // Upload
+        cloudinary.uploader().upload(SRC_TEST_IMAGE,
+                ObjectUtils.asMap("public_id", API_TEST_RESTORE, "backup", true, "tags", UPLOAD_TAGS));
+        Map resource = api.resource(API_TEST_RESTORE, ObjectUtils.emptyMap());
+        assertEquals(resource.get("bytes"), 3381);
+
+        //Delete
+        api.deleteResources(Collections.singletonList(API_TEST_RESTORE), ObjectUtils.emptyMap());
+        resource = api.resource(API_TEST_RESTORE, ObjectUtils.emptyMap());
+        String assetId = (String) resource.get("asset_id");
+        assertEquals(resource.get("bytes"), 0);
+        assertNotNull(assetId);
+        assertTrue((Boolean) resource.get("placeholder"));
+
+        //Restore
+        Map response = api.restoreByAssetIds(Collections.singletonList(assetId), ObjectUtils.emptyMap());
+        Map info = (Map) response.get(assetId);
+        assertNotNull(info);
+        assertEquals(info.get("bytes"), 3381);
+        resource = api.resource(API_TEST_RESTORE, ObjectUtils.emptyMap());
+        assertEquals(resource.get("bytes"), 3381);
+    }
+
     @Test
     public void testRestoreDifferentVersionsOfDeletedAsset() throws Exception {
         final String TEST_RESOURCE_PUBLIC_ID = "api_test_restore_different_versions_single_asset" + SUFFIX;
@@ -1330,4 +1368,39 @@ public void testAllowDerivedNextCursor() throws Exception {
             cloudinary.uploader().destroy(publicId, Collections.singletonMap("invalidate", true));
         }
     }
+
+    @Test
+    public void testSignatureWithEscapingCharacters() {
+        String API_SIGN_REQUEST_CLOUD_NAME = "dn6ot3ged";
+        String API_SIGN_REQUEST_TEST_SECRET = "hdcixPpR2iKERPwqvH6sHdK9cyac";
+
+        Map<String, Object> paramsWithAmpersand = new HashMap<>();
+        paramsWithAmpersand.put("cloud_name", API_SIGN_REQUEST_CLOUD_NAME);
+        paramsWithAmpersand.put("timestamp", 1568810420);
+        paramsWithAmpersand.put("notification_url", "https://fake.com/callback?a=1&tags=hello,world");
+
+        String signatureWithAmpersand = Util.produceSignature(paramsWithAmpersand, API_SIGN_REQUEST_TEST_SECRET, cloudinary.config.signatureVersion);
+
+        Map<String, Object> paramsSmuggled = new HashMap<>();
+        paramsSmuggled.put("cloud_name", API_SIGN_REQUEST_CLOUD_NAME);
+        paramsSmuggled.put("timestamp", 1568810420);
+        paramsSmuggled.put("notification_url", "https://fake.com/callback?a=1");
+        paramsSmuggled.put("tags", "hello,world");
+
+        String signatureSmuggled = Util.produceSignature(paramsSmuggled, API_SIGN_REQUEST_TEST_SECRET, cloudinary.config.signatureVersion);
+
+        assertNotEquals(signatureWithAmpersand, signatureSmuggled,
+                "Signatures should be different to prevent parameter smuggling");
+
+        String expectedSignature = "4fdf465dd89451cc1ed8ec5b3e314e8a51695704";
+        assertEquals(expectedSignature, signatureWithAmpersand);
+
+        String expectedSmuggledSignature = "7b4e3a539ff1fa6e6700c41b3a2ee77586a025f9";
+        assertEquals(expectedSmuggledSignature, signatureSmuggled);
+
+        String versionOneSignature = Util.produceSignature(paramsSmuggled, API_SIGN_REQUEST_TEST_SECRET, 1);
+
+        assertEquals(expectedSmuggledSignature, versionOneSignature);
+
+    }
 }
diff --git a/cloudinary-test-common/src/main/java/com/cloudinary/test/AbstractFoldersApiTest.java b/cloudinary-test-common/src/main/java/com/cloudinary/test/AbstractFoldersApiTest.java
index a0478bad..a8835046 100644
--- a/cloudinary-test-common/src/main/java/com/cloudinary/test/AbstractFoldersApiTest.java
+++ b/cloudinary-test-common/src/main/java/com/cloudinary/test/AbstractFoldersApiTest.java
@@ -85,4 +85,17 @@ public void testSubFolderWithParams() throws Exception {
         ApiResponse result = api.deleteFolder(rootFolderName, null);
         assertTrue(((List) result.get("deleted")).contains(rootFolderName));
     }
+
+    @Test
+    public void testDeleteFolderWithSkipBackup() throws Exception {
+        //Create
+        String rootFolderName = "deleteFolderWithSkipBackup" + SUFFIX;
+        assertTrue((Boolean) api.createFolder(rootFolderName, null).get("success"));
+
+        //Delete
+        ApiResponse result = api.deleteFolder(rootFolderName, ObjectUtils.asMap("skip_backup", "true"));
+        assertTrue(((List) result.get("deleted")).contains(rootFolderName));
+
+
+    }
 }
diff --git a/cloudinary-test-common/src/main/java/com/cloudinary/test/AbstractSearchTest.java b/cloudinary-test-common/src/main/java/com/cloudinary/test/AbstractSearchTest.java
index 5e30d26b..e6bf5d6e 100644
--- a/cloudinary-test-common/src/main/java/com/cloudinary/test/AbstractSearchTest.java
+++ b/cloudinary-test-common/src/main/java/com/cloudinary/test/AbstractSearchTest.java
@@ -1,9 +1,7 @@
 package com.cloudinary.test;
 
 import com.cloudinary.Cloudinary;
-import com.cloudinary.Configuration;
 import com.cloudinary.Search;
-import com.cloudinary.api.ApiResponse;
 import com.cloudinary.utils.ObjectUtils;
 import org.junit.*;
 import org.junit.rules.TestName;
@@ -13,7 +11,6 @@
 
 import static org.hamcrest.Matchers.hasEntry;
 import static org.hamcrest.Matchers.hasItem;
-import static org.hamcrest.core.AllOf.allOf;
 import static org.junit.Assert.*;
 import static org.junit.Assume.assumeNotNull;
 
diff --git a/cloudinary-test-common/src/main/java/com/cloudinary/test/AbstractStructuredMetadataTest.java b/cloudinary-test-common/src/main/java/com/cloudinary/test/AbstractStructuredMetadataTest.java
index 241ac47d..4fe51219 100644
--- a/cloudinary-test-common/src/main/java/com/cloudinary/test/AbstractStructuredMetadataTest.java
+++ b/cloudinary-test-common/src/main/java/com/cloudinary/test/AbstractStructuredMetadataTest.java
@@ -73,9 +73,18 @@ public void testCreateMetadata() throws Exception {
         assertEquals(setField.getLabel(), result.get("label"));
     }
 
+    @Test
+    public void testCreateSetMetadataWithAllowDynamicListValues() throws Exception {
+        SetMetadataField setField = createSetField("testCreateMetadata_4");
+        ApiResponse result = cloudinary.api().addMetadataField(setField);
+        assertNotNull(result);
+        assertEquals(setField.getLabel(), result.get("label"));
+        assertEquals(true, result.get("allow_dynamic_list_values"));
+    }
+
     @Test
     public void testFieldRestrictions() throws Exception {
-        StringMetadataField stringField = newFieldInstance("testCreateMetadata_3", true);
+        StringMetadataField stringField = newFieldInstance("testCreateMetadata_3", false);
         stringField.setRestrictions(new Restrictions().setReadOnlyUI());
 
         ApiResponse result = api.addMetadataField(stringField);
@@ -367,6 +376,7 @@ private SetMetadataField createSetField(String labelPrefix) {
         String label = labelPrefix + "_" + SUFFIX;
         setField.setLabel(label);
         setField.setMandatory(false);
+        setField.setAllowDynamicListValues(true);
         setField.setValidation(new MetadataValidation.StringLength(3, 99));
         setField.setDefaultValue(Arrays.asList("id2", "id3"));
         setField.setValidation(null);
diff --git a/cloudinary-test-common/src/main/java/com/cloudinary/test/AbstractUploaderTest.java b/cloudinary-test-common/src/main/java/com/cloudinary/test/AbstractUploaderTest.java
index 19098f6c..794c926a 100644
--- a/cloudinary-test-common/src/main/java/com/cloudinary/test/AbstractUploaderTest.java
+++ b/cloudinary-test-common/src/main/java/com/cloudinary/test/AbstractUploaderTest.java
@@ -1,7 +1,6 @@
 package com.cloudinary.test;
 
 import com.cloudinary.*;
-import com.cloudinary.api.ApiResponse;
 import com.cloudinary.metadata.StringMetadataField;
 import com.cloudinary.test.rules.RetryRule;
 import com.cloudinary.utils.ObjectUtils;
@@ -13,7 +12,6 @@
 import java.io.*;
 import java.net.HttpURLConnection;
 import java.net.URL;
-import java.net.URLEncoder;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -106,7 +104,7 @@ public void testUtf8Upload() throws IOException {
         Map<String, Object> to_sign = new HashMap<String, Object>();
         to_sign.put("public_id", result.get("public_id"));
         to_sign.put("version", ObjectUtils.asString(result.get("version")));
-        String expected_signature = cloudinary.apiSignRequest(to_sign, cloudinary.config.apiSecret);
+        String expected_signature = cloudinary.apiSignRequest(to_sign, cloudinary.config.apiSecret, cloudinary.config.signatureVersion);
         assertEquals(result.get("signature"), expected_signature);
     }
 
@@ -133,7 +131,7 @@ public void testUpload() throws IOException {
         Map<String, Object> to_sign = new HashMap<String, Object>();
         to_sign.put("public_id", result.get("public_id"));
         to_sign.put("version", ObjectUtils.asString(result.get("version")));
-        String expected_signature = cloudinary.apiSignRequest(to_sign, cloudinary.config.apiSecret);
+        String expected_signature = cloudinary.apiSignRequest(to_sign, cloudinary.config.apiSecret, cloudinary.config.signatureVersion);
         assertEquals(result.get("signature"), expected_signature);
     }
 
@@ -169,7 +167,7 @@ public void testUploadUrl() throws IOException {
         Map<String, Object> to_sign = new HashMap<String, Object>();
         to_sign.put("public_id", result.get("public_id"));
         to_sign.put("version", ObjectUtils.asString(result.get("version")));
-        String expected_signature = cloudinary.apiSignRequest(to_sign, cloudinary.config.apiSecret);
+        String expected_signature = cloudinary.apiSignRequest(to_sign, cloudinary.config.apiSecret, cloudinary.config.signatureVersion);
         assertEquals(result.get("signature"), expected_signature);
     }
 
@@ -181,7 +179,7 @@ public void testUploadLargeUrl() throws IOException {
         Map<String, Object> to_sign = new HashMap<String, Object>();
         to_sign.put("public_id", result.get("public_id"));
         to_sign.put("version", ObjectUtils.asString(result.get("version")));
-        String expected_signature = cloudinary.apiSignRequest(to_sign, cloudinary.config.apiSecret);
+        String expected_signature = cloudinary.apiSignRequest(to_sign, cloudinary.config.apiSecret, cloudinary.config.signatureVersion);
         assertEquals(result.get("signature"), expected_signature);
     }
 
@@ -193,7 +191,7 @@ public void testUploadDataUri() throws IOException {
         Map<String, Object> to_sign = new HashMap<String, Object>();
         to_sign.put("public_id", result.get("public_id"));
         to_sign.put("version", ObjectUtils.asString(result.get("version")));
-        String expected_signature = cloudinary.apiSignRequest(to_sign, cloudinary.config.apiSecret);
+        String expected_signature = cloudinary.apiSignRequest(to_sign, cloudinary.config.apiSecret, cloudinary.config.signatureVersion);
         assertEquals(result.get("signature"), expected_signature);
     }
 
diff --git a/cloudinary-test-common/src/main/java/com/cloudinary/test/MetadataTestHelper.java b/cloudinary-test-common/src/main/java/com/cloudinary/test/MetadataTestHelper.java
index cdb52487..2a128c7f 100644
--- a/cloudinary-test-common/src/main/java/com/cloudinary/test/MetadataTestHelper.java
+++ b/cloudinary-test-common/src/main/java/com/cloudinary/test/MetadataTestHelper.java
@@ -6,7 +6,9 @@
 import com.cloudinary.metadata.MetadataValidation;
 import com.cloudinary.metadata.StringMetadataField;
 
-public class MetadataTestHelper {
+public final class MetadataTestHelper {
+    private MetadataTestHelper() {}
+
     public static StringMetadataField newFieldInstance(String label, Boolean mandatory) throws Exception {
         StringMetadataField field = new StringMetadataField();
         field.setLabel(label);
diff --git a/cloudinary-test-common/src/main/java/com/cloudinary/test/helpers/Feature.java b/cloudinary-test-common/src/main/java/com/cloudinary/test/helpers/Feature.java
index 2ced269c..b66bd303 100644
--- a/cloudinary-test-common/src/main/java/com/cloudinary/test/helpers/Feature.java
+++ b/cloudinary-test-common/src/main/java/com/cloudinary/test/helpers/Feature.java
@@ -1,6 +1,8 @@
 package com.cloudinary.test.helpers;
 
-public class Feature {
+public final class Feature {
+    private Feature() {}
+
     public static final String ALL = "all";
     public static final String DYNAMIC_FOLDERS = "dynamic_folders";
     public static final String BACKEDUP_ASSETS = "backedup_assets";
diff --git a/gradle.properties b/gradle.properties
index c15a7578..2fc928d3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
-publishRepo=https://oss.sonatype.org/service/local/staging/deploy/maven2/
-snapshotRepo=https://oss.sonatype.org/content/repositories/snapshots/
+publishRepo=https://central.sonatype.com/
+snapshotRepo=https://central.sonatype.com/
 publishDescription=Cloudinary is a cloud service that offers a solution to a web application's entire image management pipeline. Upload images to the cloud. Automatically perform smart image resizing, cropping and conversion without installing any complex software. Integrate Facebook or Twitter profile image extraction in a snap, in any dimension and style to match your website’s graphics requirements. Images are seamlessly delivered through a fast CDN, and much much more. This Java library allows to easily integrate with Cloudinary in Java applications.
 githubUrl=http://github.com/cloudinary/cloudinary_java
 scmConnection=scm:git:git://github.com/cloudinary/cloudinary_java.git
@@ -13,7 +13,7 @@ developerEmail=info@cloudinary.com
 
 # These two properties must use these exact names to be compatible with 'gradle install' plugin.
 group=com.cloudinary
-version=2.0.0
+version=2.3.2
 
 gnsp.disableApplyOnlyOnRootProjectEnforcement=true
 
diff --git a/publish.gradle b/publish.gradle
new file mode 100644
index 00000000..80eb3ea9
--- /dev/null
+++ b/publish.gradle
@@ -0,0 +1,73 @@
+apply plugin: 'maven-publish'
+apply plugin: 'signing'
+
+// Simple module-level publishing for manual upload to Central Portal
+if (hasProperty("ossrhTokenPassword") || hasProperty("centralPassword")) {
+    
+    publishing {
+        publications {
+            mavenJava(MavenPublication) {
+                // Set coordinates from gradle.properties
+                groupId = project.ext.publishGroupId
+                artifactId = project.name
+                version = project.version
+                
+                // Include JAR artifacts and components for Java
+                from components.java
+                artifact sourcesJar
+                artifact javadocJar
+                
+                pom {
+                    name = getModuleName(project.name)
+                    packaging = 'jar'
+                    description = publishDescription
+                    url = githubUrl
+                    
+                    licenses {
+                        license {
+                            name = licenseName
+                            url = licenseUrl
+                        }
+                    }
+                    
+                    developers {
+                        developer {
+                            id = developerId
+                            name = developerName
+                            email = developerEmail
+                        }
+                    }
+                    
+                    scm {
+                        connection = scmConnection
+                        developerConnection = scmDeveloperConnection
+                        url = scmUrl
+                    }
+                }
+            }
+        }
+    }
+    
+    // Signing temporarily disabled - we'll add GPG signatures manually using command line
+    // signing {
+    //     required { project.hasProperty("centralPassword") }
+    //     useGpgCmd()
+    //     sign publishing.publications.mavenJava
+    // }
+}
+
+// Helper function to get proper module names
+def getModuleName(artifactId) {
+    switch(artifactId) {
+        case 'cloudinary-core':
+            return 'Cloudinary Core Library'
+        case 'cloudinary-http5':
+            return 'Cloudinary Apache HTTP 5 Library'
+        case 'cloudinary-taglib':
+            return 'Cloudinary Taglib Library'
+        case 'cloudinary-test-common':
+            return 'Cloudinary Test Common Library'
+        default:
+            return 'Cloudinary Java Library'
+    }
+}
\ No newline at end of file
diff --git a/samples/photo_album/src/main/java/cloudinary/lib/PhotoUploadValidator.java b/samples/photo_album/src/main/java/cloudinary/lib/PhotoUploadValidator.java
index 2bcdc56d..0a389e02 100644
--- a/samples/photo_album/src/main/java/cloudinary/lib/PhotoUploadValidator.java
+++ b/samples/photo_album/src/main/java/cloudinary/lib/PhotoUploadValidator.java
@@ -1,16 +1,10 @@
 package cloudinary.lib;
 
 import cloudinary.models.PhotoUpload;
-import com.cloudinary.Cloudinary;
-import com.cloudinary.Singleton;
 import org.springframework.validation.Errors;
 import org.springframework.validation.ValidationUtils;
 import org.springframework.validation.Validator;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
 public class PhotoUploadValidator implements Validator {
     public boolean supports(Class clazz) {
         return PhotoUpload.class.equals(clazz);
diff --git a/samples/photo_album_gae/src/main/java/cloudinary/controllers/PhotoController.java b/samples/photo_album_gae/src/main/java/cloudinary/controllers/PhotoController.java
index 53e8b537..7a6438a8 100644
--- a/samples/photo_album_gae/src/main/java/cloudinary/controllers/PhotoController.java
+++ b/samples/photo_album_gae/src/main/java/cloudinary/controllers/PhotoController.java
@@ -2,7 +2,6 @@
 
 import cloudinary.lib.PhotoUploadValidator;
 import cloudinary.models.PhotoUpload;
-import com.cloudinary.Cloudinary;
 import com.cloudinary.utils.ObjectUtils;
 import com.cloudinary.Singleton;
 import org.springframework.stereotype.Controller;
diff --git a/samples/photo_album_gae/src/main/java/cloudinary/lib/PhotoUploadValidator.java b/samples/photo_album_gae/src/main/java/cloudinary/lib/PhotoUploadValidator.java
index 2bcdc56d..0a389e02 100644
--- a/samples/photo_album_gae/src/main/java/cloudinary/lib/PhotoUploadValidator.java
+++ b/samples/photo_album_gae/src/main/java/cloudinary/lib/PhotoUploadValidator.java
@@ -1,16 +1,10 @@
 package cloudinary.lib;
 
 import cloudinary.models.PhotoUpload;
-import com.cloudinary.Cloudinary;
-import com.cloudinary.Singleton;
 import org.springframework.validation.Errors;
 import org.springframework.validation.ValidationUtils;
 import org.springframework.validation.Validator;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
 public class PhotoUploadValidator implements Validator {
     public boolean supports(Class clazz) {
         return PhotoUpload.class.equals(clazz);