From 8c0ac483b4b3c77a5b65bff1f87e7083949a2a73 Mon Sep 17 00:00:00 2001 From: aasgoel Date: Tue, 11 Jun 2024 12:04:54 +0530 Subject: [PATCH 01/47] Update .gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index a530464af..714cdef53 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,6 @@ hs_err_pid* target .gradle build + +#Adding DS Store files to ignore +.DS_Store From c43d799cb567cb2c94559b64d17b98709db001a4 Mon Sep 17 00:00:00 2001 From: aasgoel Date: Tue, 11 Jun 2024 19:37:44 +0530 Subject: [PATCH 02/47] Added the Github Workflow --- .github/workflows/java-workflow.yml | 57 +++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 .github/workflows/java-workflow.yml diff --git a/.github/workflows/java-workflow.yml b/.github/workflows/java-workflow.yml new file mode 100644 index 000000000..017418359 --- /dev/null +++ b/.github/workflows/java-workflow.yml @@ -0,0 +1,57 @@ +name: Java workflow to run Java rest Samples +on: + push: +env: + CLIENT_FOLDER: 'cybersource-rest-client-java' + SAMPLE_FOLDER: 'cybersource-rest-samples-java' +jobs: + complete-job: + defaults: + run: + shell: bash + strategy: + matrix: + operating-system: [ubuntu-latest,macos-latest,windows-latest] + # java-version: ['3.6','3.7','3.8','3.9','3.10','3.11','3.12'] + # include: + # - operating-system: ubuntu-20.04 + # pyth-version: '3.6' + # - operating-system: macos-13 + # pyth-version: '3.6' + # - operating-system: macos-13 + # pyth-version: '3.7' + # exclude: + # - operating-system: macos-latest + # pyth-version: '3.6' + # - operating-system: macos-latest + # pyth-version: '3.7' + # - operating-system: ubuntu-latest + # pyth-version: '3.6' + # - operating-system: windows-latest + # pyth-version: '3.6' + runs-on: ${{matrix.operating-system}} + continue-on-error: true + steps: + - name: Making separate folders + run: | + rm -rf $CLIENT_FOLDER + rm -rf $SAMPLE_FOLDER + mkdir $CLIENT_FOLDER $SAMPLE_FOLDER + - name: Adding client + uses: actions/checkout@v4 + with: + path: ${{env.CLIENT_FOLDER}} + - name: Adding sample + uses: actions/checkout@v4 + with: + repository: 'CyberSource/cybersource-rest-samples-java' + ref: 'testing-branch' + path: ${{env.SAMPLE_FOLDER}} + - name: Building the Projects + run: | + cd '$CLIENT_FOLDER' + mvn clean install + cd .. + cd '$SAMPLE_FOLDER' + mvn clean install + echo "Done Building" From fbf9f977c419a23f754d56dc4e47d4431e0cf833 Mon Sep 17 00:00:00 2001 From: aasgoel Date: Tue, 11 Jun 2024 19:42:01 +0530 Subject: [PATCH 03/47] Update java-workflow.yml --- .github/workflows/java-workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/java-workflow.yml b/.github/workflows/java-workflow.yml index 017418359..64f70cc69 100644 --- a/.github/workflows/java-workflow.yml +++ b/.github/workflows/java-workflow.yml @@ -49,9 +49,9 @@ jobs: path: ${{env.SAMPLE_FOLDER}} - name: Building the Projects run: | - cd '$CLIENT_FOLDER' + cd $CLIENT_FOLDER mvn clean install cd .. - cd '$SAMPLE_FOLDER' + cd $SAMPLE_FOLDER mvn clean install echo "Done Building" From 39bf205dcb882997735d66c0fc1d0efe0468a042 Mon Sep 17 00:00:00 2001 From: aasgoel Date: Wed, 12 Jun 2024 12:29:21 +0530 Subject: [PATCH 04/47] Update java-workflow.yml --- .github/workflows/java-workflow.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/java-workflow.yml b/.github/workflows/java-workflow.yml index 64f70cc69..f2a91ea30 100644 --- a/.github/workflows/java-workflow.yml +++ b/.github/workflows/java-workflow.yml @@ -49,6 +49,7 @@ jobs: path: ${{env.SAMPLE_FOLDER}} - name: Building the Projects run: | + mvn -version cd $CLIENT_FOLDER mvn clean install cd .. From fbc68bac00c4fb4926e17ab53552ea68e143a907 Mon Sep 17 00:00:00 2001 From: aasgoel Date: Wed, 12 Jun 2024 12:38:06 +0530 Subject: [PATCH 05/47] Made the change from version java compiler 1.7 to 1.8 --- .github/workflows/java-workflow.yml | 1 + pom.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/java-workflow.yml b/.github/workflows/java-workflow.yml index f2a91ea30..97beba675 100644 --- a/.github/workflows/java-workflow.yml +++ b/.github/workflows/java-workflow.yml @@ -41,6 +41,7 @@ jobs: uses: actions/checkout@v4 with: path: ${{env.CLIENT_FOLDER}} + ref: 'adding-workflows' - name: Adding sample uses: actions/checkout@v4 with: diff --git a/pom.xml b/pom.xml index 06193be8e..e65652946 100644 --- a/pom.xml +++ b/pom.xml @@ -279,7 +279,7 @@ - 1.7 + 1.8 ${java.version} ${java.version} 1.9.0 From b73063d2fd21e778110969fc6ea0bd26e7f3649a Mon Sep 17 00:00:00 2001 From: aasgoel Date: Wed, 12 Jun 2024 14:21:50 +0530 Subject: [PATCH 06/47] Update java-workflow.yml --- .github/workflows/java-workflow.yml | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/.github/workflows/java-workflow.yml b/.github/workflows/java-workflow.yml index 97beba675..057e8fcbd 100644 --- a/.github/workflows/java-workflow.yml +++ b/.github/workflows/java-workflow.yml @@ -12,23 +12,6 @@ jobs: strategy: matrix: operating-system: [ubuntu-latest,macos-latest,windows-latest] - # java-version: ['3.6','3.7','3.8','3.9','3.10','3.11','3.12'] - # include: - # - operating-system: ubuntu-20.04 - # pyth-version: '3.6' - # - operating-system: macos-13 - # pyth-version: '3.6' - # - operating-system: macos-13 - # pyth-version: '3.7' - # exclude: - # - operating-system: macos-latest - # pyth-version: '3.6' - # - operating-system: macos-latest - # pyth-version: '3.7' - # - operating-system: ubuntu-latest - # pyth-version: '3.6' - # - operating-system: windows-latest - # pyth-version: '3.6' runs-on: ${{matrix.operating-system}} continue-on-error: true steps: @@ -57,3 +40,10 @@ jobs: cd $SAMPLE_FOLDER mvn clean install echo "Done Building" + - name: Upload the log files and report pdf + uses: actions/upload-artifact@v4 + with: + name: log-files + path: | + ${{env.SAMPLE_FOLDER}} + ${{env.CLIENT_FOLDER}} \ No newline at end of file From f31d16a16d2872448ae8a24f2e5c378793c752f0 Mon Sep 17 00:00:00 2001 From: aasgoel Date: Wed, 12 Jun 2024 14:40:21 +0530 Subject: [PATCH 07/47] Update java-workflow.yml --- .github/workflows/java-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/java-workflow.yml b/.github/workflows/java-workflow.yml index 057e8fcbd..7eb051105 100644 --- a/.github/workflows/java-workflow.yml +++ b/.github/workflows/java-workflow.yml @@ -41,7 +41,7 @@ jobs: mvn clean install echo "Done Building" - name: Upload the log files and report pdf - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v3 with: name: log-files path: | From 084b516eba041ff8253e2ad6190c65eb3479710d Mon Sep 17 00:00:00 2001 From: aasgoel Date: Fri, 5 Jul 2024 10:06:57 +0530 Subject: [PATCH 08/47] adding action and running the workflow --- .github/actions/generate-report/action.yml | 58 ++++++++++++++++++++++ .github/workflows/java-workflow.yml | 46 ++++++++++++----- 2 files changed, 92 insertions(+), 12 deletions(-) create mode 100644 .github/actions/generate-report/action.yml diff --git a/.github/actions/generate-report/action.yml b/.github/actions/generate-report/action.yml new file mode 100644 index 000000000..b37875235 --- /dev/null +++ b/.github/actions/generate-report/action.yml @@ -0,0 +1,58 @@ +name: 'Generate the Report' +description: 'Generates the report using the log-file-name file present just inside the sample folder path provided , given Validation Folder is there inside the sample folder as well' +inputs: + lang: + description: 'The language or framework in which SDK is written needs to be given as an input' + required: true + sample-folder-name: + description: 'The name of the sample folder' + required: true + log-file-name: + description: 'The name of the generated log file' + required: true +outputs: + result-pdf-name: + description: 'the name of the final generated pdf report' + value: ${{steps.generate.outputs.pdfname}} +runs: + using: 'composite' + steps: + - name: Setup Python v3.12 for report generation only + uses: actions/setup-python@v5 + with: + python-version: 3.12 + - name: Installing required python libraries and running the python programs to generate pdf report + id: generate + run : | + export EXPECTED_RES_LANG=${{inputs.lang}} + if [[ "${{inputs.lang}}" == "dotnet" ]] || [[ "${{inputs.lang}}" == "dotnetstandard" ]]; then + export EXPECTED_RES_LANG=csharp + fi + echo $EXPECTED_RES_LANG + python --version + echo "Before Running Report Generation" + cd ${{inputs.sample-folder-name}} + python -m pip install --upgrade pip + python -m venv newve + if [[ "$(uname -s)" == "Linux" ]]; then + echo "In LINUX" + source newve/bin/activate + elif [[ "$(uname -s)" == "Darwin" ]]; then + echo "In MAC" + source newve/bin/activate + else + echo "In Windows" + source newve/Scripts/activate + fi + echo $VIRTUAL_ENV + pip install json2html + pip install xhtml2pdf + pip install bs4 + cd Validation + python sample_code_log_processor.py -l ../../${{inputs.sample-folder-name}}/${{inputs.log-file-name}} -o ../../${{inputs.sample-folder-name}}/${{inputs.lang}}_actual_results.json + python response_code_validator.py -e ExpectedResults/${EXPECTED_RES_LANG}_expected_results.json -a ../../${{inputs.sample-folder-name}}/${{inputs.lang}}_actual_results.json -o ${{inputs.lang}}_validation_results.json + python json_to_prettified_html.py -i ${{inputs.lang}}_validation_results.json -o ${{inputs.lang}}_validation_results.html + cp ${{inputs.lang}}_validation_results.pdf ../ #copying the file to flaatten the directory of the upload artifact,Github Actions doesn't support that as of jun 2024 + echo "pdfname=${{inputs.lang}}_validation_results.pdf" >> $GITHUB_OUTPUT + shell: bash + diff --git a/.github/workflows/java-workflow.yml b/.github/workflows/java-workflow.yml index 7eb051105..14e2b1633 100644 --- a/.github/workflows/java-workflow.yml +++ b/.github/workflows/java-workflow.yml @@ -12,6 +12,7 @@ jobs: strategy: matrix: operating-system: [ubuntu-latest,macos-latest,windows-latest] + java-version: ['8','11','16','17','21'] runs-on: ${{matrix.operating-system}} continue-on-error: true steps: @@ -20,30 +21,51 @@ jobs: rm -rf $CLIENT_FOLDER rm -rf $SAMPLE_FOLDER mkdir $CLIENT_FOLDER $SAMPLE_FOLDER - - name: Adding client + - name: Adding client repo uses: actions/checkout@v4 with: path: ${{env.CLIENT_FOLDER}} - ref: 'adding-workflows' - - name: Adding sample + - name: Adding sample repo uses: actions/checkout@v4 with: repository: 'CyberSource/cybersource-rest-samples-java' ref: 'testing-branch' path: ${{env.SAMPLE_FOLDER}} - - name: Building the Projects - run: | + - name: Setup Java 8 for building the client + uses: actions/setup-java@v2 + with: + distribution: 'temurin' + java-version: '8' + - name: Building the Java Client + run: mvn -version + java -version cd $CLIENT_FOLDER mvn clean install - cd .. + - name: Setup Java version for building the samples + uses: actions/setup-java@v2 + with: + distribution: 'temurin' + java-version: ${{matrix.java-version}} + - name: Building the Projects + run: | + mvn -version + java -version cd $SAMPLE_FOLDER mvn clean install - echo "Done Building" - - name: Upload the log files and report pdf - uses: actions/upload-artifact@v3 + cd target + # java -jar SampleCode.jar > ../output.log + echo HI > ../output.log + - name: Using Report Generation Action + id: report-generation + uses: ./cybersource-rest-client-java/.github/actions/generate-report + with: + lang: java + sample-folder-name: ${{env.SAMPLE_FOLDER}} + log-file-name: output.log + - name: Upload Test Reports + uses: actions/upload-artifact@v4 with: - name: log-files + name: sample-run-report-${{matrix.operating-system}}-java-ver-${{matrix.java-version}} path: | - ${{env.SAMPLE_FOLDER}} - ${{env.CLIENT_FOLDER}} \ No newline at end of file + ${{env.SAMPLE_FOLDER}}/${{steps.report-generation.outputs.result-pdf-name}} \ No newline at end of file From a6b5007ea5e414aa52678a30cc4d7c582a307b28 Mon Sep 17 00:00:00 2001 From: aasgoel Date: Fri, 5 Jul 2024 10:08:17 +0530 Subject: [PATCH 09/47] Update java-workflow.yml --- .github/workflows/java-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/java-workflow.yml b/.github/workflows/java-workflow.yml index 14e2b1633..837757820 100644 --- a/.github/workflows/java-workflow.yml +++ b/.github/workflows/java-workflow.yml @@ -10,11 +10,11 @@ jobs: run: shell: bash strategy: + fail-fast: false matrix: operating-system: [ubuntu-latest,macos-latest,windows-latest] java-version: ['8','11','16','17','21'] runs-on: ${{matrix.operating-system}} - continue-on-error: true steps: - name: Making separate folders run: | From f12c95b448ed51e08b6c9fe4d5cab60813c11501 Mon Sep 17 00:00:00 2001 From: aasgoel Date: Fri, 5 Jul 2024 10:19:18 +0530 Subject: [PATCH 10/47] Update java-workflow.yml --- .github/workflows/java-workflow.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/java-workflow.yml b/.github/workflows/java-workflow.yml index 837757820..2d4ded799 100644 --- a/.github/workflows/java-workflow.yml +++ b/.github/workflows/java-workflow.yml @@ -68,4 +68,6 @@ jobs: with: name: sample-run-report-${{matrix.operating-system}}-java-ver-${{matrix.java-version}} path: | - ${{env.SAMPLE_FOLDER}}/${{steps.report-generation.outputs.result-pdf-name}} \ No newline at end of file + ${{env.SAMPLE_FOLDER}}/${{steps.report-generation.outputs.result-pdf-name}} + +#Running the Java Workflow From 1d89100d4fff6cf13d712169850a6bef74680b4e Mon Sep 17 00:00:00 2001 From: aasgoel Date: Fri, 5 Jul 2024 10:22:39 +0530 Subject: [PATCH 11/47] Update java-workflow.yml --- .github/workflows/java-workflow.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/java-workflow.yml b/.github/workflows/java-workflow.yml index 2d4ded799..408b9f63f 100644 --- a/.github/workflows/java-workflow.yml +++ b/.github/workflows/java-workflow.yml @@ -13,7 +13,7 @@ jobs: fail-fast: false matrix: operating-system: [ubuntu-latest,macos-latest,windows-latest] - java-version: ['8','11','16','17','21'] + java-version: ['8','9','10','11','12','13','14','15','16','17','18','19','20','21','22'] runs-on: ${{matrix.operating-system}} steps: - name: Making separate folders @@ -70,4 +70,3 @@ jobs: path: | ${{env.SAMPLE_FOLDER}}/${{steps.report-generation.outputs.result-pdf-name}} -#Running the Java Workflow From a0d0b286b7a0a18d4ba4f661821ffd6015af17eb Mon Sep 17 00:00:00 2001 From: aasgoel Date: Fri, 5 Jul 2024 10:24:59 +0530 Subject: [PATCH 12/47] Update java-workflow.yml --- .github/workflows/java-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/java-workflow.yml b/.github/workflows/java-workflow.yml index 408b9f63f..2b931c863 100644 --- a/.github/workflows/java-workflow.yml +++ b/.github/workflows/java-workflow.yml @@ -13,7 +13,7 @@ jobs: fail-fast: false matrix: operating-system: [ubuntu-latest,macos-latest,windows-latest] - java-version: ['8','9','10','11','12','13','14','15','16','17','18','19','20','21','22'] + java-version: ['8','11','16','17','18','19','20','21','22'] runs-on: ${{matrix.operating-system}} steps: - name: Making separate folders From 35f90cfbd840325255aa98989995a6e559fa7b8f Mon Sep 17 00:00:00 2001 From: aasgoel Date: Mon, 8 Jul 2024 09:52:50 +0530 Subject: [PATCH 13/47] changed the client version in samples --- .github/workflows/java-workflow.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/java-workflow.yml b/.github/workflows/java-workflow.yml index 2b931c863..3fba197af 100644 --- a/.github/workflows/java-workflow.yml +++ b/.github/workflows/java-workflow.yml @@ -51,7 +51,13 @@ jobs: run: | mvn -version java -version - cd $SAMPLE_FOLDER + cd $CLIENT_FOLDER + RESTCLIENT_SDK_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) + echo $RESTCLIENT_SDK_VERSION + cd ../$SAMPLE_FOLDER + perl -i -spe "BEGIN{undef $/;} s|com\.cybersource<\/groupId>\s*cybersource-rest-client-java<\/artifactId>\s*.*?<\/version>|com.cybersource\n cybersource-rest-client-java\n \${version}|gs" -- -version=$RESTCLIENT_SDK_VERSION pom.xml + cat pom.xml + # sed "s|com\.cybersource<\/groupId>\s*cybersource-rest-client-java<\/artifactId>\s*.*<\/version>|com.cybersource\n cybersource-rest-client-java\n ${RESTCLIENT_SDK_VERSION}|g" pom.xml > temp && mv temp pom.xml mvn clean install cd target # java -jar SampleCode.jar > ../output.log From 4bafde29987bdfdba7855862c4c236b935ce83c0 Mon Sep 17 00:00:00 2001 From: aasgoel Date: Mon, 8 Jul 2024 10:12:12 +0530 Subject: [PATCH 14/47] Update java-workflow.yml --- .github/workflows/java-workflow.yml | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/.github/workflows/java-workflow.yml b/.github/workflows/java-workflow.yml index 3fba197af..998f1fcee 100644 --- a/.github/workflows/java-workflow.yml +++ b/.github/workflows/java-workflow.yml @@ -31,6 +31,14 @@ jobs: repository: 'CyberSource/cybersource-rest-samples-java' ref: 'testing-branch' path: ${{env.SAMPLE_FOLDER}} + - name: Replace the Version of Cybersource Client in Samples + run: | + cd $CLIENT_FOLDER + RESTCLIENT_SDK_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) + echo $RESTCLIENT_SDK_VERSION + cd ../$SAMPLE_FOLDER + perl -i -spe "BEGIN{undef $/;} s|com\.cybersource<\/groupId>\s*cybersource-rest-client-java<\/artifactId>\s*.*?<\/version>|com.cybersource\n cybersource-rest-client-java\n \${version}|gs" -- -version=$RESTCLIENT_SDK_VERSION pom.xml + cat pom.xml - name: Setup Java 8 for building the client uses: actions/setup-java@v2 with: @@ -51,12 +59,12 @@ jobs: run: | mvn -version java -version - cd $CLIENT_FOLDER - RESTCLIENT_SDK_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) - echo $RESTCLIENT_SDK_VERSION - cd ../$SAMPLE_FOLDER - perl -i -spe "BEGIN{undef $/;} s|com\.cybersource<\/groupId>\s*cybersource-rest-client-java<\/artifactId>\s*.*?<\/version>|com.cybersource\n cybersource-rest-client-java\n \${version}|gs" -- -version=$RESTCLIENT_SDK_VERSION pom.xml - cat pom.xml + # cd $CLIENT_FOLDER + # RESTCLIENT_SDK_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) + # echo $RESTCLIENT_SDK_VERSION + # cd ../$SAMPLE_FOLDER + # perl -i -spe "BEGIN{undef $/;} s|com\.cybersource<\/groupId>\s*cybersource-rest-client-java<\/artifactId>\s*.*?<\/version>|com.cybersource\n cybersource-rest-client-java\n \${version}|gs" -- -version=$RESTCLIENT_SDK_VERSION pom.xml + # cat pom.xml # sed "s|com\.cybersource<\/groupId>\s*cybersource-rest-client-java<\/artifactId>\s*.*<\/version>|com.cybersource\n cybersource-rest-client-java\n ${RESTCLIENT_SDK_VERSION}|g" pom.xml > temp && mv temp pom.xml mvn clean install cd target From 2ff3a7f8bc671c1158ff4e01bcfbb3f869db05ae Mon Sep 17 00:00:00 2001 From: aasgoel Date: Mon, 8 Jul 2024 10:13:35 +0530 Subject: [PATCH 15/47] Update java-workflow.yml --- .github/workflows/java-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/java-workflow.yml b/.github/workflows/java-workflow.yml index 998f1fcee..a51de18bc 100644 --- a/.github/workflows/java-workflow.yml +++ b/.github/workflows/java-workflow.yml @@ -62,7 +62,7 @@ jobs: # cd $CLIENT_FOLDER # RESTCLIENT_SDK_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) # echo $RESTCLIENT_SDK_VERSION - # cd ../$SAMPLE_FOLDER + cd ../$SAMPLE_FOLDER # perl -i -spe "BEGIN{undef $/;} s|com\.cybersource<\/groupId>\s*cybersource-rest-client-java<\/artifactId>\s*.*?<\/version>|com.cybersource\n cybersource-rest-client-java\n \${version}|gs" -- -version=$RESTCLIENT_SDK_VERSION pom.xml # cat pom.xml # sed "s|com\.cybersource<\/groupId>\s*cybersource-rest-client-java<\/artifactId>\s*.*<\/version>|com.cybersource\n cybersource-rest-client-java\n ${RESTCLIENT_SDK_VERSION}|g" pom.xml > temp && mv temp pom.xml From ce8bd7b5a1a06546b647102402aa31bcdcbf40a7 Mon Sep 17 00:00:00 2001 From: aasgoel Date: Mon, 8 Jul 2024 10:15:25 +0530 Subject: [PATCH 16/47] Update java-workflow.yml --- .github/workflows/java-workflow.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/java-workflow.yml b/.github/workflows/java-workflow.yml index a51de18bc..4c1a8af84 100644 --- a/.github/workflows/java-workflow.yml +++ b/.github/workflows/java-workflow.yml @@ -50,6 +50,7 @@ jobs: java -version cd $CLIENT_FOLDER mvn clean install + echo Build Successful - name: Setup Java version for building the samples uses: actions/setup-java@v2 with: @@ -62,7 +63,7 @@ jobs: # cd $CLIENT_FOLDER # RESTCLIENT_SDK_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) # echo $RESTCLIENT_SDK_VERSION - cd ../$SAMPLE_FOLDER + cd $SAMPLE_FOLDER # perl -i -spe "BEGIN{undef $/;} s|com\.cybersource<\/groupId>\s*cybersource-rest-client-java<\/artifactId>\s*.*?<\/version>|com.cybersource\n cybersource-rest-client-java\n \${version}|gs" -- -version=$RESTCLIENT_SDK_VERSION pom.xml # cat pom.xml # sed "s|com\.cybersource<\/groupId>\s*cybersource-rest-client-java<\/artifactId>\s*.*<\/version>|com.cybersource\n cybersource-rest-client-java\n ${RESTCLIENT_SDK_VERSION}|g" pom.xml > temp && mv temp pom.xml From 7df2f3d023c5e90ea1ae21190c432f4eab66b9e9 Mon Sep 17 00:00:00 2001 From: aasgoel Date: Mon, 8 Jul 2024 10:24:55 +0530 Subject: [PATCH 17/47] Update java-workflow.yml --- .github/workflows/java-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/java-workflow.yml b/.github/workflows/java-workflow.yml index 4c1a8af84..50ae383d9 100644 --- a/.github/workflows/java-workflow.yml +++ b/.github/workflows/java-workflow.yml @@ -67,7 +67,7 @@ jobs: # perl -i -spe "BEGIN{undef $/;} s|com\.cybersource<\/groupId>\s*cybersource-rest-client-java<\/artifactId>\s*.*?<\/version>|com.cybersource\n cybersource-rest-client-java\n \${version}|gs" -- -version=$RESTCLIENT_SDK_VERSION pom.xml # cat pom.xml # sed "s|com\.cybersource<\/groupId>\s*cybersource-rest-client-java<\/artifactId>\s*.*<\/version>|com.cybersource\n cybersource-rest-client-java\n ${RESTCLIENT_SDK_VERSION}|g" pom.xml > temp && mv temp pom.xml - mvn clean install + mvn -X -e clean install cd target # java -jar SampleCode.jar > ../output.log echo HI > ../output.log From 411cc3ae889f1cbc19678286447f03d3928d2747 Mon Sep 17 00:00:00 2001 From: aasgoel Date: Mon, 8 Jul 2024 10:27:38 +0530 Subject: [PATCH 18/47] Update java-workflow.yml --- .github/workflows/java-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/java-workflow.yml b/.github/workflows/java-workflow.yml index 50ae383d9..e5e47fa97 100644 --- a/.github/workflows/java-workflow.yml +++ b/.github/workflows/java-workflow.yml @@ -49,7 +49,7 @@ jobs: mvn -version java -version cd $CLIENT_FOLDER - mvn clean install + mvn -X -e clean install echo Build Successful - name: Setup Java version for building the samples uses: actions/setup-java@v2 From 9bc7e488165e6376df63008218bb9411fc97cf92 Mon Sep 17 00:00:00 2001 From: aasgoel Date: Mon, 8 Jul 2024 12:13:00 +0530 Subject: [PATCH 19/47] Update java-workflow.yml --- .github/workflows/java-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/java-workflow.yml b/.github/workflows/java-workflow.yml index e5e47fa97..b2ac95759 100644 --- a/.github/workflows/java-workflow.yml +++ b/.github/workflows/java-workflow.yml @@ -37,7 +37,7 @@ jobs: RESTCLIENT_SDK_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) echo $RESTCLIENT_SDK_VERSION cd ../$SAMPLE_FOLDER - perl -i -spe "BEGIN{undef $/;} s|com\.cybersource<\/groupId>\s*cybersource-rest-client-java<\/artifactId>\s*.*?<\/version>|com.cybersource\n cybersource-rest-client-java\n \${version}|gs" -- -version=$RESTCLIENT_SDK_VERSION pom.xml + # perl -i -spe "BEGIN{undef $/;} s|com\.cybersource<\/groupId>\s*cybersource-rest-client-java<\/artifactId>\s*.*?<\/version>|com.cybersource\n cybersource-rest-client-java\n \${version}|gs" -- -version=$RESTCLIENT_SDK_VERSION pom.xml cat pom.xml - name: Setup Java 8 for building the client uses: actions/setup-java@v2 From cebd3827034a91489817f2f7b34adb2384fb01bd Mon Sep 17 00:00:00 2001 From: aasgoel Date: Mon, 8 Jul 2024 12:21:05 +0530 Subject: [PATCH 20/47] Update java-workflow.yml --- .github/workflows/java-workflow.yml | 40 ++++++++++++++--------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/java-workflow.yml b/.github/workflows/java-workflow.yml index b2ac95759..b9872d1b1 100644 --- a/.github/workflows/java-workflow.yml +++ b/.github/workflows/java-workflow.yml @@ -31,26 +31,26 @@ jobs: repository: 'CyberSource/cybersource-rest-samples-java' ref: 'testing-branch' path: ${{env.SAMPLE_FOLDER}} - - name: Replace the Version of Cybersource Client in Samples - run: | - cd $CLIENT_FOLDER - RESTCLIENT_SDK_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) - echo $RESTCLIENT_SDK_VERSION - cd ../$SAMPLE_FOLDER - # perl -i -spe "BEGIN{undef $/;} s|com\.cybersource<\/groupId>\s*cybersource-rest-client-java<\/artifactId>\s*.*?<\/version>|com.cybersource\n cybersource-rest-client-java\n \${version}|gs" -- -version=$RESTCLIENT_SDK_VERSION pom.xml - cat pom.xml - - name: Setup Java 8 for building the client - uses: actions/setup-java@v2 - with: - distribution: 'temurin' - java-version: '8' - - name: Building the Java Client - run: - mvn -version - java -version - cd $CLIENT_FOLDER - mvn -X -e clean install - echo Build Successful + # - name: Replace the Version of Cybersource Client in Samples + # run: | + # cd $CLIENT_FOLDER + # RESTCLIENT_SDK_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) + # echo $RESTCLIENT_SDK_VERSION + # cd ../$SAMPLE_FOLDER + # # perl -i -spe "BEGIN{undef $/;} s|com\.cybersource<\/groupId>\s*cybersource-rest-client-java<\/artifactId>\s*.*?<\/version>|com.cybersource\n cybersource-rest-client-java\n \${version}|gs" -- -version=$RESTCLIENT_SDK_VERSION pom.xml + # cat pom.xml + # - name: Setup Java 8 for building the client + # uses: actions/setup-java@v2 + # with: + # distribution: 'temurin' + # java-version: '8' + # - name: Building the Java Client + # run: + # mvn -version + # java -version + # cd $CLIENT_FOLDER + # mvn -X -e clean install + # echo Build Successful - name: Setup Java version for building the samples uses: actions/setup-java@v2 with: From a59f80001fe0975d1465c0d9d05236cfe8d99443 Mon Sep 17 00:00:00 2001 From: aasgoel Date: Mon, 8 Jul 2024 12:36:02 +0530 Subject: [PATCH 21/47] Update java-workflow.yml --- .github/workflows/java-workflow.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/java-workflow.yml b/.github/workflows/java-workflow.yml index b9872d1b1..0f2c33e1b 100644 --- a/.github/workflows/java-workflow.yml +++ b/.github/workflows/java-workflow.yml @@ -51,6 +51,13 @@ jobs: # cd $CLIENT_FOLDER # mvn -X -e clean install # echo Build Successful + - name: Check and Print Maven settings.xml + run: | + if [ -f ~/.m2/settings.xml ]; then + cat ~/.m2/settings.xml + else + echo "settings.xml does not exist" + fi - name: Setup Java version for building the samples uses: actions/setup-java@v2 with: From eb332c5869949ff1fbe691a7544224851d8a3893 Mon Sep 17 00:00:00 2001 From: aasgoel Date: Mon, 8 Jul 2024 12:38:59 +0530 Subject: [PATCH 22/47] Update java-workflow.yml --- .github/workflows/java-workflow.yml | 44 ++++++++++++++++------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/.github/workflows/java-workflow.yml b/.github/workflows/java-workflow.yml index 0f2c33e1b..a7dd4b60a 100644 --- a/.github/workflows/java-workflow.yml +++ b/.github/workflows/java-workflow.yml @@ -31,26 +31,30 @@ jobs: repository: 'CyberSource/cybersource-rest-samples-java' ref: 'testing-branch' path: ${{env.SAMPLE_FOLDER}} - # - name: Replace the Version of Cybersource Client in Samples - # run: | - # cd $CLIENT_FOLDER - # RESTCLIENT_SDK_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) - # echo $RESTCLIENT_SDK_VERSION - # cd ../$SAMPLE_FOLDER - # # perl -i -spe "BEGIN{undef $/;} s|com\.cybersource<\/groupId>\s*cybersource-rest-client-java<\/artifactId>\s*.*?<\/version>|com.cybersource\n cybersource-rest-client-java\n \${version}|gs" -- -version=$RESTCLIENT_SDK_VERSION pom.xml - # cat pom.xml - # - name: Setup Java 8 for building the client - # uses: actions/setup-java@v2 - # with: - # distribution: 'temurin' - # java-version: '8' - # - name: Building the Java Client - # run: - # mvn -version - # java -version - # cd $CLIENT_FOLDER - # mvn -X -e clean install - # echo Build Successful + - name: Replace the Version of Cybersource Client in Samples + run: | + cd $CLIENT_FOLDER + RESTCLIENT_SDK_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) + echo $RESTCLIENT_SDK_VERSION + cd ../$SAMPLE_FOLDER + # perl -i -spe "BEGIN{undef $/;} s|com\.cybersource<\/groupId>\s*cybersource-rest-client-java<\/artifactId>\s*.*?<\/version>|com.cybersource\n cybersource-rest-client-java\n \${version}|gs" -- -version=$RESTCLIENT_SDK_VERSION pom.xml + cat pom.xml + - name: Setup Java 8 for building the client + uses: actions/setup-java@v2 + with: + distribution: 'temurin' + java-version: '8' + - name: Building the Java Client + run: + mvn -version + java -version + cd $CLIENT_FOLDER + mvn -X -e clean install + echo Build Successful + - name: Install tree and print all files in .m2 directory + run: | + sudo apt-get install -y tree + tree ~/.m2 - name: Check and Print Maven settings.xml run: | if [ -f ~/.m2/settings.xml ]; then From 29a9d3443eb2a63968cf970e28fb878367068743 Mon Sep 17 00:00:00 2001 From: aasgoel Date: Mon, 8 Jul 2024 12:41:26 +0530 Subject: [PATCH 23/47] Update java-workflow.yml --- .github/workflows/java-workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/java-workflow.yml b/.github/workflows/java-workflow.yml index a7dd4b60a..829bbc4a8 100644 --- a/.github/workflows/java-workflow.yml +++ b/.github/workflows/java-workflow.yml @@ -49,8 +49,8 @@ jobs: mvn -version java -version cd $CLIENT_FOLDER - mvn -X -e clean install - echo Build Successful + mvn clean install + echo "Build Successful" - name: Install tree and print all files in .m2 directory run: | sudo apt-get install -y tree From 3c54015b9961ba53e585338ce348229b0295fd1e Mon Sep 17 00:00:00 2001 From: aasgoel Date: Mon, 8 Jul 2024 12:43:43 +0530 Subject: [PATCH 24/47] Update java-workflow.yml --- .github/workflows/java-workflow.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/java-workflow.yml b/.github/workflows/java-workflow.yml index 829bbc4a8..420ae8b2b 100644 --- a/.github/workflows/java-workflow.yml +++ b/.github/workflows/java-workflow.yml @@ -45,12 +45,15 @@ jobs: distribution: 'temurin' java-version: '8' - name: Building the Java Client - run: + run: | mvn -version java -version + pwd cd $CLIENT_FOLDER + ls mvn clean install - echo "Build Successful" + pwd + ls - name: Install tree and print all files in .m2 directory run: | sudo apt-get install -y tree From c0a0ad09666d65f31f21072d4185c31cca0e682e Mon Sep 17 00:00:00 2001 From: aasgoel Date: Mon, 8 Jul 2024 12:46:38 +0530 Subject: [PATCH 25/47] Update java-workflow.yml --- .github/workflows/java-workflow.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/java-workflow.yml b/.github/workflows/java-workflow.yml index 420ae8b2b..8b0ccfe57 100644 --- a/.github/workflows/java-workflow.yml +++ b/.github/workflows/java-workflow.yml @@ -37,7 +37,7 @@ jobs: RESTCLIENT_SDK_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) echo $RESTCLIENT_SDK_VERSION cd ../$SAMPLE_FOLDER - # perl -i -spe "BEGIN{undef $/;} s|com\.cybersource<\/groupId>\s*cybersource-rest-client-java<\/artifactId>\s*.*?<\/version>|com.cybersource\n cybersource-rest-client-java\n \${version}|gs" -- -version=$RESTCLIENT_SDK_VERSION pom.xml + perl -i -spe "BEGIN{undef $/;} s|com\.cybersource<\/groupId>\s*cybersource-rest-client-java<\/artifactId>\s*.*?<\/version>|com.cybersource\n cybersource-rest-client-java\n \${version}|gs" -- -version=$RESTCLIENT_SDK_VERSION pom.xml cat pom.xml - name: Setup Java 8 for building the client uses: actions/setup-java@v2 @@ -48,12 +48,8 @@ jobs: run: | mvn -version java -version - pwd cd $CLIENT_FOLDER - ls mvn clean install - pwd - ls - name: Install tree and print all files in .m2 directory run: | sudo apt-get install -y tree @@ -70,7 +66,7 @@ jobs: with: distribution: 'temurin' java-version: ${{matrix.java-version}} - - name: Building the Projects + - name: Building the Sample PROJECT run: | mvn -version java -version From c5f3cdcea1498ed26edc8e07694c0888c88426d7 Mon Sep 17 00:00:00 2001 From: aasgoel Date: Mon, 8 Jul 2024 12:52:17 +0530 Subject: [PATCH 26/47] Update java-workflow.yml --- .github/workflows/java-workflow.yml | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/.github/workflows/java-workflow.yml b/.github/workflows/java-workflow.yml index 8b0ccfe57..22bf52882 100644 --- a/.github/workflows/java-workflow.yml +++ b/.github/workflows/java-workflow.yml @@ -31,7 +31,7 @@ jobs: repository: 'CyberSource/cybersource-rest-samples-java' ref: 'testing-branch' path: ${{env.SAMPLE_FOLDER}} - - name: Replace the Version of Cybersource Client in Samples + - name: Replace the Version of Cybersource Client in Samples pom file run: | cd $CLIENT_FOLDER RESTCLIENT_SDK_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) @@ -50,17 +50,6 @@ jobs: java -version cd $CLIENT_FOLDER mvn clean install - - name: Install tree and print all files in .m2 directory - run: | - sudo apt-get install -y tree - tree ~/.m2 - - name: Check and Print Maven settings.xml - run: | - if [ -f ~/.m2/settings.xml ]; then - cat ~/.m2/settings.xml - else - echo "settings.xml does not exist" - fi - name: Setup Java version for building the samples uses: actions/setup-java@v2 with: @@ -70,15 +59,8 @@ jobs: run: | mvn -version java -version - # cd $CLIENT_FOLDER - # RESTCLIENT_SDK_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) - # echo $RESTCLIENT_SDK_VERSION cd $SAMPLE_FOLDER - # perl -i -spe "BEGIN{undef $/;} s|com\.cybersource<\/groupId>\s*cybersource-rest-client-java<\/artifactId>\s*.*?<\/version>|com.cybersource\n cybersource-rest-client-java\n \${version}|gs" -- -version=$RESTCLIENT_SDK_VERSION pom.xml - # cat pom.xml - # sed "s|com\.cybersource<\/groupId>\s*cybersource-rest-client-java<\/artifactId>\s*.*<\/version>|com.cybersource\n cybersource-rest-client-java\n ${RESTCLIENT_SDK_VERSION}|g" pom.xml > temp && mv temp pom.xml mvn -X -e clean install - cd target # java -jar SampleCode.jar > ../output.log echo HI > ../output.log - name: Using Report Generation Action From 9571bd2fca272df1627237c3f737de0874707cd2 Mon Sep 17 00:00:00 2001 From: aasgoel Date: Mon, 8 Jul 2024 12:55:07 +0530 Subject: [PATCH 27/47] Update java-workflow.yml --- .github/workflows/java-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/java-workflow.yml b/.github/workflows/java-workflow.yml index 22bf52882..c9bbd926b 100644 --- a/.github/workflows/java-workflow.yml +++ b/.github/workflows/java-workflow.yml @@ -62,7 +62,7 @@ jobs: cd $SAMPLE_FOLDER mvn -X -e clean install # java -jar SampleCode.jar > ../output.log - echo HI > ../output.log + echo HI > output.log - name: Using Report Generation Action id: report-generation uses: ./cybersource-rest-client-java/.github/actions/generate-report From a0981e993c7010f8b515153add273d694d3af7ec Mon Sep 17 00:00:00 2001 From: aasgoel Date: Mon, 8 Jul 2024 13:00:41 +0530 Subject: [PATCH 28/47] Actual run to test whether workflow works or not --- .github/workflows/java-workflow.yml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/java-workflow.yml b/.github/workflows/java-workflow.yml index c9bbd926b..1fa1afe7e 100644 --- a/.github/workflows/java-workflow.yml +++ b/.github/workflows/java-workflow.yml @@ -1,4 +1,4 @@ -name: Java workflow to run Java rest Samples +name: JAVA BUILDS on: push: env: @@ -21,17 +21,17 @@ jobs: rm -rf $CLIENT_FOLDER rm -rf $SAMPLE_FOLDER mkdir $CLIENT_FOLDER $SAMPLE_FOLDER - - name: Adding client repo + - name: Checkout the cybersource-rest-client-java repo uses: actions/checkout@v4 with: path: ${{env.CLIENT_FOLDER}} - - name: Adding sample repo + - name: Checkout the cybersource-rest-samples-java repo uses: actions/checkout@v4 with: repository: 'CyberSource/cybersource-rest-samples-java' ref: 'testing-branch' path: ${{env.SAMPLE_FOLDER}} - - name: Replace the Version of Cybersource Client in Samples pom file + - name: Replace the Version of cybersource-rest-client-java in samples' pom file run: | cd $CLIENT_FOLDER RESTCLIENT_SDK_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) @@ -39,30 +39,31 @@ jobs: cd ../$SAMPLE_FOLDER perl -i -spe "BEGIN{undef $/;} s|com\.cybersource<\/groupId>\s*cybersource-rest-client-java<\/artifactId>\s*.*?<\/version>|com.cybersource\n cybersource-rest-client-java\n \${version}|gs" -- -version=$RESTCLIENT_SDK_VERSION pom.xml cat pom.xml - - name: Setup Java 8 for building the client + - name: Setup Java 8 to Build the Client uses: actions/setup-java@v2 with: distribution: 'temurin' java-version: '8' - - name: Building the Java Client + - name: Build the Java Client run: | mvn -version java -version cd $CLIENT_FOLDER mvn clean install - - name: Setup Java version for building the samples + - name: Setup Java version to Build the samples uses: actions/setup-java@v2 with: distribution: 'temurin' java-version: ${{matrix.java-version}} - - name: Building the Sample PROJECT + - name: Build the Sample Project run: | mvn -version java -version cd $SAMPLE_FOLDER mvn -X -e clean install - # java -jar SampleCode.jar > ../output.log - echo HI > output.log + cd target + java -jar SampleCode.jar > ../output.log + # echo HI > ../output.log - name: Using Report Generation Action id: report-generation uses: ./cybersource-rest-client-java/.github/actions/generate-report From 9e5ec6b2bc13a4c0efd682f14d3c483e80d4842f Mon Sep 17 00:00:00 2001 From: aasgoel Date: Mon, 8 Jul 2024 14:04:25 +0530 Subject: [PATCH 29/47] adding distribution --- .github/workflows/java-workflow.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/java-workflow.yml b/.github/workflows/java-workflow.yml index 1fa1afe7e..9b032acd6 100644 --- a/.github/workflows/java-workflow.yml +++ b/.github/workflows/java-workflow.yml @@ -14,6 +14,14 @@ jobs: matrix: operating-system: [ubuntu-latest,macos-latest,windows-latest] java-version: ['8','11','16','17','18','19','20','21','22'] + distribution: ['temurin','oracle'] + exclude: + - distribution: 'oracle' + java-version: '8' + - distribution: 'oracle' + java-version: '11' + - distribution: 'oracle' + java-version: '16' runs-on: ${{matrix.operating-system}} steps: - name: Making separate folders @@ -53,7 +61,7 @@ jobs: - name: Setup Java version to Build the samples uses: actions/setup-java@v2 with: - distribution: 'temurin' + distribution: ${{matrix.distribution}} java-version: ${{matrix.java-version}} - name: Build the Sample Project run: | @@ -74,7 +82,7 @@ jobs: - name: Upload Test Reports uses: actions/upload-artifact@v4 with: - name: sample-run-report-${{matrix.operating-system}}-java-ver-${{matrix.java-version}} + name: sample-run-report-${{matrix.operating-system}}-${{matrix.distribution}}-java-ver-${{matrix.java-version}} path: | ${{env.SAMPLE_FOLDER}}/${{steps.report-generation.outputs.result-pdf-name}} From 65ad927335d472f16cba89cc4093db194d4b080e Mon Sep 17 00:00:00 2001 From: aasgoel Date: Mon, 8 Jul 2024 14:14:29 +0530 Subject: [PATCH 30/47] Update java-workflow.yml --- .github/workflows/java-workflow.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/java-workflow.yml b/.github/workflows/java-workflow.yml index 9b032acd6..0171217f5 100644 --- a/.github/workflows/java-workflow.yml +++ b/.github/workflows/java-workflow.yml @@ -14,14 +14,14 @@ jobs: matrix: operating-system: [ubuntu-latest,macos-latest,windows-latest] java-version: ['8','11','16','17','18','19','20','21','22'] - distribution: ['temurin','oracle'] - exclude: - - distribution: 'oracle' - java-version: '8' - - distribution: 'oracle' - java-version: '11' - - distribution: 'oracle' - java-version: '16' + distribution: ['temurin'] # ,oracle] + # exclude: + # - distribution: 'oracle' + # java-version: '8' + # - distribution: 'oracle' + # java-version: '11' + # - distribution: 'oracle' + # java-version: '16' runs-on: ${{matrix.operating-system}} steps: - name: Making separate folders From d5db0bedc6a787d3fed35e41db8f5b49146654d6 Mon Sep 17 00:00:00 2001 From: aasgoel Date: Mon, 8 Jul 2024 14:37:47 +0530 Subject: [PATCH 31/47] Adding the Status Badge [no ci] --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 0debeb944..c95c3b70b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ # Java Client SDK for the CyberSource REST API +[![JAVA BUILDS](https://github.com/CyberSource/cybersource-rest-client-java/actions/workflows/java-workflow.yml/badge.svg)](https://github.com/CyberSource/cybersource-rest-client-java/actions/workflows/java-workflow.yml) + ## Description The CyberSource Java client provides convenient access to the [CyberSource REST API](https://developer.cybersource.com/api/reference/api-reference.html) from your Java application. From 0a4cd3117388e04d466cdf8e0c5591207bb99112 Mon Sep 17 00:00:00 2001 From: aasgoel Date: Mon, 8 Jul 2024 16:36:49 +0530 Subject: [PATCH 32/47] Made suggested changes and running the workflow --- .github/workflows/java-workflow.yml | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/.github/workflows/java-workflow.yml b/.github/workflows/java-workflow.yml index 0171217f5..20e3896a0 100644 --- a/.github/workflows/java-workflow.yml +++ b/.github/workflows/java-workflow.yml @@ -14,14 +14,7 @@ jobs: matrix: operating-system: [ubuntu-latest,macos-latest,windows-latest] java-version: ['8','11','16','17','18','19','20','21','22'] - distribution: ['temurin'] # ,oracle] - # exclude: - # - distribution: 'oracle' - # java-version: '8' - # - distribution: 'oracle' - # java-version: '11' - # - distribution: 'oracle' - # java-version: '16' + distribution: ['temurin'] runs-on: ${{matrix.operating-system}} steps: - name: Making separate folders @@ -69,9 +62,8 @@ jobs: java -version cd $SAMPLE_FOLDER mvn -X -e clean install - cd target - java -jar SampleCode.jar > ../output.log - # echo HI > ../output.log + echo "Running Samples" + java -jar target/SampleCode.jar > output.log - name: Using Report Generation Action id: report-generation uses: ./cybersource-rest-client-java/.github/actions/generate-report From eb70afc1ede1dfb6bc299804f4d799e7b974206a Mon Sep 17 00:00:00 2001 From: aasgoel Date: Mon, 8 Jul 2024 16:54:41 +0530 Subject: [PATCH 33/47] Naming Change [no ci] --- .github/workflows/java-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/java-workflow.yml b/.github/workflows/java-workflow.yml index 20e3896a0..4884cfb89 100644 --- a/.github/workflows/java-workflow.yml +++ b/.github/workflows/java-workflow.yml @@ -56,7 +56,7 @@ jobs: with: distribution: ${{matrix.distribution}} java-version: ${{matrix.java-version}} - - name: Build the Sample Project + - name: Build the Sample Project and Run the Samples run: | mvn -version java -version From 9db9ec58760a9b584378a2b71674806031fdfacc Mon Sep 17 00:00:00 2001 From: aasgoel Date: Tue, 9 Jul 2024 10:58:11 +0530 Subject: [PATCH 34/47] [no ci] --- .github/workflows/java-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/java-workflow.yml b/.github/workflows/java-workflow.yml index 4884cfb89..9dd7ea1b3 100644 --- a/.github/workflows/java-workflow.yml +++ b/.github/workflows/java-workflow.yml @@ -38,7 +38,7 @@ jobs: RESTCLIENT_SDK_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) echo $RESTCLIENT_SDK_VERSION cd ../$SAMPLE_FOLDER - perl -i -spe "BEGIN{undef $/;} s|com\.cybersource<\/groupId>\s*cybersource-rest-client-java<\/artifactId>\s*.*?<\/version>|com.cybersource\n cybersource-rest-client-java\n \${version}|gs" -- -version=$RESTCLIENT_SDK_VERSION pom.xml + perl -i -spe "BEGIN{undef $/;} s|com\.cybersource<\/groupId>\s*cybersource-rest-client-java<\/artifactId>\s*.*?<\/version>|com.cybersource\n cybersource-rest-client-java\n \${version}|g" -- -version=$RESTCLIENT_SDK_VERSION pom.xml cat pom.xml - name: Setup Java 8 to Build the Client uses: actions/setup-java@v2 From 4186daef6f39ea8f1baa88c02a3a790a9237fc0c Mon Sep 17 00:00:00 2001 From: aasgoel Date: Wed, 10 Jul 2024 10:19:40 +0530 Subject: [PATCH 35/47] Added workflow_dispatch and pull_request event triggers --- .github/workflows/java-workflow.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/java-workflow.yml b/.github/workflows/java-workflow.yml index 9dd7ea1b3..bcca6ea56 100644 --- a/.github/workflows/java-workflow.yml +++ b/.github/workflows/java-workflow.yml @@ -1,6 +1,8 @@ name: JAVA BUILDS on: push: + pull_request: + workflow_dispatch: env: CLIENT_FOLDER: 'cybersource-rest-client-java' SAMPLE_FOLDER: 'cybersource-rest-samples-java' From 1a1012a593f6aea222f86587097f92d7e40ae1af Mon Sep 17 00:00:00 2001 From: aasgoel Date: Fri, 12 Jul 2024 14:15:20 +0530 Subject: [PATCH 36/47] Code Refactoring --- .github/workflows/java-workflow.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/java-workflow.yml b/.github/workflows/java-workflow.yml index bcca6ea56..b422c8ee0 100644 --- a/.github/workflows/java-workflow.yml +++ b/.github/workflows/java-workflow.yml @@ -34,14 +34,6 @@ jobs: repository: 'CyberSource/cybersource-rest-samples-java' ref: 'testing-branch' path: ${{env.SAMPLE_FOLDER}} - - name: Replace the Version of cybersource-rest-client-java in samples' pom file - run: | - cd $CLIENT_FOLDER - RESTCLIENT_SDK_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) - echo $RESTCLIENT_SDK_VERSION - cd ../$SAMPLE_FOLDER - perl -i -spe "BEGIN{undef $/;} s|com\.cybersource<\/groupId>\s*cybersource-rest-client-java<\/artifactId>\s*.*?<\/version>|com.cybersource\n cybersource-rest-client-java\n \${version}|g" -- -version=$RESTCLIENT_SDK_VERSION pom.xml - cat pom.xml - name: Setup Java 8 to Build the Client uses: actions/setup-java@v2 with: @@ -58,6 +50,14 @@ jobs: with: distribution: ${{matrix.distribution}} java-version: ${{matrix.java-version}} + - name: Replace the Version of cybersource-rest-client-java in samples' pom file + run: | + cd $CLIENT_FOLDER + RESTCLIENT_SDK_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) + echo $RESTCLIENT_SDK_VERSION + cd ../$SAMPLE_FOLDER + perl -i -spe "BEGIN{undef $/;} s|com\.cybersource<\/groupId>\s*cybersource-rest-client-java<\/artifactId>\s*.*?<\/version>|com.cybersource\n cybersource-rest-client-java\n \${version}|g" -- -version=$RESTCLIENT_SDK_VERSION pom.xml + cat pom.xml - name: Build the Sample Project and Run the Samples run: | mvn -version From e72e10eebafde3594804eab884f79e2978060677 Mon Sep 17 00:00:00 2001 From: aasgoel Date: Tue, 16 Jul 2024 11:49:15 +0530 Subject: [PATCH 37/47] Update java-workflow.yml --- .github/workflows/java-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/java-workflow.yml b/.github/workflows/java-workflow.yml index b422c8ee0..70b3835d3 100644 --- a/.github/workflows/java-workflow.yml +++ b/.github/workflows/java-workflow.yml @@ -32,7 +32,7 @@ jobs: uses: actions/checkout@v4 with: repository: 'CyberSource/cybersource-rest-samples-java' - ref: 'testing-branch' + ref: 'master' path: ${{env.SAMPLE_FOLDER}} - name: Setup Java 8 to Build the Client uses: actions/setup-java@v2 From 04bd29052009b2846685e2d921d081b48b321e3c Mon Sep 17 00:00:00 2001 From: aasgoel Date: Thu, 18 Jul 2024 15:47:25 +0530 Subject: [PATCH 38/47] Adding a comment to create a push event trigger --- .github/workflows/java-workflow.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/java-workflow.yml b/.github/workflows/java-workflow.yml index 70b3835d3..16bb1dac8 100644 --- a/.github/workflows/java-workflow.yml +++ b/.github/workflows/java-workflow.yml @@ -80,3 +80,4 @@ jobs: path: | ${{env.SAMPLE_FOLDER}}/${{steps.report-generation.outputs.result-pdf-name}} +# Adding Comment \ No newline at end of file From b2e5c13f7d38e48293bcd76a8da7faa9d454222e Mon Sep 17 00:00:00 2001 From: aasgoel Date: Thu, 18 Jul 2024 15:51:39 +0530 Subject: [PATCH 39/47] Adding comment to create a push event trigger --- .github/workflows/java-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/java-workflow.yml b/.github/workflows/java-workflow.yml index 16bb1dac8..83d4c6ea7 100644 --- a/.github/workflows/java-workflow.yml +++ b/.github/workflows/java-workflow.yml @@ -80,4 +80,4 @@ jobs: path: | ${{env.SAMPLE_FOLDER}}/${{steps.report-generation.outputs.result-pdf-name}} -# Adding Comment \ No newline at end of file +# Add Comment \ No newline at end of file From 52f3455f0b06ece595fb470ad998a53995f23d6c Mon Sep 17 00:00:00 2001 From: aasgoel Date: Thu, 18 Jul 2024 15:57:05 +0530 Subject: [PATCH 40/47] Update java-workflow.yml --- .github/workflows/java-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/java-workflow.yml b/.github/workflows/java-workflow.yml index 83d4c6ea7..f3545bf9f 100644 --- a/.github/workflows/java-workflow.yml +++ b/.github/workflows/java-workflow.yml @@ -80,4 +80,4 @@ jobs: path: | ${{env.SAMPLE_FOLDER}}/${{steps.report-generation.outputs.result-pdf-name}} -# Add Comment \ No newline at end of file +#Adding Comment \ No newline at end of file From 11e8862834656fe55fd44a6b004d36c78462f5ab Mon Sep 17 00:00:00 2001 From: aasgoel Date: Thu, 18 Jul 2024 15:58:01 +0530 Subject: [PATCH 41/47] Update java-workflow.yml --- .github/workflows/java-workflow.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/java-workflow.yml b/.github/workflows/java-workflow.yml index f3545bf9f..70b3835d3 100644 --- a/.github/workflows/java-workflow.yml +++ b/.github/workflows/java-workflow.yml @@ -80,4 +80,3 @@ jobs: path: | ${{env.SAMPLE_FOLDER}}/${{steps.report-generation.outputs.result-pdf-name}} -#Adding Comment \ No newline at end of file From 7a7fa23a1bd59caad2d01839ac7d6692ab8673e9 Mon Sep 17 00:00:00 2001 From: aasgoel Date: Thu, 18 Jul 2024 15:58:41 +0530 Subject: [PATCH 42/47] Update java-workflow.yml --- .github/workflows/java-workflow.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/java-workflow.yml b/.github/workflows/java-workflow.yml index 70b3835d3..f3545bf9f 100644 --- a/.github/workflows/java-workflow.yml +++ b/.github/workflows/java-workflow.yml @@ -80,3 +80,4 @@ jobs: path: | ${{env.SAMPLE_FOLDER}}/${{steps.report-generation.outputs.result-pdf-name}} +#Adding Comment \ No newline at end of file From 0a34d19b1afe550ceeedc00fdbd1deeaaee9056e Mon Sep 17 00:00:00 2001 From: aasgoel Date: Thu, 25 Jul 2024 09:39:10 +0530 Subject: [PATCH 43/47] Update java-workflow.yml --- .github/workflows/java-workflow.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/java-workflow.yml b/.github/workflows/java-workflow.yml index f3545bf9f..70b3835d3 100644 --- a/.github/workflows/java-workflow.yml +++ b/.github/workflows/java-workflow.yml @@ -80,4 +80,3 @@ jobs: path: | ${{env.SAMPLE_FOLDER}}/${{steps.report-generation.outputs.result-pdf-name}} -#Adding Comment \ No newline at end of file From 4c06e45abb758a6f2af0b3ef4f9ae262c5d57637 Mon Sep 17 00:00:00 2001 From: aasgoel Date: Thu, 25 Jul 2024 09:40:47 +0530 Subject: [PATCH 44/47] comment to trigger workflow --- .github/workflows/java-workflow.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/java-workflow.yml b/.github/workflows/java-workflow.yml index 70b3835d3..f3545bf9f 100644 --- a/.github/workflows/java-workflow.yml +++ b/.github/workflows/java-workflow.yml @@ -80,3 +80,4 @@ jobs: path: | ${{env.SAMPLE_FOLDER}}/${{steps.report-generation.outputs.result-pdf-name}} +#Adding Comment \ No newline at end of file From 2c3798ee5d0b5a2299fe3cd20af174f7b38a5339 Mon Sep 17 00:00:00 2001 From: aasgoel Date: Thu, 25 Jul 2024 09:53:57 +0530 Subject: [PATCH 45/47] Update java-workflow.yml --- .github/workflows/java-workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/java-workflow.yml b/.github/workflows/java-workflow.yml index f3545bf9f..002757a41 100644 --- a/.github/workflows/java-workflow.yml +++ b/.github/workflows/java-workflow.yml @@ -35,7 +35,7 @@ jobs: ref: 'master' path: ${{env.SAMPLE_FOLDER}} - name: Setup Java 8 to Build the Client - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: '8' @@ -46,7 +46,7 @@ jobs: cd $CLIENT_FOLDER mvn clean install - name: Setup Java version to Build the samples - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: ${{matrix.distribution}} java-version: ${{matrix.java-version}} From add5d9be82c756831886bbaa153bd763600d13a1 Mon Sep 17 00:00:00 2001 From: aasgoel Date: Thu, 25 Jul 2024 09:57:14 +0530 Subject: [PATCH 46/47] Update java-workflow.yml --- .github/workflows/java-workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/java-workflow.yml b/.github/workflows/java-workflow.yml index 002757a41..ea79c7f7d 100644 --- a/.github/workflows/java-workflow.yml +++ b/.github/workflows/java-workflow.yml @@ -35,7 +35,7 @@ jobs: ref: 'master' path: ${{env.SAMPLE_FOLDER}} - name: Setup Java 8 to Build the Client - uses: actions/setup-java@v4 + uses: actions/setup-java@v3 with: distribution: 'temurin' java-version: '8' @@ -46,7 +46,7 @@ jobs: cd $CLIENT_FOLDER mvn clean install - name: Setup Java version to Build the samples - uses: actions/setup-java@v4 + uses: actions/setup-java@v3 with: distribution: ${{matrix.distribution}} java-version: ${{matrix.java-version}} From bff57ecc143ab2df97d7f59fdf33c439fd497a47 Mon Sep 17 00:00:00 2001 From: aasgoel Date: Thu, 25 Jul 2024 10:07:42 +0530 Subject: [PATCH 47/47] Update java-workflow.yml --- .github/workflows/java-workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/java-workflow.yml b/.github/workflows/java-workflow.yml index ea79c7f7d..f3545bf9f 100644 --- a/.github/workflows/java-workflow.yml +++ b/.github/workflows/java-workflow.yml @@ -35,7 +35,7 @@ jobs: ref: 'master' path: ${{env.SAMPLE_FOLDER}} - name: Setup Java 8 to Build the Client - uses: actions/setup-java@v3 + uses: actions/setup-java@v2 with: distribution: 'temurin' java-version: '8' @@ -46,7 +46,7 @@ jobs: cd $CLIENT_FOLDER mvn clean install - name: Setup Java version to Build the samples - uses: actions/setup-java@v3 + uses: actions/setup-java@v2 with: distribution: ${{matrix.distribution}} java-version: ${{matrix.java-version}}