diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 7818c030..a690f885 100644 --- a/.github/workflows/deploy.yml +++ b/.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/generate-sdk-action@v4.0.0 + 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/generate-sdk-action@v4.0.0 + 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 diff --git a/.openapi-generator-ignore b/.openapi-generator-ignore index b8192e47..882e2716 100644 --- a/.openapi-generator-ignore +++ b/.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 diff --git a/.openapi-generator/FILES b/.openapi-generator/FILES index 09c43c7e..a00bd3ea 100644 --- a/.openapi-generator/FILES +++ b/.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 diff --git a/README.md b/README.md index a1254273..f417e672 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ Add this dependency to your project's POM: com.bandwidth.sdk bandwidth-sdk - 10.1.0 + 1.0.0-dev compile ``` @@ -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 diff --git a/build.gradle b/build.gradle index 7e11e0b0..bd34defb 100644 --- a/build.gradle +++ b/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 { diff --git a/build.sbt b/build.sbt index 8ce42414..56dc9700 100644 --- a/build.sbt +++ b/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"), diff --git a/custom_templates/pom.mustache b/custom_templates/pom.mustache new file mode 100644 index 00000000..0e344fdf --- /dev/null +++ b/custom_templates/pom.mustache @@ -0,0 +1,533 @@ + + 4.0.0 + {{groupId}} + {{artifactId}} + jar + {{artifactId}} + {{artifactVersion}} + {{artifactUrl}} + {{artifactDescription}} + + https://github.com/Bandwidth/java-sdk + scm:git:git@github.com:Bandwidth/java-sdk.git + scm:git:git@github.com:Bandwidth/java-sdk.git + +{{#parentOverridden}} + + {{{parentGroupId}}} + {{{parentArtifactId}}} + {{{parentVersion}}} + +{{/parentOverridden}} + + + + {{licenseName}} + {{licenseUrl}} + repo + + + + + + ossrh + https://oss.sonatype.org/content/repositories/snapshots + + + ossrh + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + + + {{developerName}} + {{developerEmail}} + {{developerOrganization}} + {{developerOrganizationUrl}} + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + true + 128m + 512m + + -Xlint:all + -J-Xss4m + + + + + org.apache.maven.plugins + maven-enforcer-plugin + 3.4.1 + + + enforce-maven + + enforce + + + + + 2.2.0 + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.22.2 + + + + loggerPath + conf/log4j.properties + + + -Xms512m -Xmx1500m + methods + 10 + + ${test-classes} + + + + + + org.junit.jupiter + junit-jupiter-engine + ${junit-version} + + + + + maven-dependency-plugin + 3.6.1 + + + package + + copy-dependencies + + + ${project.build.directory}/lib + + + + + + + org.apache.maven.plugins + maven-jar-plugin + 3.3.0 + + + + test-jar + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 3.5.0 + + + add_sources + generate-sources + + add-source + + + + {{{sourceFolder}}} + + + + + add_test_sources + generate-test-sources + + add-test-source + + + + src/test/java + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.6.3 + + + attach-javadocs + + jar + + + + + none + + + http.response.details + a + Http Response Details: + + + + + + org.apache.maven.plugins + maven-source-plugin + 3.3.0 + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 3.0.1 + + + sign-artifacts + verify + + sign + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.7.0 + true + + ossrh + https://oss.sonatype.org/ + true + + + + + com.diffplug.spotless + spotless-maven-plugin + ${spotless.version} + + + + + + + .gitignore + + + + + + true + 4 + + + + + + + + + + 1.8 + + true + + + + + + + + + + + + + + sign-artifacts + + + + org.apache.maven.plugins + maven-gpg-plugin + 3.2.1 + + + sign-artifacts + verify + + sign + + + + + + + + + smoke-tests + + smoke/**/* + + + + unit-tests + + unit/**/* + + + + + + + org.glassfish.jaxb + jaxb-core + ${jaxb.version} + + + org.glassfish.jaxb + jaxb-runtime + ${jaxb.version} + + + org.projectlombok + lombok + 1.18.30 + provided + + + jakarta.xml.bind + jakarta.xml.bind-api + ${jaxb.version} + + + org.hamcrest + hamcrest + 2.2 + + {{#swagger1AnnotationLibrary}} + + io.swagger + swagger-annotations + ${swagger-annotations-version} + + {{/swagger1AnnotationLibrary}} + {{#swagger2AnnotationLibrary}} + + io.swagger.core.v3 + swagger-annotations + ${swagger-annotations-version} + + {{/swagger2AnnotationLibrary}} + + + com.google.code.findbugs + jsr305 + 3.0.2 + + + com.squareup.okhttp3 + okhttp + ${okhttp-version} + + + com.squareup.okhttp3 + logging-interceptor + ${okhttp-version} + + + com.google.code.gson + gson + ${gson-version} + + + io.gsonfire + gson-fire + ${gson-fire-version} + + {{#hasOAuthMethods}} + + org.apache.oltu.oauth2 + org.apache.oltu.oauth2.client + 1.0.2 + + {{/hasOAuthMethods}} + + org.apache.commons + commons-lang3 + ${commons-lang3-version} + + + commons-io + commons-io + ${version.commons-io} + + {{#joda}} + + joda-time + joda-time + ${jodatime-version} + + {{/joda}} + {{#dynamicOperations}} + + io.swagger.parser.v3 + swagger-parser-v3 + 2.0.30 + + {{/dynamicOperations}} + {{#useBeanValidation}} + + + jakarta.validation + jakarta.validation-api + ${beanvalidation-version} + provided + + {{/useBeanValidation}} + {{#performBeanValidation}} + + + org.hibernate + hibernate-validator + 5.4.3.Final + + + jakarta.el + jakarta.el-api + ${jakarta.el-version} + + {{/performBeanValidation}} + {{#parcelableModel}} + + + com.google.android + android + 4.1.1.4 + provided + + {{/parcelableModel}} + + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} + provided + + {{#openApiNullable}} + + org.openapitools + jackson-databind-nullable + ${jackson-databind-nullable-version} + + {{/openApiNullable}} + {{#withAWSV4Signature}} + + software.amazon.awssdk + auth + 2.20.157 + + {{/withAWSV4Signature}} + + jakarta.ws.rs + jakarta.ws.rs-api + ${jakarta.ws.rs-api-version} + + + + org.junit.jupiter + junit-jupiter-engine + ${junit-version} + test + + + org.junit.platform + junit-platform-runner + ${junit-platform-runner.version} + test + + + org.mockito + mockito-core + ${mockito-core-version} + test + + + + 1.8 + ${java.version} + ${java.version} + 1.9.0 + {{#swagger1AnnotationLibrary}} + 1.6.6 + {{/swagger1AnnotationLibrary}} + {{#swagger2AnnotationLibrary}} + 2.2.15 + {{/swagger2AnnotationLibrary}} + 4.12.0 + 2.10.1 + 2.11.0 + 3.14.0 + 4.0.0 + {{#openApiNullable}} + 0.2.6 + {{/openApiNullable}} + {{#joda}} + 2.12.0 + {{/joda}} + {{#useJakartaEe}} + 2.1.1 + 3.0.2 + {{/useJakartaEe}} + {{^useJakartaEe}} + 1.3.5 + 2.0.2 + {{/useJakartaEe}} + {{#performBeanValidation}} + 3.0.3 + {{/performBeanValidation}} + 5.10.3 + 1.10.0 + 3.12.4 + 2.1.6 + 1.1.1 + UTF-8 + 2.43.0 + + diff --git a/openapi-config.yml b/openapi-config.yml index 7ae18384..d488e4b3 100644 --- a/openapi-config.yml +++ b/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: dx@bandwidth.com -developerOrganization: Bandwidth +developerName: Bandwidth Support +developerEmail: info@bandwidth.com +developerOrganization: Bandwidth Inc +developerOrganizationUrl: http://bandwidth.com disallowAdditionalPropertiesIfNotPresent: false hideGenerationTimestamp: true groupId: com.bandwidth.sdk diff --git a/pom.xml b/pom.xml index 11000527..464dad5a 100644 --- a/pom.xml +++ b/pom.xml @@ -1,14 +1,13 @@ - + 4.0.0 com.bandwidth.sdk bandwidth-sdk jar bandwidth-sdk - 10.1.0 + 1.0.0-dev https://github.com/Bandwidth/java-sdk - The official client SDK for Bandwidth's Voice, Messaging, MFA, and WebRTC APIs + The official client SDK for Bandwidth's Voice, Messaging, MFA, and WebRTC APIs https://github.com/Bandwidth/java-sdk scm:git:git@github.com:Bandwidth/java-sdk.git @@ -36,12 +35,10 @@ - support Bandwidth Support info@bandwidth.com - Bandwidth, Inc. + Bandwidth Inc http://bandwidth.com - -5 @@ -50,53 +47,48 @@ org.apache.maven.plugins maven-compiler-plugin - 3.10.1 + 3.8.1 true 128m 512m -Xlint:all - -J-Xss4m + -J-Xss4m - true - ${java.version} - ${java.version} - ${java.version} org.apache.maven.plugins maven-enforcer-plugin - 3.1.0 + 3.4.1 enforce-maven enforce + + + + 2.2.0 + + + - - - - 3.8.6 - - - org.apache.maven.plugins maven-surefire-plugin 2.22.2 - + loggerPath conf/log4j.properties - + -Xms512m -Xmx1500m methods 10 @@ -105,8 +97,7 @@ - + org.junit.jupiter junit-jupiter-engine @@ -116,6 +107,7 @@ maven-dependency-plugin + 3.6.1 package @@ -132,7 +124,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.2.0 + 3.3.0 @@ -146,7 +138,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.2.0 + 3.5.0 add_sources @@ -177,7 +169,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.3.2 + 3.6.3 attach-javadocs @@ -200,7 +192,7 @@ org.apache.maven.plugins maven-source-plugin - 3.2.0 + 3.3.0 attach-sources @@ -255,15 +247,14 @@ - true - 4 + true + 4 - + @@ -281,6 +272,42 @@ + + + sign-artifacts + + + + org.apache.maven.plugins + maven-gpg-plugin + 3.2.1 + + + sign-artifacts + verify + + sign + + + + + + + + + smoke-tests + + smoke/**/* + + + + unit-tests + + unit/**/* + + + + org.glassfish.jaxb @@ -308,11 +335,6 @@ hamcrest 2.2 - - io.swagger - swagger-annotations - ${swagger-core-version} - com.google.code.findbugs @@ -329,11 +351,6 @@ logging-interceptor ${okhttp-version} - - com.sun.jersey - jersey-client - 1.19.4 - com.google.code.gson gson @@ -366,14 +383,9 @@ ${jackson-databind-nullable-version} - javax.ws.rs - jsr311-api - ${jsr311-api-version} - - - javax.ws.rs - javax.ws.rs-api - ${javax.ws.rs-api-version} + jakarta.ws.rs + jakarta.ws.rs-api + ${jakarta.ws.rs-api-version} @@ -396,56 +408,24 @@ - - 11 + 1.8 ${java.version} ${java.version} - - 1.8.5 - 1.6.5 + 1.9.0 4.12.0 - 2.9.0 + 2.10.1 2.11.0 - - 3.12.0 + 3.14.0 4.0.0 - 0.2.3 - - 1.3.5 - 5.9.1 - 1.6.2 - - 3.12.4 - 2.1.1 + 0.2.6 + 1.3.5 + 2.0.2 + 5.10.3 + 1.10.0 + 3.12.4 + 2.1.6 1.1.1 - - UTF-8 - 2.21.0 + UTF-8 + 2.43.0 - - - - smoke-tests - - smoke/**/* - - - - unit-tests - - unit/**/* - - - - - - - - org.projectlombok - lombok - 1.18.30 - provided - - - diff --git a/src/main/java/com/bandwidth/sdk/ApiClient.java b/src/main/java/com/bandwidth/sdk/ApiClient.java index 5307b00f..c8ac2feb 100644 --- a/src/main/java/com/bandwidth/sdk/ApiClient.java +++ b/src/main/java/com/bandwidth/sdk/ApiClient.java @@ -141,7 +141,7 @@ private void init() { json = new JSON(); // Set default User-Agent. - setUserAgent("OpenAPI-Generator/10.1.0/java"); + setUserAgent("OpenAPI-Generator/1.0.0-dev/java"); authentications = new HashMap(); } diff --git a/src/main/java/com/bandwidth/sdk/Configuration.java b/src/main/java/com/bandwidth/sdk/Configuration.java index 08715453..5aa614dc 100644 --- a/src/main/java/com/bandwidth/sdk/Configuration.java +++ b/src/main/java/com/bandwidth/sdk/Configuration.java @@ -15,7 +15,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.9.0") public class Configuration { - public static final String VERSION = "10.1.0"; + public static final String VERSION = "1.0.0-dev"; private static ApiClient defaultApiClient = new ApiClient();