Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: swagger-api/swagger-parser
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.0.29
Choose a base ref
...
head repository: swagger-api/swagger-parser
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Dec 4, 2020

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    6b0a327 View commit details

Commits on Apr 19, 2021

  1. Copy the full SHA
    e2e2ce1 View commit details

Commits on Jul 24, 2021

  1. Added support for jar: URLs to readContentFromLocation(String,List<Au…

    …thorizationValue> auth).
    allen-ball committed Jul 24, 2021
    Copy the full SHA
    9ddfaed View commit details
  2. Added test for #1592.

    allen-ball committed Jul 24, 2021
    Copy the full SHA
    9ac1dde View commit details

Commits on Jul 28, 2021

  1. Copy the full SHA
    61b1402 View commit details

Commits on Jul 29, 2021

  1. Copy the full SHA
    46fa4a1 View commit details
  2. Copy the full SHA
    de9ee63 View commit details

Commits on Aug 1, 2021

  1. Copy the full SHA
    a2cc769 View commit details

Commits on Aug 29, 2021

  1. Copy the full SHA
    9bee19c View commit details

Commits on Sep 20, 2021

  1. Copy the full SHA
    4bbaf26 View commit details

Commits on Sep 23, 2021

  1. Copy the full SHA
    70a07b0 View commit details

Commits on Sep 24, 2021

  1. Copy the full SHA
    946e116 View commit details

Commits on Sep 30, 2021

  1. Copy the full SHA
    933ddfd View commit details

Commits on Dec 18, 2021

  1. Copy the full SHA
    7424f91 View commit details

Commits on Dec 19, 2021

  1. Copy the full SHA
    19bc11c View commit details

Commits on Jan 5, 2022

  1. fix #1638

    jtpereyda committed Jan 5, 2022
    Copy the full SHA
    9450df8 View commit details

Commits on Jan 6, 2022

  1. Copy the full SHA
    d29f6f0 View commit details

Commits on Feb 2, 2022

  1. Copy the full SHA
    ca1a014 View commit details
  2. Merge pull request #1645 from swagger-api/issue1644

    improves AllowEmptyString option validation
    gracekarina authored Feb 2, 2022
    Copy the full SHA
    fc0283f View commit details
  3. Copy the full SHA
    af38ad0 View commit details
  4. Copy the full SHA
    1be0045 View commit details
  5. Copy the full SHA
    1912084 View commit details

Commits on Feb 3, 2022

  1. Copy the full SHA
    f688339 View commit details
  2. Copy the full SHA
    ebf4a0a View commit details
  3. Copy the full SHA
    08e7859 View commit details

Commits on Feb 4, 2022

  1. Copy the full SHA
    dd97788 View commit details
  2. Copy the full SHA
    592e082 View commit details

Commits on Feb 7, 2022

  1. update dependencies

    frantuma committed Feb 7, 2022
    Copy the full SHA
    ddd21eb View commit details
  2. Copy the full SHA
    4c62209 View commit details
  3. Copy the full SHA
    6d4fe95 View commit details
  4. Copy the full SHA
    eeec2e4 View commit details
  5. Copy the full SHA
    e143821 View commit details
  6. Copy the full SHA
    a278bb4 View commit details

Commits on Feb 10, 2022

  1. Copy the full SHA
    ab5cb20 View commit details
  2. Merge pull request #1593 from allen-ball/master

    Issue #1592 Add support for JAR: URLs to OpenAPIV3Parser
    gracekarina authored Feb 10, 2022
    Copy the full SHA
    254b96c View commit details

Commits on Feb 11, 2022

  1. Copy the full SHA
    ba4642a View commit details

Commits on Feb 14, 2022

  1. Copy the full SHA
    e8faa8d View commit details
  2. Copy the full SHA
    5d7cd72 View commit details
  3. Copy the full SHA
    8905eab View commit details

Commits on Feb 15, 2022

  1. Copy the full SHA
    a6c1dc6 View commit details
  2. Merge pull request #1659 from swagger-api/swos-443-yaml

    add location to messages for external refs
    gracekarina authored Feb 15, 2022
    Copy the full SHA
    5f63f2f View commit details

Commits on Feb 21, 2022

  1. add org.owasp dependency

    gracekarina committed Feb 21, 2022
    Copy the full SHA
    627f5cc View commit details
  2. Merge pull request #1662 from swagger-api/issue521Master

    add org.owasp dependency
    gracekarina authored Feb 21, 2022
    Copy the full SHA
    7923bd9 View commit details
  3. Copy the full SHA
    1f1bd66 View commit details
  4. Copy the full SHA
    e86a69e View commit details

Commits on Feb 22, 2022

  1. Copy the full SHA
    c3db996 View commit details

