Merge pull request #29 from mpmadhavig/master

Replace okio with okio-jvm
wso2-extensions · Dec 12, 2024 · 2765e68 · 2765e68
2 parents 7c6a62b + 56cf72c
commit 2765e68
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/.github/workflows/pr-builder.yml b/.github/workflows/pr-builder.yml
@@ -1,7 +1,7 @@
 # This workflow will build the project on pull requests with tests
 # Uses:
 #   OS: ubuntu-lates
-#   JDK: Adopt JDK 8
+#   JDK: Adopt JDK 17
 
 name: PR Builder
 
@@ -19,10 +19,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up Adopt JDK 8
+      - name: Set up Adopt JDK 17
         uses: actions/setup-java@v2
         with:
-          java-version: "8"
+          java-version: "17"
           distribution: "adopt"
       - name: Cache local Maven repository
         id: cache-maven-m2

diff --git a/pom.xml b/pom.xml
@@ -25,7 +25,7 @@
     <artifactId>org.wso2.carbon.extension.identity.scim2.client</artifactId>
     <packaging>bundle</packaging>
     <name>identity-client-scim2</name>
-    <version>2.0.3-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
 
     <licenses>
         <license>
@@ -87,13 +87,18 @@
         <dependency>
             <groupId>org.wso2.charon</groupId>
             <artifactId>org.wso2.charon3.core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.squareup.okio</groupId>
+                    <artifactId>okio</artifactId>
+                </exclusion>
+            </exclusions>
             <version>${charon.version}</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okio</groupId>
-            <artifactId>okio</artifactId>
-            <version>3.6.0</version>
-            <scope>provided</scope>
+            <artifactId>okio-jvm</artifactId>
+            <version>3.9.0</version>
         </dependency>
         <dependency>
             <groupId>commons-lang.wso2</groupId>