Merge pull request #453 from swagger-api/update-deps

swagger-api · Oct 16, 2023 · b885ed2 · b885ed2
2 parents 5baf149 + fd3ee88
commit b885ed2
Show file tree

Hide file tree

Showing 13 changed files with 71 additions and 64 deletions.
diff --git a/.github/workflows/next-snapshot-v1.yml b/.github/workflows/next-snapshot-v1.yml
@@ -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:

diff --git a/.github/workflows/prepare-release-v1.yml b/.github/workflows/prepare-release-v1.yml
@@ -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:

diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
@@ -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:

diff --git a/.github/workflows/release-v1.yml b/.github/workflows/release-v1.yml
@@ -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:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -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:

diff --git a/CI/ghApiClient.py b/CI/ghApiClient.py
@@ -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
diff --git a/CI/lastRelease.py b/CI/lastRelease.py
@@ -13,7 +13,8 @@ def getLastReleaseTag():
 # main
 def main():
     result = getLastReleaseTag()
-    print result
+    print(result)
 
 # here start main
 main()
+
diff --git a/CI/lastReleaseV1.py b/CI/lastReleaseV1.py
@@ -13,7 +13,8 @@ def getLastReleaseTag():
 # main
 def main():
     result = getLastReleaseTag()
-    print result
+    print(result)
 
 # here start main
 main()
+
diff --git a/CI/publishRelease.py b/CI/publishRelease.py
@@ -25,3 +25,4 @@ def main(tag):
 
 # here start main
 main(sys.argv[1])
+
diff --git a/CI/publishReleaseV1.py b/CI/publishReleaseV1.py
@@ -25,3 +25,4 @@ def main(tag):
 
 # here start main
 main(sys.argv[1])
+
diff --git a/CI/releaseNotes.py b/CI/releaseNotes.py
@@ -12,13 +12,13 @@ def allPulls(releaseDate):
     baseurl = "https://api.github.com/repos/swagger-api/swagger-inflector/pulls/"
     content = ghApiClient.readUrl('repos/swagger-api/swagger-inflector/pulls?state=closed&base=master&per_page=100')
     for l in content:
-      stripped = l["url"][len(baseurl):]
-      mergedAt = l["merged_at"]
-      if mergedAt is not None:
-          if datetime.strptime(mergedAt, '%Y-%m-%dT%H:%M:%SZ') > releaseDate:
-              if not l['title'].startswith("bump snap"):
-                result += '\n'
-                result += "* " + l['title'] + " (#" + stripped + ")"
+        stripped = l["url"][len(baseurl):]
+        mergedAt = l["merged_at"]
+        if mergedAt is not None:
+            if datetime.strptime(mergedAt, '%Y-%m-%dT%H:%M:%SZ') > releaseDate:
+                if not l['title'].startswith("bump snap"):
+                    result += '\n'
+                    result += "* " + l['title'] + " (#" + stripped + ")"
     return result
 
 
@@ -49,3 +49,4 @@ def main(last_release, release_title, tag):
 
 # here start main
 main(sys.argv[1], sys.argv[2], sys.argv[3])
+
diff --git a/CI/releaseNotesV1.py b/CI/releaseNotesV1.py
@@ -12,13 +12,13 @@ def allPulls(releaseDate):
     baseurl = "https://api.github.com/repos/swagger-api/swagger-inflector/pulls/"
     content = ghApiClient.readUrl('repos/swagger-api/swagger-inflector/pulls?state=closed&base=v1&per_page=100')
     for l in content:
-      stripped = l["url"][len(baseurl):]
-      mergedAt = l["merged_at"]
-      if mergedAt is not None:
-          if datetime.strptime(mergedAt, '%Y-%m-%dT%H:%M:%SZ') > releaseDate:
-              if not l['title'].startswith("bump snap"):
-                result += '\n'
-                result += "* " + l['title'] + " (#" + stripped + ")"
+        stripped = l["url"][len(baseurl):]
+        mergedAt = l["merged_at"]
+        if mergedAt is not None:
+            if datetime.strptime(mergedAt, '%Y-%m-%dT%H:%M:%SZ') > releaseDate:
+                if not l['title'].startswith("bump snap"):
+                    result += '\n'
+                    result += "* " + l['title'] + " (#" + stripped + ")"
     return result
 
 
@@ -49,3 +49,4 @@ def main(last_release, release_title, tag):
 
 # here start main
 main(sys.argv[1], sys.argv[2], sys.argv[3])
+
diff --git a/pom.xml b/pom.xml
@@ -453,7 +453,7 @@
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
-            <version>6.8.8</version>
+            <version>6.14.3</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -499,7 +499,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>
-            <version>1.9.5</version>
+            <version>1.10.19</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -546,23 +546,23 @@
         </repository>
     </repositories>
     <properties>
-        <swagger-core-version>1.6.11</swagger-core-version>
-        <swagger-parser-version>1.0.67</swagger-parser-version>
-        <jackson.version>2.15.2</jackson.version>
+        <swagger-core-version>1.6.12</swagger-core-version>
+        <swagger-parser-version>1.0.68</swagger-parser-version>
+        <jackson.version>2.15.3</jackson.version>
         <joda-time-version>2.12.2</joda-time-version>
         <joda-version>1.9.2</joda-version>
-        <jetty-version>9.4.51.v20230217</jetty-version>
-        <jersey2-version>2.39</jersey2-version>
+        <jetty-version>9.4.53.v20231009</jetty-version>
+        <jersey2-version>2.40</jersey2-version>
         <servlet-api-version>2.5</servlet-api-version>
-        <commons-io-version>2.11.0</commons-io-version>
+        <commons-io-version>2.14.0</commons-io-version>
         <commons-fileupload-version>1.5</commons-fileupload-version>
-        <commons-lang-version>3.12.0</commons-lang-version>
+        <commons-lang-version>3.13.0</commons-lang-version>
 
         <commons-csv-version>1.10.0</commons-csv-version>
         <json-schema-validator-version>2.2.14</json-schema-validator-version>
         <junit-version>4.13.2</junit-version>
 
-        <logback-version>1.4.5</logback-version>
+        <logback-version>1.4.11</logback-version>
         <slf4j-version>1.7.36</slf4j-version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <sonatypeOssDistMgmtSnapshotsUrl>https://oss.sonatype.org/content/repositories/snapshots/</sonatypeOssDistMgmtSnapshotsUrl>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -25,3 +25,4 @@ def main(tag):

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