Fix jackson version doc

.github/dependabot.yml

@@ -26,3 +26,16 @@ updates:
       # Old Dependency-Check majors can lose compatibility with the NVD API.
       - dependency-name: "org.owasp:dependency-check-maven"
         update-types: ["version-update:semver-major"]
+  - package-ecosystem: "maven"
+    target-branch: "3.0.0"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    allow:
+      - dependency-name: "*"
+        update-types:
+          - "version-update:semver-minor"
+          - "version-update:semver-patch"
+      # Old Dependency-Check majors can lose compatibility with the NVD API.
+      - dependency-name: "org.owasp:dependency-check-maven"
+        update-types: ["version-update:semver-major"]

.github/workflows/codeql-analysis.yml

@@ -2,10 +2,10 @@ name: "Code scanning - action"
 
 on:
   push:
-    branches: [master, 1.5]
+    branches: ["3.0.0"]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [master, 1.5]
+    branches: ["3.0.0"]
   schedule:
     - cron: '0 19 * * 1'
 
@@ -23,7 +23,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         # We must fetch at least the immediate parents so that if this is
         # a pull request then we can checkout the head.
@@ -37,7 +37,7 @@ jobs:
     - name: Set up Java
       uses: actions/setup-java@v5
       with:
-        java-version: 11
+        java-version: 17
         distribution: temurin
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
@@ -50,9 +50,9 @@ jobs:
       uses: actions/cache@v5
       with:
         path: ~/.m2/repository
-        key: ${{ runner.os }}-jdk11-maven-v2-${{ hashFiles('**/pom.xml') }}
+        key: ${{ runner.os }}-jdk17-maven-v2-${{ hashFiles('**/pom.xml') }}
         restore-keys: |
-          ${{ runner.os }}-jdk11-maven-v2-
+          ${{ runner.os }}-jdk17-maven-v2-
     - name: Set up Gradle
       uses: gradle/actions/setup-gradle@v6
       with:

.github/workflows/dependency-review.yml

@@ -11,6 +11,6 @@ jobs:
     - name: 'Checkout Repository'
       uses: actions/checkout@v6
     - name: Dependency Review
-      uses: actions/dependency-review-action@v4
+      uses: actions/dependency-review-action@v5
       with:
         fail-on-severity: high

.github/workflows/maven-pulls.yml

@@ -2,15 +2,15 @@ name: Build Test PR
 
 on:
   pull_request:
-    branches: [ "master" ]
+    branches: [ "3.0.0" ]
 
 jobs:
   build:
 
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ 11, 17 ]
+        java: [ 17, 21, 25 ]
 
     steps:
     - uses: actions/checkout@v6

.github/workflows/maven.yml

@@ -1,16 +1,16 @@
-name: Build Test Deploy master
+name: Build Test Deploy 3.0.0
 
 on:
   push:
-    branches: [ "master" ]
+    branches: [ "3.0.0" ]
 
 jobs:
   build:
 
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ 11, 17 ]
+        java: [ 17, 21, 25 ]
 
     steps:
     - uses: actions/checkout@v6
@@ -71,7 +71,7 @@ jobs:
       working-directory: modules/swagger-gradle-plugin
       run: ./gradlew build --info --stacktrace --no-daemon
     - name: Deploy snapshot to maven central
-      if: steps.project-version.outputs.is_snapshot == 'true' && matrix.java == 11
+      if: steps.project-version.outputs.is_snapshot == 'true' && matrix.java == 17
       run: ./mvnw --no-transfer-progress -B clean deploy -e
       env:
         MAVEN_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}

.github/workflows/prepare-release.yml

@@ -2,7 +2,6 @@ name: Prepare Release
 
 on:
   workflow_dispatch:
-    branches: ["master"]
 
 jobs:
   build:
@@ -20,10 +19,10 @@ jobs:
       uses: actions/setup-python@v6
       with:
         python-version: '3.10'
-    - name: Set up Java 11
+    - name: Set up Java 17
       uses: actions/setup-java@v5
       with:
-        java-version: 11
+        java-version: 17
         distribution: temurin
         server-id: central
         server-username: MAVEN_USERNAME
@@ -67,6 +66,7 @@ jobs:
         commit-message: prepare release ${{ env.SC_VERSION }}
         title: 'prepare release ${{ env.SC_VERSION }}'
         branch: prepare-release-${{ env.SC_VERSION }}
+        base: ${{ github.ref_name }}
     env:
       MAVEN_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
       MAVEN_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}

.github/workflows/release.yml

@@ -2,7 +2,6 @@ name: Release
 
 on:
   workflow_dispatch:
-    branches: ["master"]
 
 jobs:
   build:
@@ -20,15 +19,17 @@ jobs:
       uses: actions/setup-python@v6
       with:
         python-version: '3.10'
-    - name: Set up Java 11
+    - name: Set up Java 17
       uses: actions/setup-java@v5
       with:
