Skip to content

Commit

Permalink
update deps and set proj to 8.0.0-SNAPSHOT (#683)
Browse files Browse the repository at this point in the history
  • Loading branch information
arvindkrishnakumar-okta authored Dec 15, 2021
1 parent 3eb2327 commit 6f8cb6c
Show file tree
Hide file tree
Showing 11 changed files with 41 additions and 26 deletions.
8 changes: 6 additions & 2 deletions THIRD-PARTY-NOTICES
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ This project includes:
Apache Commons IO under Apache License, Version 2.0
Apache Commons Lang under Apache License, Version 2.0
Apache HttpClient under Apache License, Version 2.0
Apache HttpClient Mime under Apache License, Version 2.0
Apache HttpCore under Apache License, Version 2.0
Auto Common Libraries under Apache 2.0
AutoService under Apache 2.0
Expand All @@ -29,6 +30,7 @@ This project includes:
commonmark-java core under BSD 2-Clause License
Commons CLI under The Apache Software License, Version 2.0
FindBugs-jsr305 under The Apache Software License, Version 2.0
IntelliJ IDEA Annotations under The Apache Software License, Version 2.0
Jackson-annotations under The Apache Software License, Version 2.0
Jackson-core under The Apache Software License, Version 2.0
jackson-databind under The Apache Software License, Version 2.0
Expand All @@ -43,11 +45,13 @@ This project includes:
JOpt Simple under The MIT License
json-schema-core under Lesser General Public License, version 3 or greater or Apache Software License, version 2.0
json-schema-validator under Lesser General Public License, version 3 or greater or Apache Software License, version 2.0
Kotlin Stdlib under The Apache License, Version 2.0
Kotlin Stdlib Common under The Apache License, Version 2.0
libphonenumber under The Apache Software License, Version 2.0
Mozilla Rhino under Mozilla Public License, Version 2.0
null under Lesser General Public License, version 3 or greater or Apache Software License, version 2.0
OkHttp under Apache 2.0
Okio under Apache 2.0
okhttp under The Apache Software License, Version 2.0
Okio under The Apache Software License, Version 2.0
Okta Commons :: Config Check under The Apache License, Version 2.0
Okta Commons :: HTTP :: API under The Apache License, Version 2.0
Okta Commons :: HTTP :: HTTP Client under The Apache License, Version 2.0
Expand Down
2 changes: 1 addition & 1 deletion api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.okta.sdk</groupId>
<artifactId>okta-sdk-root</artifactId>
<version>7.0.1-SNAPSHOT</version>
<version>8.0.0-SNAPSHOT</version>
</parent>

<artifactId>okta-sdk-api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion coverage/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.okta.sdk</groupId>
<artifactId>okta-sdk-root</artifactId>
<version>7.0.1-SNAPSHOT</version>
<version>8.0.0-SNAPSHOT</version>
</parent>

<artifactId>okta-sdk-coverage</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.okta.sdk</groupId>
<artifactId>okta-sdk-root</artifactId>
<version>7.0.1-SNAPSHOT</version>
<version>8.0.0-SNAPSHOT</version>
</parent>

<artifactId>okta-sdk-examples</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/quickstart/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>com.okta.sdk</groupId>
<artifactId>okta-sdk-examples</artifactId>
<version>7.0.1-SNAPSHOT</version>
<version>8.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion httpclients/httpclient/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.okta.sdk</groupId>
<artifactId>okta-sdk-root</artifactId>
<version>7.0.1-SNAPSHOT</version>
<version>8.0.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion httpclients/okhttp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.okta.sdk</groupId>
<artifactId>okta-sdk-root</artifactId>
<version>7.0.1-SNAPSHOT</version>
<version>8.0.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.okta.sdk</groupId>
<artifactId>okta-sdk-root</artifactId>
<version>7.0.1-SNAPSHOT</version>
<version>8.0.0-SNAPSHOT</version>
</parent>

<artifactId>okta-sdk-impl</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>com.okta.sdk</groupId>
<artifactId>okta-sdk-root</artifactId>
<version>7.0.1-SNAPSHOT</version>
<version>8.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
41 changes: 26 additions & 15 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

<groupId>com.okta.sdk</groupId>
<artifactId>okta-sdk-root</artifactId>
<version>7.0.1-SNAPSHOT</version>
<version>8.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Okta Java SDK</name>
Expand All @@ -37,9 +37,9 @@
<swagger-annotations.version>1.5.8</swagger-annotations.version>
<jackson.version>2.13.0</jackson.version>
<snakeyaml.version>1.29</snakeyaml.version>
<bouncycastle.version>1.69</bouncycastle.version>
<bouncycastle.version>1.70</bouncycastle.version>
<jjwt.version>0.11.1</jjwt.version>
<okta.sdk.previousVersion>6.0.0</okta.sdk.previousVersion>
<okta.sdk.previousVersion>7.0.0</okta.sdk.previousVersion>
<okta.commons.version>1.3.0</okta.commons.version>

<github.slug>okta/okta-sdk-java</github.slug>
Expand Down Expand Up @@ -73,27 +73,27 @@
<dependency>
<groupId>com.okta.sdk</groupId>
<artifactId>okta-sdk-api</artifactId>
<version>7.0.1-SNAPSHOT</version>
<version>8.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.okta.sdk</groupId>
<artifactId>okta-sdk-impl</artifactId>
<version>7.0.1-SNAPSHOT</version>
<version>8.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.okta.sdk</groupId>
<artifactId>okta-api-swagger-templates</artifactId>
<version>7.0.1-SNAPSHOT</version>
<version>8.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.okta.sdk</groupId>
<artifactId>okta-sdk-httpclient</artifactId>
<version>7.0.1-SNAPSHOT</version>
<version>8.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.okta.sdk</groupId>
<artifactId>okta-sdk-okhttp</artifactId>
<version>7.0.1-SNAPSHOT</version>
<version>8.0.0-SNAPSHOT</version>
</dependency>

<!-- Other Okta Projects -->
Expand Down Expand Up @@ -132,14 +132,14 @@
<dependency>
<groupId>com.okta.sdk</groupId>
<artifactId>okta-sdk-integration-tests</artifactId>
<version>7.0.1-SNAPSHOT</version>
<version>8.0.0-SNAPSHOT</version>
</dependency>

<!-- Examples -->
<dependency>
<groupId>com.okta.sdk</groupId>
<artifactId>okta-sdk-examples-quickstart</artifactId>
<version>7.0.1-SNAPSHOT</version>
<version>8.0.0-SNAPSHOT</version>
</dependency>

<!-- Logging -->
Expand All @@ -156,7 +156,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.2</version>
<version>1.2.7</version>
</dependency>

<!-- Bouncy Castle -->
Expand Down Expand Up @@ -202,7 +202,18 @@
<version>1.0-rc6</version>
<optional>true</optional>
</dependency>


<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
<version>1.6.0</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-common</artifactId>
<version>1.6.0</version>
</dependency>

<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
Expand Down Expand Up @@ -353,22 +364,22 @@
<dependency>
<groupId>com.okta.sdk</groupId>
<artifactId>okta-api-swagger-templates</artifactId>
<version>7.0.1-SNAPSHOT</version>
<version>8.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.5</version>
<version>2.8.1</version>
<configuration>
<generateBackupPoms>false</generateBackupPoms>
</configuration>
</plugin>
<plugin>
<groupId>com.github.siom79.japicmp</groupId>
<artifactId>japicmp-maven-plugin</artifactId>
<version>0.14.3</version>
<version>0.15.4</version>
<configuration>
<oldVersion>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion swagger-templates/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.okta.sdk</groupId>
<artifactId>okta-sdk-root</artifactId>
<version>7.0.1-SNAPSHOT</version>
<version>8.0.0-SNAPSHOT</version>
</parent>

<artifactId>okta-api-swagger-templates</artifactId>
Expand Down

0 comments on commit 6f8cb6c

Please sign in to comment.