From 0557fa7b4db8e85dacc2e702015b49eee96d7dc5 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Mon, 22 Jan 2024 14:41:17 -0800 Subject: [PATCH 1/6] Updates pom to include profile for java17clients --- .circleci/parallel.sh | 5 +---- pom.xml | 8 ++++++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.circleci/parallel.sh b/.circleci/parallel.sh index 963f7baae1b..c3584b2cbb3 100755 --- a/.circleci/parallel.sh +++ b/.circleci/parallel.sh @@ -28,10 +28,7 @@ elif [ "$JOB_ID" = "testPythonClientSamples" ]; then elif [ "$JOB_ID" = "testJava17ClientSamples" ]; then echo "Running job $JOB_ID ..." java -version - - (cd samples/client/petstore/java && mvn test) - (cd samples/client/3_0_3_unit_test/java && mvn test) - (cd samples/client/3_1_0_unit_test/java && mvn test) + mvn --quiet verify -Pjava17ClientSamples else echo "Running job $JOB_ID" diff --git a/pom.xml b/pom.xml index fc23061001d..a332c07d47e 100644 --- a/pom.xml +++ b/pom.xml @@ -237,6 +237,14 @@ static-analysis + + java17ClientSamples + + samples/client/petstore/java + samples/client/3_0_3_unit_test/java + samples/client/3_1_0_unit_test/java + + From b679e887e8e63bbb88ff4bf1929987fd9b7691af Mon Sep 17 00:00:00 2001 From: Justin Black Date: Mon, 22 Jan 2024 14:44:47 -0800 Subject: [PATCH 2/6] Adjusts packaging --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a332c07d47e..de6176e99d1 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 openapi-json-schema-generator-cli - jar + pom org.openapijsonschematools openapi-json-schema-generator-project From d4ab4d6133a92ad368e9bf69a1a6730fc8ebe760 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Mon, 22 Jan 2024 15:15:45 -0800 Subject: [PATCH 3/6] Adjusts testJava17ClientSamples job --- .circleci/parallel.sh | 2 +- .circleci/testJava17ClientSamples.sh | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 .circleci/testJava17ClientSamples.sh diff --git a/.circleci/parallel.sh b/.circleci/parallel.sh index c3584b2cbb3..c29034275ea 100755 --- a/.circleci/parallel.sh +++ b/.circleci/parallel.sh @@ -28,7 +28,7 @@ elif [ "$JOB_ID" = "testPythonClientSamples" ]; then elif [ "$JOB_ID" = "testJava17ClientSamples" ]; then echo "Running job $JOB_ID ..." java -version - mvn --quiet verify -Pjava17ClientSamples + cat testJava17ClientSamples.sh | parallel else echo "Running job $JOB_ID" diff --git a/.circleci/testJava17ClientSamples.sh b/.circleci/testJava17ClientSamples.sh new file mode 100644 index 00000000000..15338a264ae --- /dev/null +++ b/.circleci/testJava17ClientSamples.sh @@ -0,0 +1,3 @@ + (cd samples/client/petstore/java && mvn test) + (cd samples/client/3_0_3_unit_test/java && mvn test) + (cd samples/client/3_1_0_unit_test/java && mvn test) \ No newline at end of file From c6e8a7b0f979b14a2658442db366f1a48d69c1fe Mon Sep 17 00:00:00 2001 From: Justin Black Date: Mon, 22 Jan 2024 15:17:43 -0800 Subject: [PATCH 4/6] Updates path to file --- .circleci/parallel.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/parallel.sh b/.circleci/parallel.sh index c29034275ea..de0cab89faa 100755 --- a/.circleci/parallel.sh +++ b/.circleci/parallel.sh @@ -28,7 +28,7 @@ elif [ "$JOB_ID" = "testPythonClientSamples" ]; then elif [ "$JOB_ID" = "testJava17ClientSamples" ]; then echo "Running job $JOB_ID ..." java -version - cat testJava17ClientSamples.sh | parallel + cat ./circleci/testJava17ClientSamples.sh | parallel else echo "Running job $JOB_ID" From d92495379d9f44660745b399121aabb2b3edb454 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Mon, 22 Jan 2024 15:20:10 -0800 Subject: [PATCH 5/6] Fixes filepath typo --- .circleci/parallel.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/parallel.sh b/.circleci/parallel.sh index de0cab89faa..bf7704d5b2e 100755 --- a/.circleci/parallel.sh +++ b/.circleci/parallel.sh @@ -28,7 +28,7 @@ elif [ "$JOB_ID" = "testPythonClientSamples" ]; then elif [ "$JOB_ID" = "testJava17ClientSamples" ]; then echo "Running job $JOB_ID ..." java -version - cat ./circleci/testJava17ClientSamples.sh | parallel + cat ./.circleci/testJava17ClientSamples.sh | parallel else echo "Running job $JOB_ID" From 04e6fab8dbb7b5798d93a0774628b8a0e86d095d Mon Sep 17 00:00:00 2001 From: Justin Black Date: Mon, 22 Jan 2024 15:33:55 -0800 Subject: [PATCH 6/6] Reverts pom --- pom.xml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index de6176e99d1..fc23061001d 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 openapi-json-schema-generator-cli - pom + jar org.openapijsonschematools openapi-json-schema-generator-project @@ -237,14 +237,6 @@ static-analysis - - java17ClientSamples - - samples/client/petstore/java - samples/client/3_0_3_unit_test/java - samples/client/3_1_0_unit_test/java - -