Merge branch 'master' into 4781

Author: mironbalcerzak

README.md

@@ -23,7 +23,8 @@ The OpenAPI Specification has undergone several revisions since initial creation
 
 Swagger core Version      | Release Date | OpenAPI Spec compatibility | Notes | Status
 ------------------------- | ------------ | -------------------------- | ----- | ----
-2.2.26 (**current stable**)| 2024-11-18   | 3.x           | [tag v2.2.26](https://github.com/swagger-api/swagger-core/tree/v2.2.26) | Supported
+2.2.27 (**current stable**)| 2024-12-11   | 3.x           | [tag v2.2.27](https://github.com/swagger-api/swagger-core/tree/v2.2.27) | Supported
+2.2.26                     | 2024-11-18   | 3.x           | [tag v2.2.26](https://github.com/swagger-api/swagger-core/tree/v2.2.26) | Supported
 2.2.25                     | 2024-10-02   | 3.x           | [tag v2.2.25](https://github.com/swagger-api/swagger-core/tree/v2.2.25) | Supported
 2.2.24                     | 2024-09-23   | 3.x           | [tag v2.2.24](https://github.com/swagger-api/swagger-core/tree/v2.2.24) | Supported
 2.2.23                     | 2024-08-28   | 3.x           | [tag v2.2.23](https://github.com/swagger-api/swagger-core/tree/v2.2.23) | Supported
@@ -119,7 +120,7 @@ You need the following installed and available in your $PATH:
 * Jackson 2.4.5 or greater
 
 
-### To build from source (currently 2.2.27-SNAPSHOT)
+### To build from source (currently 2.2.28-SNAPSHOT)
 ```
 # first time building locally
 mvn -N

modules/swagger-annotations/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.swagger.core.v3</groupId>
         <artifactId>swagger-project</artifactId>
-        <version>2.2.27-SNAPSHOT</version>
+        <version>2.2.28-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/swagger-core/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.swagger.core.v3</groupId>
         <artifactId>swagger-project</artifactId>
-        <version>2.2.27-SNAPSHOT</version>
+        <version>2.2.28-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/swagger-core/src/main/java/io/swagger/v3/core/jackson/ModelResolver.java

@@ -1118,7 +1118,7 @@ private Stream<Annotation> extractGenericTypeArgumentAnnotations(BeanPropertyDef
 
     private Stream<Annotation> getRecordComponentAnnotations(BeanPropertyDefinition propDef) {
         try {
-            Method accessor = propDef.getPrimaryMember().getDeclaringClass().getDeclaredMethod(propDef.getName());
+            Method accessor = propDef.getPrimaryMember().getDeclaringClass().getDeclaredMethod(propDef.getPrimaryMember().getName());
             return getGenericTypeArgumentAnnotations(accessor.getAnnotatedReturnType());
         } catch (NoSuchMethodException e) {
             LOGGER.error("Accessor for record component not found");
@@ -1169,6 +1169,7 @@ protected Type findJsonValueType(final BeanDescription beanDesc) {
             if (jsonValueMember != null) {
                 return jsonValueMember.getType();
             }
+            return null;
         } catch (Exception e) {
             LOGGER.warn("jackson BeanDescription.findJsonValueAccessor not found, this could lead to inaccurate result, please update jackson to 2.9+");
         }

modules/swagger-eclipse-transformer-maven-plugin/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.swagger.core.v3</groupId>
         <artifactId>swagger-project</artifactId>
-        <version>2.2.27-SNAPSHOT</version>
+        <version>2.2.28-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/swagger-gradle-plugin/README.md

@@ -26,7 +26,7 @@ Alternatively provide as value a classpath with the following dependencies (repl
 
 ```
 plugins {
-  id "io.swagger.core.v3.swagger-gradle-plugin" version "2.2.26"
+  id "io.swagger.core.v3.swagger-gradle-plugin" version "2.2.27"
 }
 ```
 ### Gradle 1.x and 2.0
@@ -43,7 +43,7 @@ buildscript {
     }
   }
   dependencies {
-    classpath "io.swagger.core.v3:swagger-gradle-plugin:2.2.26"
+    classpath "io.swagger.core.v3:swagger-gradle-plugin:2.2.27"
   }
 }
 

modules/swagger-gradle-plugin/gradle.properties

@@ -1,2 +1,2 @@
-version=2.2.27-SNAPSHOT
+version=2.2.28-SNAPSHOT
 jettyVersion=9.4.53.v20231009

modules/swagger-gradle-plugin/src/main/java/io/swagger/v3/plugins/gradle/SwaggerPlugin.java

@@ -4,9 +4,10 @@
 import org.gradle.api.Action;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
-import org.gradle.api.Task;
 import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.artifacts.DependencySet;
+import org.gradle.api.tasks.SourceSetContainer;
+import org.gradle.api.tasks.TaskProvider;
 
 public class SwaggerPlugin implements Plugin<Project> {
     public void apply(Project project) {
@@ -16,29 +17,25 @@ public void apply(Project project) {
         config.defaultDependencies(new Action<DependencySet>() {
             public void execute(DependencySet dependencies) {
                 dependencies.add(project.getDependencies().create("org.apache.commons:commons-lang3:3.12.0"));
-                dependencies.add(project.getDependencies().create("io.swagger.core.v3:swagger-jaxrs2:2.2.27-SNAPSHOT"));
+                dependencies.add(project.getDependencies().create("io.swagger.core.v3:swagger-jaxrs2:2.2.28-SNAPSHOT"));
                 dependencies.add(project.getDependencies().create("javax.ws.rs:javax.ws.rs-api:2.1"));
                 dependencies.add(project.getDependencies().create("javax.servlet:javax.servlet-api:3.1.0"));
             }
         });
-        Task task = project.getTasks().create("resolve", ResolveTask.class);
-        ((ResolveTask)task).setBuildClasspath(config);
-
-        try {
-            if (project.getTasks().findByPath("classes") != null) {
-                task.dependsOn("classes");
-            }
-            if (project.getTasks().findByPath("compileJava") != null) {
-                task.dependsOn("compileJava");
-            }
-            if (project.getTasks().findByPath("compileTestJava") != null) {
-                task.dependsOn("compileTestJava");
-            }
-            if (project.getTasks().findByPath("testClasses") != null) {
-                task.dependsOn("testClasses");
-            }
-        } catch (Exception e) {
-            project.getLogger().warn("Exception in task dependencies: " + e.getMessage(), e);
-        }
+        TaskProvider<ResolveTask> lazyTask = project.getTasks().register("resolve", ResolveTask.class,task -> {
+            task.buildClasspath.setFrom(config);
+            task.classpath.setFrom(project.getExtensions().findByType(SourceSetContainer.class).getByName("main").getRuntimeClasspath().getFiles());
+            task.prettyPrint.convention(false);
+            task.readAllResources.convention(true);
+            task.outputFormat.convention(ResolveTask.Format.JSON);
+            task.skip.convention(false);
+            task.encoding.convention("UTF-8");
+            task.sortOutput.convention(Boolean.FALSE);
+            task.alwaysResolveAppPath.convention(Boolean.FALSE);
+            task.skipResolveAppPath.convention(Boolean.FALSE);
+            task.openAPI31.convention(false);
+            task.convertToOpenAPI31.convention(false);
+            task.outputDir.convention(project.getLayout().getBuildDirectory().dir("swagger"));
+        });
     }
 }