Commits on Feb 23, 2022

  1. Merge pull request #1663 from swagger-api/issue521_30

    add org.owasp dependency in security profile
    gracekarina authored Feb 23, 2022
    Copy the full SHA
    2ce759f View commit details

Commits on Feb 24, 2022

  1. Copy the full SHA
    2ec8ebb View commit details
  2. Copy the full SHA
    af47508 View commit details
  3. Copy the full SHA
    f1889a7 View commit details
Showing 536 changed files with 32,048 additions and 3,163 deletions.
21 changes: 21 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# http://editorconfig.org

# A special property that should be specified at the top of the file outside of
# any sections. Set to true to stop .editor config file search on current file
root = true

[*]
# Indentation style
# Possible values - tab, space
indent_style = space

# File character encoding
# Possible values - latin1, utf-8, utf-16be, utf-16le
charset = utf-8

[modules/swagger-parser-v3/src/test/resources/**/*.json]
trim_trailing_whitespace = false
insert_final_newline = false
[modules/swagger-parser-v3/src/test/resources/**/*.yaml]
trim_trailing_whitespace = false
insert_final_newline = false
40 changes: 40 additions & 0 deletions .github/actions/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: 'Swagger Parser'
description: 'Parses, validates, dereferences an OpenAPI definition'
inputs:
inputSpec:
description: 'path to OpenAPI definition file'
required: true
options:
description: 'parser options'
required: false
serializationType:
description: 'result file serialization type'
required: false
logsPath:
description: 'path to validation result file'
required: false
parserSpecPath:
description: 'output path of the serialized parsed definition'
required: false
parserVersion:
description: 'parser version'
required: false
runs:
using: "composite"
steps:
- id: java-version
run: java -version 2>&1 | fgrep -i version | cut -d'"' -f2 | sed -e 's/^1\./1\%/' -e 's/\..*//' -e 's/%/./'
shell: bash
- name: Build Java
if: steps.java-version == null || steps.java-version < 1.8
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: '11'
- name: Download JAR
run: curl -L 'https://repository.sonatype.org/service/local/artifact/maven/content?r=central-proxy&g=io.swagger.parser.v3&a=swagger-parser-cli&e=jar&v=${{ inputs.parserVersion }}' -o swagger-parser-cli.jar
shell: bash
- id: execute
name: Execute Jar
run: java -jar swagger-parser-cli.jar -i /home/runner/work/${{ inputs.inputSpec }} ${{ inputs.options }} ${{ inputs.serializationType }} -o /home/runner/work/${{ inputs.parserSpecPath }} -l /home/runner/work/${{ inputs.logsPath }}
shell: bash
9 changes: 9 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
version: 2
updates:
- package-ecosystem: "maven"
directory: "/"
schedule:
interval: "daily"
ignore:
- dependency-name: "*"
update-types: ["version-update:semver-major"]
16 changes: 16 additions & 0 deletions .github/workflows/dependency-review.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: 'Dependency Review'
on: [pull_request]

permissions:
contents: read

jobs:
dependency-review:
runs-on: ubuntu-latest
steps:
- name: 'Checkout Repository'
uses: actions/checkout@v4
- name: Dependency Review
uses: actions/dependency-review-action@v3
with:
fail-on-severity: high
2 changes: 1 addition & 1 deletion .github/workflows/maven-pulls.yml
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java: [ 8, 11, 14 ]
java: [ 11, 14, 17 ]

steps:
- uses: actions/checkout@v2
4 changes: 2 additions & 2 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java: [ 8, 11, 14 ]
java: [ 11, 14, 17 ]

