From c5f752bae125472f9575d81ac2548a600964bbf2 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Sun, 23 Jul 2023 20:47:42 -0700 Subject: [PATCH 1/6] Requires java 11 --- README.md | 4 ++-- pom.xml | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 25c0f7c2986..ce58fc17ac1 100644 --- a/README.md +++ b/README.md @@ -104,9 +104,9 @@ The OpenAPI Specification has undergone 3 revisions since initial creation in 20 To build from source, you need the following installed and available in your `$PATH:` -* [Java 8](https://www.oracle.com/technetwork/java/index.html) +* [Java 11](https://www.oracle.com/technetwork/java/index.html) -* [Apache Maven 3.3.4 or greater](https://maven.apache.org/) +* [Apache Maven 3.8.0 or greater](https://maven.apache.org/) After cloning the project, you can build it from source with this command: ```sh diff --git a/pom.xml b/pom.xml index 3ea68c32e0d..9ea85bf2fa8 100644 --- a/pom.xml +++ b/pom.xml @@ -421,8 +421,9 @@ 3.0.0 UTF-8 - 1.8 - 1.8 + 11 + ${java.version} + ${java.version} 0.23.1 3.1.0 1.4 From dada40c99fd7dc5c2c7cc394dbb35b9f4e42ddf9 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Sun, 23 Jul 2023 23:27:21 -0700 Subject: [PATCH 2/6] Fixes git commit id version which rev rolls jgit --- .gitignore | 3 --- README.md | 2 +- pom.xml | 11 ++++------- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index a65026f387a..eb6c0bf1aec 100644 --- a/.gitignore +++ b/.gitignore @@ -46,9 +46,6 @@ test-output/ nbactions.xml test-output/ -# jgit is making a local file in ? dir, needs a version upgrade -? - # scalatra samples/server-generator/scalatra/output samples/server-generator/scalatra/target diff --git a/README.md b/README.md index ce58fc17ac1..eef814e3fff 100644 --- a/README.md +++ b/README.md @@ -106,7 +106,7 @@ To build from source, you need the following installed and available in your `$P * [Java 11](https://www.oracle.com/technetwork/java/index.html) -* [Apache Maven 3.8.0 or greater](https://maven.apache.org/) +* [Apache Maven 3.9.3 or greater](https://maven.apache.org/) After cloning the project, you can build it from source with this command: ```sh diff --git a/pom.xml b/pom.xml index 9ea85bf2fa8..4863856ef62 100644 --- a/pom.xml +++ b/pom.xml @@ -76,8 +76,8 @@ - pl.project13.maven - git-commit-id-plugin + io.github.git-commit-id + git-commit-id-maven-plugin ${git-commit-id-plugin.version} @@ -166,10 +166,7 @@ false - true - - ${java.io.tmpdir}/dependency-reduced-pom.xml - + false @@ -432,7 +429,7 @@ 1.9 1.3.0 1.0.2 - 4.9.10 + 5.0.1 3.0.9 30.1.1-jre 4.3.0 From 087c621763c5707e193eb3b2e887ed00155483ba Mon Sep 17 00:00:00 2001 From: Justin Black Date: Sun, 23 Jul 2023 23:52:43 -0700 Subject: [PATCH 3/6] Removes java setting --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 41aafcafee6..5ac727a05d3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -32,7 +32,7 @@ commands: # a reusable command with parameters - run: mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS # This is based on your 1.0 configuration file or project settings - run: - command: sudo update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java; sudo update-alternatives --set javac /usr/lib/jvm/java-8-openjdk-amd64/bin/javac; echo -e "export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64" >> $BASH_ENV + command: java -version - run: command: 'sudo docker info >/dev/null 2>&1 || sudo service docker start; ' - run: From 049327aa3646663ca34482b1e903cbcc2c7f772c Mon Sep 17 00:00:00 2001 From: Justin Black Date: Mon, 24 Jul 2023 00:04:08 -0700 Subject: [PATCH 4/6] Switches to latest 2004 ubuntu image in circleci --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5ac727a05d3..9b9b647a044 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -140,7 +140,7 @@ commands: # a reusable command with parameters jobs: node0: machine: - image: ubuntu-2004:202201-02 + image: ubuntu-2004:2023.07.1 working_directory: ~/OpenAPITools/openapi-json-schema-generator shell: /bin/bash --login environment: @@ -151,7 +151,7 @@ jobs: nodeNo: "0" node1: machine: - image: ubuntu-2004:202201-02 + image: ubuntu-2004:2023.07.1 working_directory: ~/OpenAPITools/openapi-json-schema-generator shell: /bin/bash --login environment: @@ -162,7 +162,7 @@ jobs: nodeNo: "1" node2: machine: - image: ubuntu-2004:202201-02 + image: ubuntu-2004:2023.07.1 working_directory: ~/OpenAPITools/openapi-json-schema-generator shell: /bin/bash --login environment: @@ -173,7 +173,7 @@ jobs: nodeNo: "2" node3: machine: - image: ubuntu-2004:202201-02 + image: ubuntu-2004:2023.07.1 working_directory: ~/OpenAPITools/openapi-json-schema-generator shell: /bin/bash --login environment: From 58d7ce0591e5885ff423851214f23636c6fc0dea Mon Sep 17 00:00:00 2001 From: Justin Black Date: Mon, 24 Jul 2023 00:17:02 -0700 Subject: [PATCH 5/6] Updates github actions, adds maven-javadoc-plugin --- .../workflows/check-supported-versions.yaml | 8 +++---- .github/workflows/openapi-generator.yaml | 16 ++++++------- pom.xml | 23 ++++++++++++++++++- 3 files changed, 34 insertions(+), 13 deletions(-) diff --git a/.github/workflows/check-supported-versions.yaml b/.github/workflows/check-supported-versions.yaml index 350c008e900..8adf69b5581 100644 --- a/.github/workflows/check-supported-versions.yaml +++ b/.github/workflows/check-supported-versions.yaml @@ -10,10 +10,10 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - java: [8, 11] + java: [11, 17] os: [ubuntu-latest] include: - - java: 8 + - java: 11 os: windows-latest - java: 17 os: ubuntu-latest @@ -51,7 +51,7 @@ jobs: - name: Upload Maven build artifact uses: actions/upload-artifact@v3 - if: matrix.java == '8' && matrix.os == 'ubuntu-latest' + if: matrix.java == '11' && matrix.os == 'ubuntu-latest' with: name: artifact path: modules/openapi-generator-cli/target/openapi-generator-cli.jar @@ -61,7 +61,7 @@ jobs: run: gradle -b modules/openapi-generator-gradle-plugin/samples/local-spec/build.gradle buildGoSdk --stacktrace - name: Test Maven plugin integration - if: matrix.java == '8' + if: matrix.java == '11' shell: bash run: | cd modules/openapi-generator-maven-plugin diff --git a/.github/workflows/openapi-generator.yaml b/.github/workflows/openapi-generator.yaml index b0ba6eaf4bc..31a22bb1eaf 100644 --- a/.github/workflows/openapi-generator.yaml +++ b/.github/workflows/openapi-generator.yaml @@ -16,10 +16,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - name: Set up JDK 8 + - name: Set up JDK 11 uses: actions/setup-java@v3 with: - java-version: 8 + java-version: 11 distribution: 'temurin' - name: Cache maven dependencies uses: actions/cache@v3 @@ -52,10 +52,10 @@ jobs: - build steps: - uses: actions/checkout@v3 - - name: Set up JDK 8 + - name: Set up JDK 11 uses: actions/setup-java@v3 with: - java-version: 8 + java-version: 11 distribution: 'temurin' - name: Cache maven dependencies uses: actions/cache@v3 @@ -87,10 +87,10 @@ jobs: - build steps: - uses: actions/checkout@v3 - - name: Set up JDK 8 + - name: Set up JDK 11 uses: actions/setup-java@v3 with: - java-version: 8 + java-version: 11 distribution: 'temurin' - name: Download openapi-generator-cli.jar artifact uses: actions/download-artifact@v3 @@ -125,10 +125,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - name: Set up JDK 8 + - name: Set up JDK 11 uses: actions/setup-java@v3 with: - java-version: 8 + java-version: 11 distribution: 'temurin' - name: Download openapi-generator-cli.jar artifact uses: actions/download-artifact@v3 diff --git a/pom.xml b/pom.xml index 4863856ef62..d9c9e3c065e 100644 --- a/pom.xml +++ b/pom.xml @@ -55,6 +55,27 @@ target ${project.artifactId} + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven-javadoc-plugin.version} + + ${maven.compiler.source} + UTF-8 + 1g + false + none + + + + attach-javadocs + verify + + jar + + + + com.github.spotbugs spotbugs-maven-plugin @@ -429,7 +450,7 @@ 1.9 1.3.0 1.0.2 - 5.0.1 + 5.0.1 3.0.9 30.1.1-jre 4.3.0 From 90558b7a83638ea2b2cb3a59cbdfa1d7ed3f9437 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Mon, 24 Jul 2023 00:21:39 -0700 Subject: [PATCH 6/6] Reverts ubuntu image back --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9b9b647a044..5ac727a05d3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -140,7 +140,7 @@ commands: # a reusable command with parameters jobs: node0: machine: - image: ubuntu-2004:2023.07.1 + image: ubuntu-2004:202201-02 working_directory: ~/OpenAPITools/openapi-json-schema-generator shell: /bin/bash --login environment: @@ -151,7 +151,7 @@ jobs: nodeNo: "0" node1: machine: - image: ubuntu-2004:2023.07.1 + image: ubuntu-2004:202201-02 working_directory: ~/OpenAPITools/openapi-json-schema-generator shell: /bin/bash --login environment: @@ -162,7 +162,7 @@ jobs: nodeNo: "1" node2: machine: - image: ubuntu-2004:2023.07.1 + image: ubuntu-2004:202201-02 working_directory: ~/OpenAPITools/openapi-json-schema-generator shell: /bin/bash --login environment: @@ -173,7 +173,7 @@ jobs: nodeNo: "2" node3: machine: - image: ubuntu-2004:2023.07.1 + image: ubuntu-2004:202201-02 working_directory: ~/OpenAPITools/openapi-json-schema-generator shell: /bin/bash --login environment: