Merge branch 'main' into snyk-fix-76185ed74bda13d674c5530850f6b592

.github/workflows/deploy.yml

@@ -60,6 +60,16 @@ jobs:
           gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
           gpg-passphrase: MAVEN_GPG_PASSPHRASE
 
+      - name: Build SDK
+        uses: Bandwidth/[email protected]
+        with:
+          openapi-generator-version: 7.9.0
+          language: java
+          additional-properties: --additional-properties=artifactVersion=$RELEASE_VERSION
+
+      - name: Clean SDK
+        run: mvn clean
+
       - name: Set Maven Project Version
         run: mvn versions:set -DnewVersion=$RELEASE_VERSION
 
@@ -131,6 +141,16 @@ jobs:
     - name: Get Maven Project Version
       run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/v}" >> $GITHUB_ENV
 
+    - name: Build SDK
+      uses: Bandwidth/[email protected]
+      with:
+        openapi-generator-version: 7.9.0
+        language: java
+        additional-properties: --additional-properties=artifactVersion=$RELEASE_VERSION
+
+    - name: Clean SDK
+      run: mvn clean
+
     - name: Set Maven Project Version
       run: mvn versions:set -DnewVersion=$RELEASE_VERSION
 

.openapi-generator-ignore

@@ -8,7 +8,7 @@
 # You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
 #ApiClient.cs
 
-pom.xml
+# pom.xml
 .idea
 .gitignore
 .github/workflows/maven.yml

.openapi-generator/FILES

@@ -111,6 +111,7 @@ gradle/wrapper/gradle-wrapper.jar
 gradle/wrapper/gradle-wrapper.properties
 gradlew
 gradlew.bat
+pom.xml
 settings.gradle
 src/main/AndroidManifest.xml
 src/main/java/com/bandwidth/sdk/ApiCallback.java

.openapi-generator/VERSION

@@ -1 +1 @@
-7.6.0
+7.10.0

README.md

@@ -2,7 +2,7 @@
 
 Bandwidth
 - API version: 1.0.0
-  - Generator version: 7.6.0
+  - Generator version: 7.10.0
 
 Bandwidth's Communication APIs
 
@@ -41,7 +41,7 @@ Add this dependency to your project's POM:
 <dependency>
   <groupId>com.bandwidth.sdk</groupId>
   <artifactId>bandwidth-sdk</artifactId>
-  <version>10.1.0</version>
+  <version>1.0.0-dev</version>
   <scope>compile</scope>
 </dependency>
 ```
@@ -57,7 +57,7 @@ Add this dependency to your project's build file:
   }
 
   dependencies {
-     implementation "com.bandwidth.sdk:bandwidth-sdk:10.1.0"
+     implementation "com.bandwidth.sdk:bandwidth-sdk:1.0.0-dev"
   }
 ```
 
@@ -71,7 +71,7 @@ mvn clean package
 
 Then manually install the following JARs:
 
-* `target/bandwidth-sdk-10.1.0.jar`
+* `target/bandwidth-sdk-1.0.0-dev.jar`
 * `target/lib/*.jar`
 
 ## Getting Started
@@ -85,7 +85,7 @@ import com.bandwidth.sdk.ApiClient;
 import com.bandwidth.sdk.ApiException;
 import com.bandwidth.sdk.Configuration;
 import com.bandwidth.sdk.auth.*;
-import com.bandwidth.sdk.models.*;
+import com.bandwidth.sdk.model.*;
 import com.bandwidth.sdk.api.CallsApi;
 
 public class Example {

build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'java'
 apply plugin: 'com.diffplug.spotless'
 
 group = 'com.bandwidth.sdk'
-version = '10.1.0'
+version = '1.0.0-dev'
 
 buildscript {
     repositories {
@@ -112,14 +112,13 @@ dependencies {
     implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
     implementation 'com.google.code.gson:gson:2.9.1'
     implementation 'io.gsonfire:gson-fire:1.9.0'
-    implementation 'javax.ws.rs:jsr311-api:1.1.1'
-    implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
+    implementation 'jakarta.ws.rs:jakarta.ws.rs-api:2.1.6'
     implementation 'org.openapitools:jackson-databind-nullable:0.2.6'
-    implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
+    implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.17.0'
     implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.3'
     testImplementation 'org.mockito:mockito-core:3.12.4'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.3'
 }
 
 javadoc {

build.sbt

@@ -2,7 +2,7 @@ lazy val root = (project in file(".")).
   settings(
     organization := "com.bandwidth.sdk",
     name := "bandwidth-sdk",
-    version := "10.1.0",
+    version := "1.0.0-dev",
     scalaVersion := "2.11.4",
     scalacOptions ++= Seq("-feature"),
     javacOptions in compile ++= Seq("-Xlint:deprecation"),
@@ -13,15 +13,14 @@ lazy val root = (project in file(".")).
       "com.squareup.okhttp3" % "okhttp" % "4.12.0",
       "com.squareup.okhttp3" % "logging-interceptor" % "4.12.0",
       "com.google.code.gson" % "gson" % "2.9.1",
-      "org.apache.commons" % "commons-lang3" % "3.12.0",
-      "javax.ws.rs" % "jsr311-api" % "1.1.1",
-      "javax.ws.rs" % "javax.ws.rs-api" % "2.1.1",
+      "org.apache.commons" % "commons-lang3" % "3.17.0",
+      "jakarta.ws.rs" % "jakarta.ws.rs-api" % "2.1.6",
       "org.openapitools" % "jackson-databind-nullable" % "0.2.6",
       "io.gsonfire" % "gson-fire" % "1.9.0" % "compile",
       "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
       "com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile",
       "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
-      "org.junit.jupiter" % "junit-jupiter-api" % "5.10.2" % "test",
+      "org.junit.jupiter" % "junit-jupiter-api" % "5.10.3" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test",
       "org.mockito" % "mockito-core" % "3.12.4" % "test"
     )

openapi-config.yml

@@ -1,9 +1,11 @@
 artifactId: bandwidth-sdk
-artifactVersion: 10.1.0
+artifactVersion: 1.0.0-dev
 artifactDescription: The official client SDK for Bandwidth's Voice, Messaging, MFA, and WebRTC APIs
 artifactUrl: https://github.com/Bandwidth/java-sdk
-developerEmail: [email protected]
-developerOrganization: Bandwidth
+developerName: Bandwidth Support
+developerEmail: [email protected]
+developerOrganization: Bandwidth Inc
+developerOrganizationUrl: http://bandwidth.com
 disallowAdditionalPropertiesIfNotPresent: false
 hideGenerationTimestamp: true
 groupId: com.bandwidth.sdk
@@ -13,3 +15,4 @@ modelPackage: com.bandwidth.sdk.model
 library: okhttp-gson
 licenseName: MIT
 useEnumCaseInsensitive: true
+templateDir: custom_templates

openapitools.json

@@ -2,6 +2,6 @@
   "$schema": "./node_modules/@openapitools/openapi-generator-cli/config.schema.json",
   "spaces": 2,
   "generator-cli": {
-    "version": "7.6.0"
+    "version": "7.10.0"
   }
 }