steps:
- uses: actions/checkout@v2
@@ -38,7 +38,7 @@ jobs:
mvn --no-transfer-progress -B install --file pom.xml
export MY_JAVA_VERSION=`java -version 2>&1 | head -1 | cut -d'"' -f2 | sed '/^1\./s///' | cut -d'.' -f1`
echo "JAVA VERSION" ${MY_JAVA_VERSION}
if [[ ${MY_JAVA_VERSION} == "8" ]];
if [[ ${MY_JAVA_VERSION} == "11" ]];
then
export MY_POM_VERSION=`mvn -q -Dexec.executable="echo" -Dexec.args='${projects.version}' --non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec`
echo "POM VERSION" ${MY_POM_VERSION}
8 changes: 4 additions & 4 deletions .github/workflows/next-snapshot-v1.yml
Original file line number Diff line number Diff line change
@@ -16,10 +16,10 @@ jobs:
with:
app_id: ${{ secrets.APP_ID }}
private_key: ${{ secrets.APP_PRIVATE_KEY }}
- name: Set up Python 2.7
uses: actions/setup-python@v2
- name: Set up Python 3.10
uses: actions/setup-python@v4
with:
python-version: 2.7
python-version: '3.10'
- name: Set up Java 8
uses: actions/setup-java@v2
with:
@@ -68,7 +68,7 @@ jobs:
run: |
. ./CI/post-nextsnap-v1.sh
- name: Create Next Snapshot Pull Request
uses: peter-evans/create-pull-request@v2
uses: peter-evans/create-pull-request@v4
if: env.RELEASE_OK == 'yes'
with:
token: ${{ steps.generate-token.outputs.token }}
12 changes: 6 additions & 6 deletions .github/workflows/next-snapshot.yml
Original file line number Diff line number Diff line change
@@ -16,14 +16,14 @@ jobs:
with:
app_id: ${{ secrets.APP_ID }}
private_key: ${{ secrets.APP_PRIVATE_KEY }}
- name: Set up Python 2.7
uses: actions/setup-python@v2
- name: Set up Python 3.10
uses: actions/setup-python@v4
with:
python-version: 2.7
- name: Set up Java 8
python-version: '3.10'
- name: Set up Java 11
uses: actions/setup-java@v2
with:
java-version: 8
java-version: 11
distribution: 'zulu'
server-id: ossrh
server-username: MAVEN_USERNAME
@@ -68,7 +68,7 @@ jobs:
run: |
. ./CI/post-nextsnap.sh
- name: Create Next Snapshot Pull Request
uses: peter-evans/create-pull-request@v2
uses: peter-evans/create-pull-request@v4
if: env.RELEASE_OK == 'yes'
with:
token: ${{ steps.generate-token.outputs.token }}
8 changes: 4 additions & 4 deletions .github/workflows/prepare-release-v1.yml
Original file line number Diff line number Diff line change
@@ -16,10 +16,10 @@ jobs:
with:
app_id: ${{ secrets.APP_ID }}
private_key: ${{ secrets.APP_PRIVATE_KEY }}
- name: Set up Python 2.7
uses: actions/setup-python@v2
- name: Set up Python 3.10
uses: actions/setup-python@v4
with:
python-version: 2.7
python-version: '3.10'
- name: Set up Java 8
uses: actions/setup-java@v2
with:
@@ -50,7 +50,7 @@ jobs:
echo "SC_VERSION=$SC_VERSION" >> $GITHUB_ENV
echo "SC_NEXT_VERSION=$SC_NEXT_VERSION" >> $GITHUB_ENV
- name: Create Prepare Release Pull Request
uses: peter-evans/create-pull-request@v2
uses: peter-evans/create-pull-request@v4
if: env.PREPARE_RELEASE_OK == 'yes'
with:
token: ${{ steps.generate-token.outputs.token }}
12 changes: 6 additions & 6 deletions .github/workflows/prepare-release.yml
Original file line number Diff line number Diff line change
@@ -16,14 +16,14 @@ jobs:
with:
app_id: ${{ secrets.APP_ID }}
private_key: ${{ secrets.APP_PRIVATE_KEY }}
- name: Set up Python 2.7
uses: actions/setup-python@v2
- name: Set up Python 3.10
uses: actions/setup-python@v4
with:
python-version: 2.7
- name: Set up Java 8
python-version: '3.10'
- name: Set up Java 11
uses: actions/setup-java@v2
with:
java-version: 8
java-version: 11
distribution: 'zulu'
server-id: ossrh
server-username: MAVEN_USERNAME
@@ -50,7 +50,7 @@ jobs:
echo "SC_VERSION=$SC_VERSION" >> $GITHUB_ENV
echo "SC_NEXT_VERSION=$SC_NEXT_VERSION" >> $GITHUB_ENV
- name: Create Prepare Release Pull Request
uses: peter-evans/create-pull-request@v2
uses: peter-evans/create-pull-request@v4
if: env.PREPARE_RELEASE_OK == 'yes'
with:
token: ${{ steps.generate-token.outputs.token }}
8 changes: 4 additions & 4 deletions .github/workflows/release-v1.yml
Original file line number Diff line number Diff line change
@@ -16,10 +16,10 @@ jobs:
with:
app_id: ${{ secrets.APP_ID }}
private_key: ${{ secrets.APP_PRIVATE_KEY }}
- name: Set up Python 2.7
uses: actions/setup-python@v2
- name: Set up Python 3.10
uses: actions/setup-python@v4
with:
python-version: 2.7
python-version: '3.10'
- name: Set up Java 8
uses: actions/setup-java@v2
with:
@@ -72,7 +72,7 @@ jobs:
run: |
. ./CI/post-release-v1.sh
- name: Create Next Snapshot Pull Request
uses: peter-evans/create-pull-request@v2
uses: peter-evans/create-pull-request@v4
if: env.RELEASE_OK == 'yes'
with:
token: ${{ steps.generate-token.outputs.token }}
12 changes: 6 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -16,14 +16,14 @@ jobs:
with:
app_id: ${{ secrets.APP_ID }}
private_key: ${{ secrets.APP_PRIVATE_KEY }}
- name: Set up Python 2.7
uses: actions/setup-python@v2
- name: Set up Python 3.10
uses: actions/setup-python@v4
with:
python-version: 2.7
- name: Set up Java 8
python-version: '3.10'
- name: Set up Java 11
uses: actions/setup-java@v2
with:
java-version: 8
java-version: 11
distribution: 'zulu'
server-id: ossrh
server-username: MAVEN_USERNAME
@@ -72,7 +72,7 @@ jobs:
run: |
. ./CI/post-release.sh
- name: Create Next Snapshot Pull Request
uses: peter-evans/create-pull-request@v2
uses: peter-evans/create-pull-request@v4
if: env.RELEASE_OK == 'yes'
with:
token: ${{ steps.generate-token.outputs.token }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -12,3 +12,4 @@ modules/swagger-parser/src/test/resources/relative-file-references/yaml
**/test-output/*
dependency-reduced-pom.xml
*.pyc
/bin/
6 changes: 6 additions & 0 deletions .whitesource
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"settingsInheritedFrom": "swagger-api/whitesource-config@main",
"scanSettings": {
"baseBranches": ["master", "v1"]
}
}
47 changes: 24 additions & 23 deletions CI/ghApiClient.py
Original file line number Diff line number Diff line change
@@ -2,8 +2,8 @@

import os
import time
import urllib2
import httplib
import urllib.request, urllib.error, urllib.parse
import http.client
import json

GH_BASE_URL = "https://api.github.com/"
@@ -13,46 +13,47 @@

def readUrl(name):
try:
request = urllib2.Request(GH_BASE_URL + name)
request = urllib.request.Request(GH_BASE_URL + name)
request.add_header("Authorization", GH_AUTH)
content = urllib2.urlopen(request).read()
content = urllib.request.urlopen(request).read()
jcont = json.loads(content)
return jcont;
except urllib2.HTTPError, e:
print 'HTTPError = ' + str(e.code)
return jcont
except urllib.error.HTTPError as e:
print(('HTTPError = ' + str(e.code)))
raise e
except urllib2.URLError, e:
print 'URLError = ' + str(e.reason)
except urllib.error.URLError as e:
print(('URLError = ' + str(e.reason)))
raise e
except httplib.HTTPException, e:
print 'HTTPException = ' + str(e)
except http.client.HTTPException as e:
print(('HTTPException = ' + str(e)))
raise e
except Exception:
import traceback
print 'generic exception: ' + traceback.format_exc()
print(('generic exception: ' + traceback.format_exc()))
raise IOError

def postUrl(name, body):
global GH_BASE_URL
try:
time.sleep(0.05)
request = urllib2.Request(GH_BASE_URL + name)
request = urllib.request.Request(GH_BASE_URL + name)
request.add_header("Authorization", GH_AUTH)
request.add_header("Accept", "application/vnd.github.v3+json")
content = urllib2.urlopen(request, body).read()
data = body.encode('utf-8')
content = urllib.request.urlopen(request, data).read()
jcont = json.loads(content)
return jcont;
except urllib2.HTTPError, e:
print 'HTTPError = ' + str(e.code)
print str(e)
return jcont
except urllib.error.HTTPError as e:
print(('HTTPError = ' + str(e.code)))
print((str(e)))
raise e
except urllib2.URLError, e:
print 'URLError = ' + str(e.reason)
except urllib.error.URLError as e:
print(('URLError = ' + str(e.reason)))
raise e
except httplib.HTTPException, e:
print 'HTTPException = ' + str(e)
except http.client.HTTPException as e:
print(('HTTPException = ' + str(e)))
raise e
except Exception:
import traceback
print 'generic exception: ' + traceback.format_exc()
print(('generic exception: ' + traceback.format_exc()))
raise IOError
3 changes: 2 additions & 1 deletion CI/lastRelease.py
Original file line number Diff line number Diff line change
@@ -13,7 +13,8 @@ def getLastReleaseTag():
# main
def main():
result = getLastReleaseTag()
print result
print(result)

# here start main
main()

3 changes: 2 additions & 1 deletion CI/lastReleaseV1.py
Original file line number Diff line number Diff line change
@@ -13,7 +13,8 @@ def getLastReleaseTag():
# main
def main():
result = getLastReleaseTag()
print result
print(result)

# here start main
main()

1 change: 1 addition & 0 deletions CI/publishRelease.py
Original file line number Diff line number Diff line change
@@ -25,3 +25,4 @@ def main(tag):

# here start main
main(sys.argv[1])

1 change: 1 addition & 0 deletions CI/publishReleaseV1.py
Original file line number Diff line number Diff line change
@@ -25,3 +25,4 @@ def main(tag):

# here start main
main(sys.argv[1])

Loading