Merge remote-tracking branch 'origin/master' into feature/eirikb/dart-optional-patch

Author: eirikb

.devcontainer/devcontainer.json

@@ -13,7 +13,7 @@
     "ghcr.io/snebjorn/devcontainer-feature/chromium:latest": {},
     "ghcr.io/devcontainers/features/docker-in-docker:2": {
       "version": "latest",
-      "moby": true
+      "moby": false
     }
   },
   // Configure tool-specific properties.

.github/workflows/docker-release.yml

@@ -21,7 +21,7 @@ jobs:
           java-version: 11
           distribution: 'zulu'
       - name: Cache Maven packages
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}

.github/workflows/gradle-plugin-tests.yaml

@@ -21,7 +21,7 @@ jobs:
           distribution: 'temurin'
           cache: gradle
       - name: Cache maven dependencies
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         env:
           cache-name: cache-maven-repository
         with:

.github/workflows/gradle-test.yaml

@@ -40,14 +40,14 @@ jobs:
           cache: gradle
       # Cache Gradle Dependencies
       - name: Setup Gradle Dependencies Cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-caches-${{ hashFiles('**/*.gradle', '**/*.gradle.kts') }}
 
       # Cache Gradle Wrapper
       - name: Setup Gradle Wrapper Cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ~/.gradle/wrapper
           key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}

.github/workflows/linux.yaml

@@ -29,14 +29,14 @@ jobs:
           java-version: ${{ matrix.java }}
           cache: gradle
 
-      - uses: actions/cache@v4
+      - uses: actions/cache@v5
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('pom.xml', 'modules/**/pom.xml') }}
           restore-keys: |
             ${{ runner.os }}-maven-
 
-      - uses: actions/cache@v4
+      - uses: actions/cache@v5
         with:
           path: |
             ~/.gradle/caches
@@ -62,7 +62,7 @@ jobs:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
 
       - name: Upload Maven build artifact
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         if: matrix.java == '11' && matrix.os == 'ubuntu-latest'
         with:
           name: artifact
@@ -98,7 +98,7 @@ jobs:
           maven-version: 3.8.8
           cache: gradle
       - name: Download build artifact
-        uses: actions/download-artifact@v6
+        uses: actions/download-artifact@v7
         with:
           name: artifact
       - name: Run Ensures Script

.github/workflows/maven-plugin-tests.yaml

@@ -20,7 +20,7 @@ jobs:
           java-version: 11
           distribution: 'temurin'
       - name: Cache maven dependencies
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         env:
           cache-name: cache-maven-repository
         with:

.github/workflows/maven-release.yml

@@ -18,7 +18,7 @@ jobs:
           java-version: 11
           distribution: 'zulu'
       - name: Cache Maven packages
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}

.github/workflows/mill-plugin-tests.yaml

@@ -0,0 +1,69 @@
+name: Mill plugin tests
+
+on:
+  push:
+    paths:
+      - modules/openapi-generator-mill-plugin/**
+  pull_request:
+    paths:
+      - modules/openapi-generator-mill-plugin/**
+
+jobs:
+  test:
+    name: Mill plugin tests
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v5
+      - name: Set up JDK 11
+        uses: actions/setup-java@v5
+        with:
+          java-version: 11
+          distribution: 'temurin'
+      - name: Restore cache (read-only)
+        # only use restore keys, no save key because we need to clear the cache before running the examples
+        uses: actions/cache/restore@v5
+        with:
+          path: |
+            ~/.m2/repository
+            ~/.gradle
+            ~/.cache/coursier
+            !~/.gradle/caches/*/plugin-resolution/
+            !~/.m2/repository/org/openapitools/
+            !~/.cache/coursier/v1/https/repo1.maven.org/maven2/org/openapitools/
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
+
+      - name: Maven Clean Install
+        env:
+          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
+        run: |
+          ./mvnw clean install -DskipTests -Dmaven.javadoc.skip=true
+
+      # This is needed because of differences in how Maven and Coursier download artifacts
+      # Maven will only download the pom when the transitive dependency is not needed in the current projects compile classpath
+      # whereas Coursier expects the artifact (jar) to be present in a Maven repository. When Coursier encounters a
+      # artifact folder with a pom it considers the artifact to be available and will then crash when the jar is missing.
+      - name: Clear m2 cache except openapitools (because otherwise coursier will fail to resolve artifacts where only poms are downloaded)
+        run: |
+          mv ~/.m2/repository/org/openapitools /tmp/openapitools-backup || true
+          rm -rf ~/.m2/repository/*
+          mkdir -p ~/.m2/repository/org
+          mv /tmp/openapitools-backup ~/.m2/repository/org/openapitools || true
+
+      - name: Mill Example - Test Validation Command
+        env:
+          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
+        run: |
+          (cd modules/openapi-generator-mill-plugin/example/ && ./mill validateOpenapiSpec $(pwd)/api/petstore-invalid.yaml)
+
+      - name: Mill Example - Test Validation Task
+        env:
+          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
+        run: |
+          (cd modules/openapi-generator-mill-plugin/example/ && ./mill openapi.validate)
+
+      - name: Mill Example - Test Compile Task
+        env:
+          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
+        run: |
+          (cd modules/openapi-generator-mill-plugin/example/ && ./mill __.compile)
+          

.github/workflows/openapi-generator.yaml

@@ -23,7 +23,7 @@ jobs:
           distribution: 'temurin'
           cache: gradle
       - name: Cache maven dependencies
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         env:
           cache-name: cache-maven-repository
         with:
@@ -42,7 +42,7 @@ jobs:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
       - run: ls -la  modules/openapi-generator-cli/target
       - name: Upload openapi-generator-cli.jar artifact
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: openapi-generator-cli.jar
           path: modules/openapi-generator-cli/target/openapi-generator-cli.jar
@@ -62,7 +62,7 @@ jobs:
           distribution: 'temurin'
           cache: gradle
       - name: Cache maven dependencies
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         env:
           cache-name: cache-maven-repository
         with:
@@ -81,7 +81,7 @@ jobs:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
       - name: Publish unit test reports
         if: ${{ always() }}
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: surefire-test-results
           path: '**/surefire-reports/TEST-*.xml'
@@ -99,7 +99,7 @@ jobs:
           java-version: 11
           distribution: 'temurin'
       - name: Download openapi-generator-cli.jar artifact
-        uses: actions/download-artifact@v6
+        uses: actions/download-artifact@v7
         with:
           name: openapi-generator-cli.jar
           path: modules/openapi-generator-cli/target
@@ -138,7 +138,7 @@ jobs:
           java-version: 11
           distribution: 'temurin'
       - name: Download openapi-generator-cli.jar artifact
-        uses: actions/download-artifact@v6
+        uses: actions/download-artifact@v7
         with:
           name: openapi-generator-cli.jar
           path: modules/openapi-generator-cli/target

.github/workflows/samples-aspnet-fastenpoints-server.yaml

@@ -26,7 +26,7 @@ jobs:
           - samples/server/petstore/aspnet/fastendpoints-useValidators
     steps:
       - uses: actions/checkout@v5
-      - uses: actions/setup-dotnet@v5.0.0
+      - uses: actions/setup-dotnet@v5.1.0
         with:
           dotnet-version: '8.0.x'
       - name: Build