fix validation of missing 'version' field

frantuma · frantuma · commit 64a1b40f44a5 · 2025-05-01T21:43:11.000+02:00
diff --git a/.github/workflows/maven-v1-pulls.yml b/.github/workflows/maven-v1-pulls.yml
@@ -6,23 +6,26 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ 8 ]
+        java: [ "8" ]
 
     steps:
     - uses: actions/checkout@v2
     - name: Set up Java
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v4
       with:
         java-version: ${{ matrix.java }}
+        distribution: 'temurin'
     - name: Cache local Maven repository
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: ~/.m2/repository
         key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
         restore-keys: |
           ${{ runner.os }}-maven-
     - name: Build with Maven
-      run: mvn -B verify --file pom.xml
+      run: |
+        ulimit -n 16384
+        mvn -X -e -B verify --file pom.xml -Dsurefire.forkCount=4 -DargLine="-XX:-OmitStackTraceInFastThrow" -Dsurefire.useFile=false
diff --git a/.github/workflows/maven-v1.yml b/.github/workflows/maven-v1.yml
@@ -7,22 +7,27 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         java: [ 8 ]
 
     steps:
       - uses: actions/checkout@v2
       - name: Set up Java
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.java }}
           server-id: ossrh
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD
+          distribution: 'zulu'
+      - name: Fix missing tzdb.dat in system JRE
+        run: |
+          sudo mkdir -p /usr/share/javazi-1.8
+          sudo cp "/usr/lib/jvm/temurin-8-jdk-amd64/jre/lib/tzdb.dat" /usr/share/javazi-1.8/
       - 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/.github/workflows/next-snapshot-v1.yml b/.github/workflows/next-snapshot-v1.yml
@@ -7,7 +7,7 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v2
@@ -21,14 +21,19 @@ jobs:
       with:
         python-version: 2.7
     - name: Set up Java 11
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v4
       with:
         java-version: 11
         server-id: ossrh
         server-username: MAVEN_USERNAME
         server-password: MAVEN_PASSWORD
+        distribution: 'zulu'
+    - name: Fix missing tzdb.dat in system JRE
+      run: |
+        sudo mkdir -p /usr/share/javazi-1.8
+        sudo cp "${JAVA_HOME}/lib/tzdb.dat" /usr/share/javazi-1.8/
     - 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/.github/workflows/prepare-release-v1.yml b/.github/workflows/prepare-release-v1.yml
@@ -7,7 +7,7 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v2
@@ -21,14 +21,19 @@ jobs:
       with:
         python-version: '3.10'
     - name: Set up Java 8
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v4
       with:
         java-version: 8
         server-id: ossrh
         server-username: MAVEN_USERNAME
         server-password: MAVEN_PASSWORD
+        distribution: 'zulu'
+    - name: Fix missing tzdb.dat in system JRE
+      run: |
+        sudo mkdir -p /usr/share/javazi-1.8
+        sudo cp "${JAVA_HOME}/lib/tzdb.dat" /usr/share/javazi-1.8/
     - 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/.github/workflows/release-v1.yml b/.github/workflows/release-v1.yml
@@ -7,7 +7,7 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v2
@@ -21,14 +21,19 @@ jobs:
       with:
         python-version: '3.10'
     - name: Set up Java 8
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v4
       with:
         java-version: 8
         server-id: ossrh
         server-username: MAVEN_USERNAME
         server-password: MAVEN_PASSWORD
+        distribution: 'zulu'
+    - name: Fix missing tzdb.dat in system JRE
+      run: |
+        sudo mkdir -p /usr/share/javazi-1.8
+        sudo cp "${JAVA_HOME}/lib/tzdb.dat" /usr/share/javazi-1.8/
     - 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/modules/swagger-parser/src/main/java/io/swagger/parser/util/SwaggerDeserializer.java b/modules/swagger-parser/src/main/java/io/swagger/parser/util/SwaggerDeserializer.java
@@ -1269,7 +1269,7 @@ public Info info(ObjectNode node, String location, ParseResult result) {
         License license = license(obj, location, result);
         info.license(license);
 
-        value = getString("version", node, false, location, result);
+        value = getString("version", node, true, location, result);
         info.version(value);
 
         // extra keys
diff --git a/modules/swagger-parser/src/test/java/io/swagger/parser/SwaggerParserTest.java b/modules/swagger-parser/src/test/java/io/swagger/parser/SwaggerParserTest.java
@@ -1876,4 +1876,12 @@ public void test20SafeURLResolvingWithLocalhost() throws IOException {
             new SwaggerParser().read(jsonNodeSwagger, null, parseOptions);
         });
     }
+
+    @Test
+    public void testIssueSwg14378() {
+
+        SwaggerDeserializationResult result = new SwaggerParser().readWithInfo("src/test/resources/issue-swg-14378.yaml", null, false);
+        assertNotNull(result);
+        assertEquals("attribute info.version is missing",result.getMessages().get(0));
+    }
 }
diff --git a/modules/swagger-parser/src/test/java/io/swagger/parser/SwaggerReaderTest.java b/modules/swagger-parser/src/test/java/io/swagger/parser/SwaggerReaderTest.java
@@ -251,6 +251,7 @@ public void testIssue205() {
             "swagger: '2.0'\n" +
             "info:\n" +
             "  title: nice\n" +
+            "  version: '1'\n" +
             "paths: {}\n" +
             "definitions:\n" +
             "  Empty:\n" +
diff --git a/modules/swagger-parser/src/test/resources/issue-swg-14378.yaml b/modules/swagger-parser/src/test/resources/issue-swg-14378.yaml
@@ -0,0 +1,10 @@
+swagger: "2.0"
+info:
+  description: some description
+  title: data
+paths:
+  /tickets:
+    get:
+      responses:
+        200:
+          description: data
diff --git a/pom.xml b/pom.xml
@@ -127,7 +127,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.11.0</version>
+                <version>3.13.0</version>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>

Original file line number	Diff line number	Diff line change
`@@ -1876,4 +1876,12 @@ public void test20SafeURLResolvingWithLocalhost() throws IOException {`
`1876`	`1876`	`new SwaggerParser().read(jsonNodeSwagger, null, parseOptions);`
`1877`	`1877`	`});`
`1878`	`1878`	`}`
	`1879`	`+`
	`1880`	`+ @Test`
	`1881`	`+ public void testIssueSwg14378() {`
	`1882`	`+`
	`1883`	`+ SwaggerDeserializationResult result = new SwaggerParser().readWithInfo("src/test/resources/issue-swg-14378.yaml", null, false);`
	`1884`	`+ assertNotNull(result);`
	`1885`	`+ assertEquals("attribute info.version is missing",result.getMessages().get(0));`
	`1886`	`+ }`
`1879`	`1887`	`}`