-        java-version: 11
+        java-version: 17
         distribution: temurin
         server-id: central
         server-username: MAVEN_USERNAME
         server-password: MAVEN_PASSWORD
         gpg-private-key: ${{ secrets.OSSRH_GPG_PRIVATE_KEY }}
+        # env var holding the passphrase; also the one maven-gpg-plugin 3.2+ reads by default
+        gpg-passphrase: MAVEN_GPG_PASSPHRASE
     - name: Cache local Maven repository
       uses: actions/cache@v5
       with:
@@ -92,10 +93,10 @@ jobs:
       run: |
         TMPDIR="$(dirname -- "${0}")"
         . $TMPDIR/publish-javadocs.sh
-    - name: Checkout master
+    - name: Checkout ${{ github.ref_name }}
       uses: actions/checkout@v6
       with:
-        ref: "master"
+        ref: ${{ github.ref_name }}
         fetch-depth: 0
     - name: Run post release script
       id: postRelease
@@ -110,45 +111,7 @@ jobs:
         commit-message: bump snapshot ${{ env.SC_NEXT_VERSION }}-SNAPSHOT
         title: 'bump snapshot ${{ env.SC_NEXT_VERSION }}-SNAPSHOT'
         branch: bump-snap-${{ env.SC_NEXT_VERSION }}-SNAPSHOT
-    - name: Checkout 1.5
-      uses: actions/checkout@v6
-      with:
-        ref: "1.5"
-        fetch-depth: 0
-    - name: updateV1Readme script
-      id: updateV1Readme
-      if: env.RELEASE_OK == 'yes'
-      run: |
-        TMPDIR="$(dirname -- "${0}")"
-        . $TMPDIR/update-v1-readme.sh ${{ env.SC_LAST_RELEASE }} ${{ env.SC_VERSION }}
-    - name: Create Update V1 Readme Pull Request
-      uses: peter-evans/create-pull-request@v8
-      if: env.RELEASE_OK == 'yes'
-      with:
-        token: ${{ steps.generate-token.outputs.token }}
-        commit-message: update 1.5 Readme with new v2 version ${{ env.SC_VERSION }}
-        title: 'update 1.5 Readme with new v2 version ${{ env.SC_VERSION }}'
-        branch: update-v1-readme-${{ env.SC_VERSION }}
-    - name: Checkout Wiki
-      uses: actions/checkout@v6
-      with:
-        repository: swagger-api/swagger-core.wiki
-        token: ${{ steps.generate-token.outputs.token }}
-        path: wiki
-        ref: "master"
-        fetch-depth: 0
-
-    - name: Run update wiki script
-      id: updateWiki
-      if: env.RELEASE_OK == 'yes'
-      run: |
-        TMPDIR="$(dirname -- "${0}")"
-        . $TMPDIR/update-wiki.sh
-    - name: Checkout master
-      uses: actions/checkout@v6
-      with:
-        ref: "master"
-        fetch-depth: 0
+        base: ${{ github.ref_name }}
 
     env:
       MAVEN_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
@@ -157,6 +120,6 @@ jobs:
       SC_VERSION:
       SC_NEXT_VERSION:
       GPG_PRIVATE_KEY: ${{ secrets.OSSRH_GPG_PRIVATE_KEY }}
-      GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_PRIVATE_PASSPHRASE }}
+      MAVEN_GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_PRIVATE_PASSPHRASE }}
       GRADLE_PUBLISH_KEY: ${{ secrets.GRADLE_PUBLISH_KEY }}
       GRADLE_PUBLISH_SECRET: ${{ secrets.GRADLE_PUBLISH_SECRET }}

.gitignore

@@ -14,3 +14,4 @@ atlassian-ide-plugin.xml
 sonar-project.properties
 test-output/
 *.pyc
+*.versionsBackup

.mvn/wrapper/maven-wrapper.properties

@@ -1,3 +1,3 @@
 wrapperVersion=3.3.4
 distributionType=only-script
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.14/apache-maven-3.9.14-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.16/apache-maven-3.9.16-bin.zip

CHANGELOG.md

@@ -6,6 +6,18 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 
 ## [Unreleased]
 
+### Added
+- Opt-in `oneOf` composition for `@JsonSubTypes` parents. Enable it with
+  `-Djson-subtypes-oneof` or `ModelResolver.jsonSubTypesOneOf = true`. When enabled,
+  a parent class with `@JsonSubTypes` gets a `oneOf` that lists its resolved subtypes,
+  and the subtypes keep their `allOf` reference to the parent. An explicit
+  `@Schema(oneOf = ...)` on the parent takes priority. The default is off, so the
+  generated schemas do not change unless you enable it. Use it for abstract classes and
+  interfaces. A concrete parent class is not listed in its own `oneOf`, so an instance of
+  the parent itself does not match the schema. Note: the result has a cycle
+  (`allOf` from subtype to parent, `oneOf` from parent to subtype). Some tools, such as
+  swagger-ui and openapi-generator, may not handle this shape well.
+
 ## [2.2.54] - 2026-08-18
 
 ### Fixed