Merge pull request #509 from okta/ak_update_cci_jdks

Prep for 3.x
okta · Jun 27, 2024 · 58b4777 · 58b4777
2 parents bc7c0ea + 864f316
commit 58b4777
Show file tree

Hide file tree

Showing 15 changed files with 322 additions and 220 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -18,27 +18,28 @@ aliases:
         command: cat integration-tests/target/failsafe-reports/*dump*
 
 jobs:
-  jdk8:
+
+  jdk11:
     docker:
-      - image: cimg/openjdk:8.0.362-node
+      - image: cimg/openjdk:11.0.22-node
     environment:
       JVM_OPTS: -Xmx3200m
     resource_class: large
     parallelism: 3
     steps: *build_steps
 
-  jdk11:
+  jdk17:
     docker:
-      - image: cimg/openjdk:11.0.18-node
+      - image: cimg/openjdk:17.0.11-node
     environment:
       JVM_OPTS: -Xmx3200m
     resource_class: large
     parallelism: 3
     steps: *build_steps
 
-  jdk17:
+  jdk21:
     docker:
-      - image: cimg/openjdk:17.0.6-node
+      - image: cimg/openjdk:21.0.2-node
     environment:
       JVM_OPTS: -Xmx3200m
     resource_class: large
@@ -47,7 +48,7 @@ jobs:
 
   snyk-scan:
     docker:
-      - image: cimg/openjdk:17.0.6-node
+      - image: cimg/openjdk:21.0.2-node
     steps:
       - checkout
       - run: ./mvnw clean install -Pci -Dlicense.skip=true -Dmaven.test.skip.exec=true
@@ -64,15 +65,15 @@ workflows:
       - general-platform-helpers/job-secrets-obtain:
           name: cache-secrets
           secret-key: "OKTA_CLIENT_ORGURL;OKTA_CLIENT_TOKEN;OKTA_AUTHN_ITS_MFAENROLLGROUPID"
-      - jdk8:
-          requires:
-            - cache-secrets
       - jdk11:
           requires:
             - cache-secrets
       - jdk17:
           requires:
             - cache-secrets
+      - jdk21:
+          requires:
+            - cache-secrets
       - general-platform-helpers/job-semgrep-prepare:
           name: semgrep-prepare
       - general-platform-helpers/job-semgrep-scan:
@@ -82,7 +83,7 @@ workflows:
       - general-platform-helpers/job-snyk-prepare:
           name: prepare-snyk
           requires:
-            - jdk17
+            - jdk21
       - snyk-scan:
           name: execute-snyk
           requires:

diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
@@ -1,17 +1,23 @@
 #
-# Copyright 2018 Okta, Inc.
+# Copyright 2018-Present Okta, Inc.
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.0/apache-maven-3.6.0-bin.zip
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+wrapperVersion=3.3.2
+distributionType=bin
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.8/apache-maven-3.9.8-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar
diff --git a/README.md b/README.md
@@ -17,6 +17,10 @@
 
 The Okta Authentication SDK is a convenience wrapper around [Okta's Authentication API](https://developer.okta.com/docs/api/resources/authn.html).
 
+### Prerequisites
+
+* Java 11 or later
+
 ## Is This Library Right for Me?
 
 This SDK is a convenient HTTP client wrapper for [Okta's Authentication API](https://developer.okta.com/docs/api/resources/authn/). These APIs are powerful and useful if you need to achieve one of these cases:

diff --git a/android/pom.xml b/android/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.okta.authn.sdk</groupId>
         <artifactId>okta-authn-parent</artifactId>
-        <version>2.0.12-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>okta-authn-sdk-android</artifactId>

diff --git a/api/pom.xml b/api/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.okta.authn.sdk</groupId>
         <artifactId>okta-authn-parent</artifactId>
-        <version>2.0.12-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>okta-authn-sdk-api</artifactId>

diff --git a/coverage/pom.xml b/coverage/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.okta.authn.sdk</groupId>
         <artifactId>okta-authn-parent</artifactId>
-        <version>2.0.12-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>okta-authn-sdk-coverage</artifactId>

diff --git a/examples/doc-examples/pom.xml b/examples/doc-examples/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.okta.authn.sdk</groupId>
         <artifactId>okta-authn-parent</artifactId>
-        <version>2.0.12-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
 

diff --git a/examples/example-webapp/pom.xml b/examples/example-webapp/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.okta.authn.sdk</groupId>
         <artifactId>okta-authn-parent</artifactId>
-        <version>2.0.12-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
 

diff --git a/examples/shiro-mustache/pom.xml b/examples/shiro-mustache/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.okta.authn.sdk</groupId>
         <artifactId>okta-authn-parent</artifactId>
-        <version>2.0.12-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
 

diff --git a/impl/pom.xml b/impl/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.okta.authn.sdk</groupId>
         <artifactId>okta-authn-parent</artifactId>
-        <version>2.0.12-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>okta-authn-sdk-impl</artifactId>

diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.okta.authn.sdk</groupId>
         <artifactId>okta-authn-parent</artifactId>
-        <version>2.0.12-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>okta-authn-sdk-integration-tests</artifactId>