From 454a7708be01ec50e33e9a6fe342bdac085a52d2 Mon Sep 17 00:00:00 2001 From: Arvind Krishnakumar <61501885+arvindkrishnakumar-okta@users.noreply.github.com> Date: Mon, 16 May 2022 08:21:23 -0500 Subject: [PATCH 01/27] Added Circle CI config --- .circleci/config.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 000000000..c0064d51b --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,18 @@ +version: 2.1 + +jobs: + build: + docker: + - image: circleci/openjdk:11-jdk + environment: + JVM_OPTS: -Xmx3200m + steps: + - checkout + - run: + name: Build + command: ./src/ci/build.sh + +workflows: + build_and_test: + jobs: + - build From 63401d557063408a1c51f49bff4df2658db86efa Mon Sep 17 00:00:00 2001 From: Arvind Krishnakumar <61501885+arvindkrishnakumar-okta@users.noreply.github.com> Date: Mon, 16 May 2022 08:55:01 -0500 Subject: [PATCH 02/27] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c0064d51b..e262a1349 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2.1 jobs: build: docker: - - image: circleci/openjdk:11-jdk + - image: cimg/openjdk:11-jdk environment: JVM_OPTS: -Xmx3200m steps: From fe78bc32e436dca31af91f871443ab076df88a08 Mon Sep 17 00:00:00 2001 From: Arvind Krishnakumar <61501885+arvindkrishnakumar-okta@users.noreply.github.com> Date: Mon, 16 May 2022 08:56:36 -0500 Subject: [PATCH 03/27] Create config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e262a1349..0151eb43f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2.1 jobs: build: docker: - - image: cimg/openjdk:11-jdk + - image: cimg/openjdk:17.0.3 environment: JVM_OPTS: -Xmx3200m steps: From 00702a83ee01698ee439a674db638b7178211c0c Mon Sep 17 00:00:00 2001 From: Arvind Krishnakumar <61501885+arvindkrishnakumar-okta@users.noreply.github.com> Date: Mon, 16 May 2022 09:03:59 -0500 Subject: [PATCH 04/27] Update config.yml --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0151eb43f..c3121e987 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,9 +10,10 @@ jobs: - checkout - run: name: Build - command: ./src/ci/build.sh + command: ./mvn clean install -Pci workflows: build_and_test: jobs: - build + - test From f50cdb8f698b83f7df21ff474cb8956d67d0e8e3 Mon Sep 17 00:00:00 2001 From: Arvind Krishnakumar <61501885+arvindkrishnakumar-okta@users.noreply.github.com> Date: Mon, 16 May 2022 09:05:03 -0500 Subject: [PATCH 05/27] Update config.yml --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c3121e987..8f41bd15c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,4 +16,3 @@ workflows: build_and_test: jobs: - build - - test From 3b71e0b6fb6432e4008bee961bfd4f4c2ea82db3 Mon Sep 17 00:00:00 2001 From: Arvind Krishnakumar <61501885+arvindkrishnakumar-okta@users.noreply.github.com> Date: Mon, 16 May 2022 09:06:00 -0500 Subject: [PATCH 06/27] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8f41bd15c..8cfc7f557 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,7 +10,7 @@ jobs: - checkout - run: name: Build - command: ./mvn clean install -Pci + command: ./mvnw clean install -Pci workflows: build_and_test: From 0eaecb535c31704ebd164ba54b2cd65a2adbe098 Mon Sep 17 00:00:00 2001 From: Arvind Krishnakumar <61501885+arvindkrishnakumar-okta@users.noreply.github.com> Date: Mon, 16 May 2022 09:12:44 -0500 Subject: [PATCH 07/27] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8cfc7f557..7d01662be 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2.1 jobs: build: docker: - - image: cimg/openjdk:17.0.3 + - image: cimg/openjdk:17.0.1 environment: JVM_OPTS: -Xmx3200m steps: From 3fcc5673fdb7eebb0de35f4dd340bdbb9c68f17f Mon Sep 17 00:00:00 2001 From: Arvind Krishnakumar <61501885+arvindkrishnakumar-okta@users.noreply.github.com> Date: Mon, 16 May 2022 09:15:23 -0500 Subject: [PATCH 08/27] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7d01662be..91e9b439a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2.1 jobs: build: docker: - - image: cimg/openjdk:17.0.1 + - image: cimg/openjdk:11.0.13 environment: JVM_OPTS: -Xmx3200m steps: From fd3f867126849763957c114a868d5d3add7c76b4 Mon Sep 17 00:00:00 2001 From: Arvind Krishnakumar <61501885+arvindkrishnakumar-okta@users.noreply.github.com> Date: Mon, 16 May 2022 09:18:44 -0500 Subject: [PATCH 09/27] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 91e9b439a..8579cfdd3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2.1 jobs: build: docker: - - image: cimg/openjdk:11.0.13 + - image: cimg/openjdk:8.0.292 environment: JVM_OPTS: -Xmx3200m steps: From 807e1044d0b1cdeac574fdd5549fc22b8fac31da Mon Sep 17 00:00:00 2001 From: Arvind Krishnakumar <61501885+arvindkrishnakumar-okta@users.noreply.github.com> Date: Mon, 16 May 2022 09:24:26 -0500 Subject: [PATCH 10/27] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8579cfdd3..d87cd7339 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,7 +10,7 @@ jobs: - checkout - run: name: Build - command: ./mvnw clean install -Pci + command: ./mvnw -e -X clean install -Pci workflows: build_and_test: From 921b2a1b820aeb00c6b278cecc899dbf17cfbeed Mon Sep 17 00:00:00 2001 From: Arvind Krishnakumar <61501885+arvindkrishnakumar-okta@users.noreply.github.com> Date: Mon, 16 May 2022 09:35:19 -0500 Subject: [PATCH 11/27] Update config.yml --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index d87cd7339..fff4cc892 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,6 +8,7 @@ jobs: JVM_OPTS: -Xmx3200m steps: - checkout + - run: java --version - run: name: Build command: ./mvnw -e -X clean install -Pci From 5fe0b8644a5c0a4949e6dd0be4518b0d11b1efd3 Mon Sep 17 00:00:00 2001 From: Arvind Krishnakumar <61501885+arvindkrishnakumar-okta@users.noreply.github.com> Date: Mon, 16 May 2022 09:35:32 -0500 Subject: [PATCH 12/27] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fff4cc892..9211c950d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,7 +11,7 @@ jobs: - run: java --version - run: name: Build - command: ./mvnw -e -X clean install -Pci + command: ./mvnw clean install -Pci workflows: build_and_test: From 3a33b8a67af7da7ea6e9102d3585d189c3fad882 Mon Sep 17 00:00:00 2001 From: Arvind Krishnakumar <61501885+arvindkrishnakumar-okta@users.noreply.github.com> Date: Mon, 16 May 2022 09:36:07 -0500 Subject: [PATCH 13/27] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9211c950d..a5578f151 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,7 +8,7 @@ jobs: JVM_OPTS: -Xmx3200m steps: - checkout - - run: java --version + - run: java -version - run: name: Build command: ./mvnw clean install -Pci From c4b8e752d275d81032464c5d1be29219709d526f Mon Sep 17 00:00:00 2001 From: Arvind Krishnakumar <61501885+arvindkrishnakumar-okta@users.noreply.github.com> Date: Mon, 16 May 2022 10:08:45 -0500 Subject: [PATCH 14/27] Update pom.xml --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index 6cb46239f..8d846b3db 100644 --- a/pom.xml +++ b/pom.xml @@ -125,6 +125,11 @@ + + org.apache.maven.plugins + maven-surefire-plugin + 2.19.1 + com.okta okta-code-snippet-maven-plugin From 71d1b790f19bd5321ce9e0f5b9b562d2001d544d Mon Sep 17 00:00:00 2001 From: Arvind Krishnakumar <61501885+arvindkrishnakumar-okta@users.noreply.github.com> Date: Mon, 16 May 2022 10:10:51 -0500 Subject: [PATCH 15/27] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8d846b3db..95cdf1cb8 100644 --- a/pom.xml +++ b/pom.xml @@ -128,7 +128,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.19.1 + 3.0.0-M6 com.okta From b07306dcc4b805caa3fab3b1ae5151dba420c999 Mon Sep 17 00:00:00 2001 From: Arvind Krishnakumar <61501885+arvindkrishnakumar-okta@users.noreply.github.com> Date: Mon, 16 May 2022 10:13:53 -0500 Subject: [PATCH 16/27] Update pom.xml --- pom.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pom.xml b/pom.xml index 95cdf1cb8..ac61e8a43 100644 --- a/pom.xml +++ b/pom.xml @@ -129,6 +129,9 @@ org.apache.maven.plugins maven-surefire-plugin 3.0.0-M6 + + 0 + com.okta From 8e00b1055b9b9c254f51a7def4933772b9bdf1c8 Mon Sep 17 00:00:00 2001 From: Arvind Krishnakumar <61501885+arvindkrishnakumar-okta@users.noreply.github.com> Date: Mon, 16 May 2022 10:21:32 -0500 Subject: [PATCH 17/27] Update pom.xml --- integration-tests/pom.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index e7bffee64..c5eae369e 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -116,4 +116,13 @@ + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + From 65fc79845f226aa6ec815885144474868b027c10 Mon Sep 17 00:00:00 2001 From: Arvind Krishnakumar <61501885+arvindkrishnakumar-okta@users.noreply.github.com> Date: Mon, 16 May 2022 10:24:16 -0500 Subject: [PATCH 18/27] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ac61e8a43..f33aac808 100644 --- a/pom.xml +++ b/pom.xml @@ -127,7 +127,7 @@ org.apache.maven.plugins - maven-surefire-plugin + maven-failsafe-plugin 3.0.0-M6 0 From 1840286af2eaf8a06e57a732c6816012190c9908 Mon Sep 17 00:00:00 2001 From: Arvind Krishnakumar <61501885+arvindkrishnakumar-okta@users.noreply.github.com> Date: Mon, 16 May 2022 10:24:33 -0500 Subject: [PATCH 19/27] Update pom.xml --- integration-tests/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index c5eae369e..9a9182e55 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -121,7 +121,7 @@ org.apache.maven.plugins - maven-surefire-plugin + maven-failsafe-plugin From 5b8b93f88975acc54a879c3d63353e377dae8dba Mon Sep 17 00:00:00 2001 From: Arvind Krishnakumar <61501885+arvindkrishnakumar-okta@users.noreply.github.com> Date: Mon, 16 May 2022 10:34:13 -0500 Subject: [PATCH 20/27] Update pom.xml --- pom.xml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index f33aac808..f70b30333 100644 --- a/pom.xml +++ b/pom.xml @@ -125,14 +125,6 @@ - - org.apache.maven.plugins - maven-failsafe-plugin - 3.0.0-M6 - - 0 - - com.okta okta-code-snippet-maven-plugin @@ -160,6 +152,11 @@ + + org.apache.maven.plugins + maven-failsafe-plugin + 3.0.0-M6 + From c121a399c2c62068ac7df28fd8e9c9625e199826 Mon Sep 17 00:00:00 2001 From: Arvind Krishnakumar <61501885+arvindkrishnakumar-okta@users.noreply.github.com> Date: Mon, 16 May 2022 10:34:32 -0500 Subject: [PATCH 21/27] Update pom.xml --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index f70b30333..449644a6b 100644 --- a/pom.xml +++ b/pom.xml @@ -153,9 +153,9 @@ - org.apache.maven.plugins - maven-failsafe-plugin - 3.0.0-M6 + org.apache.maven.plugins + maven-failsafe-plugin + 3.0.0-M6 From 3e058f8cc1c762fc01d2c12ac2e2d07c21be1a2b Mon Sep 17 00:00:00 2001 From: Arvind Krishnakumar <61501885+arvindkrishnakumar-okta@users.noreply.github.com> Date: Mon, 16 May 2022 10:34:49 -0500 Subject: [PATCH 22/27] Update pom.xml --- integration-tests/pom.xml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 9a9182e55..e7bffee64 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -116,13 +116,4 @@ - - - - - org.apache.maven.plugins - maven-failsafe-plugin - - - From 30670532adffaf7eeae1c8651e2b2677bbb37649 Mon Sep 17 00:00:00 2001 From: Arvind Krishnakumar <61501885+arvindkrishnakumar-okta@users.noreply.github.com> Date: Mon, 16 May 2022 10:43:07 -0500 Subject: [PATCH 23/27] Update config.yml --- .circleci/config.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index a5578f151..b69b835f7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,4 +1,5 @@ version: 2.1 +shared: &shared jobs: build: @@ -6,14 +7,29 @@ jobs: - image: cimg/openjdk:8.0.292 environment: JVM_OPTS: -Xmx3200m + steps: - checkout - run: java -version - run: name: Build command: ./mvnw clean install -Pci + + jdk8: + docker: + - image: cimg/openjdk:8.0.292 + <<: *shared + + jdk11: + docker: + - image: cimg/openjdk:11.0.13 + <<: *shared workflows: + work: + jobs: + - jdk8 + - jdk11 build_and_test: jobs: - build From fde603fd03b558b5e1fb157624df59bfbf5a8e49 Mon Sep 17 00:00:00 2001 From: Arvind Krishnakumar <61501885+arvindkrishnakumar-okta@users.noreply.github.com> Date: Mon, 16 May 2022 10:43:27 -0500 Subject: [PATCH 24/27] Update config.yml --- .circleci/config.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b69b835f7..a696aa15e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,8 +3,7 @@ shared: &shared jobs: build: - docker: - - image: cimg/openjdk:8.0.292 + environment: JVM_OPTS: -Xmx3200m From 8f836c35bdf5a9fdd1d419dca0c2b17ee4884517 Mon Sep 17 00:00:00 2001 From: Arvind Krishnakumar <61501885+arvindkrishnakumar-okta@users.noreply.github.com> Date: Mon, 16 May 2022 10:44:26 -0500 Subject: [PATCH 25/27] Update config.yml --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a696aa15e..8b7c870d8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,14 +14,14 @@ jobs: name: Build command: ./mvnw clean install -Pci - jdk8: - docker: - - image: cimg/openjdk:8.0.292 + jdk8: + docker: + - image: cimg/openjdk:8.0.292 <<: *shared - jdk11: - docker: - - image: cimg/openjdk:11.0.13 + jdk11: + docker: + - image: cimg/openjdk:11.0.13 <<: *shared workflows: From 4b2209107666d8e98332aaa471df8c185c825acb Mon Sep 17 00:00:00 2001 From: Arvind Krishnakumar <61501885+arvindkrishnakumar-okta@users.noreply.github.com> Date: Mon, 16 May 2022 10:55:16 -0500 Subject: [PATCH 26/27] Update config.yml --- .circleci/config.yml | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8b7c870d8..da03068a7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,34 +1,19 @@ version: 2.1 -shared: &shared jobs: build: - + docker: + - image: cimg/openjdk:17.0.3 environment: JVM_OPTS: -Xmx3200m - steps: - checkout - run: java -version - run: name: Build command: ./mvnw clean install -Pci - - jdk8: - docker: - - image: cimg/openjdk:8.0.292 - <<: *shared - - jdk11: - docker: - - image: cimg/openjdk:11.0.13 - <<: *shared workflows: - work: - jobs: - - jdk8 - - jdk11 build_and_test: jobs: - build From b67f7b3256b1e7f050374c54b5cf12f1bcd227c6 Mon Sep 17 00:00:00 2001 From: Arvind Krishnakumar <61501885+arvindkrishnakumar-okta@users.noreply.github.com> Date: Mon, 16 May 2022 11:02:44 -0500 Subject: [PATCH 27/27] Update config.yml --- .circleci/config.yml | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index da03068a7..bf9626f77 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,32 @@ version: 2.1 jobs: - build: + + jdk8: + docker: + - image: cimg/openjdk:8.0.322 + environment: + JVM_OPTS: -Xmx3200m + steps: + - checkout + - run: java -version + - run: + name: Build + command: ./mvnw clean install -Pci + + jdk11: + docker: + - image: cimg/openjdk:11.0.13 + environment: + JVM_OPTS: -Xmx3200m + steps: + - checkout + - run: java -version + - run: + name: Build + command: ./mvnw clean install -Pci + + jdk17: docker: - image: cimg/openjdk:17.0.3 environment: @@ -16,4 +41,6 @@ jobs: workflows: build_and_test: jobs: - - build + - jdk8 + - jdk11 + - jdk17