UNOMI-821: upgrade org.json version (#657)
* UNOMI-821: upgrade org.json version
* update CI to only use JDK11 for master branch
diff --git a/.github/workflows/unomi-ci-build-tests.yml b/.github/workflows/unomi-ci-build-tests.yml
index ce3cb60..1c3d95b 100644
--- a/.github/workflows/unomi-ci-build-tests.yml
+++ b/.github/workflows/unomi-ci-build-tests.yml
@@ -5,24 +5,20 @@
on:
push:
- branches: [ master, unomi-1.x, unomi-1.7.x ]
+ branches: [master]
pull_request:
- branches: [ master, unomi-1.x, unomi-1.7.x ]
+ types: [opened, reopened, synchronize]
jobs:
unit-tests:
name: Execute unit tests
runs-on: ubuntu-latest
- strategy:
- fail-fast: false
- matrix:
- java: [ 1.8, 11]
steps:
- uses: actions/checkout@v2
- - name: Set up JDK ${{ matrix.java }}
+ - name: Set up JDK 11
uses: actions/setup-java@v1
with:
- java-version: ${{ matrix.java }}
+ java-version: 11
cache: maven
- name: Build and Unit tests
run: mvn -U -ntp -e clean install
@@ -30,16 +26,12 @@
integration-tests:
name: Execute integration tests
runs-on: ubuntu-latest
- strategy:
- fail-fast: false
- matrix:
- java: [ 1.8, 11]
steps:
- uses: actions/checkout@v2
- - name: Set up JDK ${{ matrix.java }}
+ - name: Set up JDK 11
uses: actions/setup-java@v1
with:
- java-version: ${{ matrix.java }}
+ java-version: 11
cache: maven
- name: Integration tests
run: mvn -ntp clean install -Pintegration-tests
@@ -47,13 +39,13 @@
uses: actions/upload-artifact@v3
if: false # UNOMI-746 Reactivate if necessary
with:
- name: unomi-code-coverage-jdk${{ matrix.java }}-${{ github.run_number }}
+ name: unomi-code-coverage-jdk11-${{ github.run_number }}
path: itests/target/site/jacoco
- name: Archive unomi logs
uses: actions/upload-artifact@v3
if: failure()
with:
- name: unomi-log-jdk${{ matrix.java }}-${{ github.run_number }}
+ name: unomi-log-jdk11-${{ github.run_number }}
path: |
itests/target/exam/**/data/log
itests/target/elasticsearch0/data
diff --git a/.github/workflows/unomi-ci-docs-deploy.yml b/.github/workflows/unomi-ci-docs-deploy.yml
index b81e7c0..081b680 100644
--- a/.github/workflows/unomi-ci-docs-deploy.yml
+++ b/.github/workflows/unomi-ci-docs-deploy.yml
@@ -5,7 +5,7 @@
on:
push:
- branches: [ master, unomi-1.x, unomi-1.7.x ]
+ branches: [master]
jobs:
publish-docs-and-snapshots:
@@ -13,10 +13,10 @@
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- - name: Set up JDK 1.8
+ - name: Set up JDK 11
uses: actions/setup-java@v1
with:
- java-version: 1.8
+ java-version: 11
server-id: apache.snapshots.https
server-username: NEXUS_USER
server-password: NEXUS_PW
@@ -33,10 +33,10 @@
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- - name: Set up JDK 1.8
+ - name: Set up JDK 11
uses: actions/setup-java@v1
with:
- java-version: 1.8
+ java-version: 11
server-id: apache.snapshots.https
server-username: NEXUS_USER
server-password: NEXUS_PW
diff --git a/extensions/unomi-mailchimp/services/pom.xml b/extensions/unomi-mailchimp/services/pom.xml
index bd403aa..67d543d 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 9386dcb..68f8c77 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 @@
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 3571c00..1c7388a 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 b3e103b..e58ad53 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 @@
* @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 ae6d715..01a54b6 100644
--- a/tools/shell-dev-commands/pom.xml
+++ b/tools/shell-dev-commands/pom.xml
@@ -82,12 +82,6 @@
</dependency>
<dependency>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- <version>20160212</version>
- </dependency>
-
- <dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
<scope>provided</scope>
