diff --git a/.github/workflows/maven-master-pulls.yml b/.github/workflows/maven-master-pulls.yml index 104c004f794..c0c809bdbe3 100644 --- a/.github/workflows/maven-master-pulls.yml +++ b/.github/workflows/maven-master-pulls.yml @@ -13,13 +13,17 @@ jobs: java: [ 11 ] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Java - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} + distribution: temurin + server-id: central + server-username: MAVEN_USERNAME + server-password: MAVEN_PASSWORD - name: Cache local Maven repository - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} @@ -36,13 +40,17 @@ jobs: java: [ 8 ] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Java - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} + distribution: temurin + server-id: central + server-username: MAVEN_USERNAME + server-password: MAVEN_PASSWORD - name: Cache local Maven repository - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} @@ -50,20 +58,3 @@ jobs: ${{ runner.os }}-maven- - name: Build with Maven run: mvn -B -U clean verify -DskipTests -Dmaven.test.skip=true -Dmaven.site.skip=true -Dmaven.javadoc.skip=true -Psamples-java8 --file pom.xml - - scan-with-lacework: - name: Trigger LaceWork Scanning - runs-on: ubuntu-latest - - needs: [ build ] - if: success() - - steps: - - name: Trigger LaceWork Scanning using a different method - run: | - docker run -e LW_ACCOUNT_NAME=$LW_ACCOUNT_NAME -e LW_ACCESS_TOKEN=$LW_ACCESS_TOKEN -e LW_SCANNER_SAVE_RESULTS=true -e LW_SCANNER_DISABLE_UPDATES=false -v /var/run/docker.sock:/var/run/docker.sock lacework/lacework-inline-scanner:latest image evaluate swaggerapi/swagger-codegen-cli latest --docker-server index.docker.io --docker-username $docker_user --docker-password $docker_password > /dev/null 2>&1 - env: - LW_ACCOUNT_NAME: ${{ secrets.LW_ACCOUNT_NAME }} - LW_ACCESS_TOKEN: ${{ secrets.LW_ACCESS_TOKEN }} - docker_user: ${{ secrets.DOCKERHUB_SB_USERNAME}} - docker_password: ${{ secrets.DOCKERHUB_SB_PASSWORD}} \ No newline at end of file diff --git a/.github/workflows/maven-master.yml b/.github/workflows/maven-master.yml index e42220db45b..61cb0aae4d7 100644 --- a/.github/workflows/maven-master.yml +++ b/.github/workflows/maven-master.yml @@ -13,13 +13,22 @@ jobs: java: [ 11 ] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: temurin - cache: maven + server-id: central + server-username: MAVEN_USERNAME + server-password: MAVEN_PASSWORD + - name: Cache local Maven repository + uses: actions/cache@v4 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- - name: Set up QEMU uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx @@ -28,20 +37,6 @@ jobs: run: | docker login --username=${{ secrets.DOCKERHUB_SB_USERNAME }} --password=${{ secrets.DOCKERHUB_SB_PASSWORD }} set -e - - uses: s4u/maven-settings-action@v2.8.0 - name: setup maven settings.xml - with: - servers: | - [{ - "id": "sonatype-nexus-staging", - "username": "${{ secrets.OSSRH_USERNAME }}", - "password": "${{ secrets.OSSRH_TOKEN }}" - }, - { - "id": "sonatype-nexus-snapshots", - "username": "${{ secrets.OSSRH_USERNAME }}", - "password": "${{ secrets.OSSRH_TOKEN }}" - }] - name: Build with Maven run: mvn -B -U verify --file pom.xml - name: Deploy Maven Snapshot @@ -82,13 +77,17 @@ jobs: java: [ 8 ] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Java - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} + distribution: temurin + server-id: central + server-username: MAVEN_USERNAME + server-password: MAVEN_PASSWORD - name: Cache local Maven repository - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/README.md b/README.md index 887aabede4b..5dad9ffa621 100644 --- a/README.md +++ b/README.md @@ -64,8 +64,8 @@ Swagger Codegen Version | Release Date | Swagger / OpenAPI Spec compatibility Swagger Codegen Version | Release Date | Swagger / OpenAPI Spec compatibility | Notes -------------------------- |--------------| -------------------------- | ----- -3.0.66-SNAPSHOT (current 3.0.0, upcoming minor release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/io/swagger/codegen/v3/swagger-codegen-cli/3.0.66-SNAPSHOT/)| TBD | 1.0, 1.1, 1.2, 2.0, 3.0 | Minor release -2.4.45-SNAPSHOT (current master, upcoming minor release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/io/swagger/swagger-codegen-cli/2.4.45-SNAPSHOT/)| TBD | 1.0, 1.1, 1.2, 2.0 | Minor release +3.0.66-SNAPSHOT (current 3.0.0, upcoming minor release) [SNAPSHOT](https://central.sonatype.com/service/rest/repository/browse/maven-snapshots/io/swagger/codegen/v3/swagger-codegen-cli/3.0.66-SNAPSHOT/)| TBD | 1.0, 1.1, 1.2, 2.0, 3.0 | Minor release +2.4.45-SNAPSHOT (current master, upcoming minor release) [SNAPSHOT](https://central.sonatype.com/service/rest/repository/browse/maven-snapshots/io/swagger/swagger-codegen-cli/2.4.45-SNAPSHOT/)| TBD | 1.0, 1.1, 1.2, 2.0 | Minor release For detailed breakdown of all versions, please see the [full compatibility listing](./docs/compatibility.md). diff --git a/docs/compatibility.md b/docs/compatibility.md index 2066904bc10..63f0b950bed 100644 --- a/docs/compatibility.md +++ b/docs/compatibility.md @@ -4,7 +4,7 @@ The Swagger Codegen project has the following compatibilities with the OpenAPI S Swagger Codegen Version | Release Date | OpenAPI Spec compatibility | Notes -------------------------- |--------------| -------------------------- | ----- -3.0.66-SNAPSHOT (current 3.0.0, upcoming minor release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/io/swagger/codegen/v3/swagger-codegen-cli/3.0.66-SNAPSHOT/)| TBD | 1.0, 1.1, 1.2, 2.0, 3.0 | Minor release +3.0.66-SNAPSHOT (current 3.0.0, upcoming minor release) [SNAPSHOT](https://central.sonatype.com/service/rest/repository/browse/maven-snapshots/io/swagger/codegen/v3/swagger-codegen-cli/3.0.66-SNAPSHOT/)| TBD | 1.0, 1.1, 1.2, 2.0, 3.0 | Minor release [3.0.65](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.65) (**current stable**) | 2024-12-18 | 1.0, 1.1, 1.2, 2.0, 3.0 | [tag v3.0.65](https://github.com/swagger-api/swagger-codegen/tree/v3.0.65) [3.0.64](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.64) | 2024-11-07 | 1.0, 1.1, 1.2, 2.0, 3.0 | [tag v3.0.64](https://github.com/swagger-api/swagger-codegen/tree/v3.0.64) [3.0.63](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.63) | 2024-10-16 | 1.0, 1.1, 1.2, 2.0, 3.0 | [tag v3.0.63](https://github.com/swagger-api/swagger-codegen/tree/v3.0.63) @@ -70,7 +70,7 @@ Swagger Codegen Version | Release Date | OpenAPI Spec compatibility | Notes [3.0.2](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.2)| 2018-10-19 | 1.0, 1.1, 1.2, 2.0, 3.0 | Minor release [3.0.1](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.1)| 2018-10-05 | 1.0, 1.1, 1.2, 2.0, 3.0 | Major release with breaking changes [3.0.0](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.0)| 2018-09-06 | 1.0, 1.1, 1.2, 2.0, 3.0 | Major release with breaking changes -2.4.45-SNAPSHOT (current master, upcoming minor release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/io/swagger/swagger-codegen-cli/2.4.45-SNAPSHOT/)| TBD | 1.0, 1.1, 1.2, 2.0 | Minor release +2.4.45-SNAPSHOT (current master, upcoming minor release) [SNAPSHOT](https://central.sonatype.com/service/rest/repository/browse/maven-snapshots/io/swagger/swagger-codegen-cli/2.4.45-SNAPSHOT/)| TBD | 1.0, 1.1, 1.2, 2.0 | Minor release [2.4.44](https://github.com/swagger-api/swagger-codegen/releases/tag/v2.4.44) (**current stable**) | 2024-12-18 | 1.0, 1.1, 1.2, 2.0 | [tag v2.4.44](https://github.com/swagger-api/swagger-codegen/tree/v2.4.44) [2.4.43](https://github.com/swagger-api/swagger-codegen/releases/tag/v2.4.43) | 2024-08-09 | 1.0, 1.1, 1.2, 2.0 | [tag v2.4.43](https://github.com/swagger-api/swagger-codegen/tree/v2.4.43) [2.4.42](https://github.com/swagger-api/swagger-codegen/releases/tag/v2.4.42) | 2024-07-29 | 1.0, 1.1, 1.2, 2.0 | [tag v2.4.42](https://github.com/swagger-api/swagger-codegen/tree/v2.4.42) diff --git a/modules/swagger-codegen-cli/pom.xml b/modules/swagger-codegen-cli/pom.xml index c841fa8a719..79400f13cae 100644 --- a/modules/swagger-codegen-cli/pom.xml +++ b/modules/swagger-codegen-cli/pom.xml @@ -12,7 +12,7 @@ jar swagger-codegen (executable) - + swagger-codegen (executable) swagger-codegen-cli diff --git a/modules/swagger-codegen/pom.xml b/modules/swagger-codegen/pom.xml index ac8e5f4e2b5..d68abc24e94 100644 --- a/modules/swagger-codegen/pom.xml +++ b/modules/swagger-codegen/pom.xml @@ -10,6 +10,7 @@ swagger-codegen jar swagger-codegen (core library) + swagger-codegen (core library) src/main/java install @@ -294,13 +295,4 @@ test - - - sonatype-snapshots - https://oss.sonatype.org/content/repositories/snapshots - - true - - - diff --git a/modules/swagger-generator/pom.xml b/modules/swagger-generator/pom.xml index b39b1451955..1da9ad036dd 100644 --- a/modules/swagger-generator/pom.xml +++ b/modules/swagger-generator/pom.xml @@ -10,6 +10,7 @@ swagger-generator war swagger-generator + swagger-generator src/main/java diff --git a/pom.xml b/pom.xml index 797d7bbedba..e5796d701ad 100644 --- a/pom.xml +++ b/pom.xml @@ -1,16 +1,12 @@ - - org.sonatype.oss - oss-parent - 5 - 4.0.0 io.swagger swagger-codegen-project pom swagger-codegen-project - 2.4.44 + swagger-codegen-project https://github.com/swagger-api/swagger-codegen + 2.4.44 scm:git:git@github.com:swagger-api/swagger-codegen.git scm:git:git@github.com:swagger-api/swagger-codegen.git @@ -32,12 +28,6 @@ github https://github.com/swagger-api/swagger-codegen/issues - - - swagger-swaggersocket - https://groups.google.com/forum/#!forum/swagger-swaggersocket - - Apache License 2.0 @@ -176,12 +166,6 @@ maven-site-plugin 3.12.0 - - org.apache.maven.plugins - maven-release-plugin - 2.5.3 - - org.apache.maven.plugins maven-javadoc-plugin @@ -237,6 +221,18 @@ + + org.sonatype.central + central-publishing-maven-plugin + 0.7.0 + true + + central + true + published + 3600 + + @@ -245,6 +241,18 @@ formatter-maven-plugin 0.5.2 + + org.apache.maven.plugins + maven-gpg-plugin + 1.6 + + + + --pinentry-mode + loopback + + + @@ -314,7 +322,7 @@ - release-sign-artifacts + release performRelease @@ -1047,15 +1055,6 @@ - - - sonatype-snapshots - https://oss.sonatype.org/content/repositories/snapshots - - true - - - 8 1.0.71 @@ -1083,5 +1082,6 @@ 2.2 4.5.14 20231013 + UTF-8