This is an automated email from the ASF dual-hosted git repository. jsinovassinnaik pushed a commit to branch UNOMI-821 in repository https://gitbox.apache.org/repos/asf/unomi.git
commit 91e4eb2122e4852d548c634c247bf1de7eb55cab Author: jsinovassin <jsinovassinn...@jahia.com> AuthorDate: Tue Apr 16 18:55:39 2024 +0200 UNOMI-821: upgrade org.json version --- extensions/unomi-mailchimp/services/pom.xml | 3 ++- .../java/org/apache/unomi/mailchimp/services/MailChimpService.java | 1 - tools/shell-commands/pom.xml | 3 ++- .../src/main/java/org/apache/unomi/shell/migration/Migration.java | 5 +---- tools/shell-dev-commands/pom.xml | 6 ------ 5 files changed, 5 insertions(+), 13 deletions(-) diff --git a/extensions/unomi-mailchimp/services/pom.xml b/extensions/unomi-mailchimp/services/pom.xml index bd403aa71..67d543dea 100644 --- a/extensions/unomi-mailchimp/services/pom.xml +++ b/extensions/unomi-mailchimp/services/pom.xml @@ -57,8 +57,9 @@ <dependency> <groupId>org.json</groupId> <artifactId>json</artifactId> - <version>20160810</version> + <version>20240303</version> </dependency> + <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> diff --git a/extensions/unomi-mailchimp/services/src/main/java/org/apache/unomi/mailchimp/services/MailChimpService.java b/extensions/unomi-mailchimp/services/src/main/java/org/apache/unomi/mailchimp/services/MailChimpService.java index 9386dcb35..68f8c779c 100644 --- a/extensions/unomi-mailchimp/services/src/main/java/org/apache/unomi/mailchimp/services/MailChimpService.java +++ b/extensions/unomi-mailchimp/services/src/main/java/org/apache/unomi/mailchimp/services/MailChimpService.java @@ -20,7 +20,6 @@ package org.apache.unomi.mailchimp.services; import org.apache.unomi.api.Profile; import org.apache.unomi.api.actions.Action; -import org.json.JSONObject; import java.util.HashMap; import java.util.List; diff --git a/tools/shell-commands/pom.xml b/tools/shell-commands/pom.xml index 3571c0044..1c7388a69 100644 --- a/tools/shell-commands/pom.xml +++ b/tools/shell-commands/pom.xml @@ -57,9 +57,10 @@ <dependency> <groupId>org.json</groupId> <artifactId>json</artifactId> - <version>20160212</version> + <version>20240303</version> </dependency> + <dependency> <groupId>org.osgi</groupId> <artifactId>osgi.core</artifactId> diff --git a/tools/shell-commands/src/main/java/org/apache/unomi/shell/migration/Migration.java b/tools/shell-commands/src/main/java/org/apache/unomi/shell/migration/Migration.java index b3e103b0b..e58ad53f5 100644 --- a/tools/shell-commands/src/main/java/org/apache/unomi/shell/migration/Migration.java +++ b/tools/shell-commands/src/main/java/org/apache/unomi/shell/migration/Migration.java @@ -16,9 +16,6 @@ */ package org.apache.unomi.shell.migration; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.karaf.shell.api.console.Session; -import org.apache.unomi.shell.migration.service.MigrationConfig; import org.apache.unomi.shell.migration.service.MigrationContext; import org.osgi.framework.BundleContext; @@ -37,4 +34,4 @@ public interface Migration { * @deprecated do groovy script for implementing new migrations */ void execute(MigrationContext migrationContext, BundleContext bundleContext) throws IOException; -} \ No newline at end of file +} diff --git a/tools/shell-dev-commands/pom.xml b/tools/shell-dev-commands/pom.xml index ae6d71510..01a54b667 100644 --- a/tools/shell-dev-commands/pom.xml +++ b/tools/shell-dev-commands/pom.xml @@ -81,12 +81,6 @@ <artifactId>commons-lang3</artifactId> </dependency> - <dependency> - <groupId>org.json</groupId> - <artifactId>json</artifactId> - <version>20160212</version> - </dependency> - <dependency> <groupId>org.osgi</groupId> <artifactId>osgi.core</artifactId>