Skip to content

Commit

Permalink
Upgrade Java parent to 29 and Bouncy castle to Java 8 version (#910)
Browse files Browse the repository at this point in the history
upgrade java parent and bouncy castle
  • Loading branch information
arvindkrishnakumar-okta authored Jun 26, 2023
1 parent f162c3d commit e007ea3
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion THIRD-PARTY-NOTICES
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ limitations under the License.
This project includes:
A Jackson 2.x helper under The Apache Software License, Version 2.0
Apache Commons CLI under Apache License, Version 2.0
Apache Commons IO under Apache License, Version 2.0
Apache Commons IO under Apache-2.0
Apache Commons Lang under Apache License, Version 2.0
Apache Commons Text under Apache License, Version 2.0
Apache HttpClient under Apache License, Version 2.0
Expand Down
6 changes: 3 additions & 3 deletions impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,11 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<artifactId>bcprov-jdk18on</artifactId>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
<artifactId>bcpkix-jdk18on</artifactId>
</dependency>
<dependency>
<groupId>io.jsonwebtoken</groupId>
Expand Down Expand Up @@ -183,4 +183,4 @@
</plugins>
</build>

</project>
</project>
9 changes: 5 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>com.okta</groupId>
<artifactId>okta-parent</artifactId>
<version>28</version>
<version>29</version>
</parent>

<groupId>com.okta.sdk</groupId>
Expand All @@ -36,7 +36,7 @@
<properties>
<jackson.version>2.15.2</jackson.version>
<snakeyaml.version>2.0</snakeyaml.version>
<bouncycastle.version>1.70</bouncycastle.version>
<bouncycastle.version>1.75</bouncycastle.version>
<jjwt.version>0.11.5</jjwt.version>
<org.apache.httpcomponents.client5.version>5.2.1</org.apache.httpcomponents.client5.version>
<okta.sdk.previousVersion>11.0.3</okta.sdk.previousVersion>
Expand Down Expand Up @@ -132,13 +132,13 @@
<!-- Bouncy Castle -->
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<artifactId>bcprov-jdk18on</artifactId>
<version>${bouncycastle.version}</version>
</dependency>

<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
<artifactId>bcpkix-jdk18on</artifactId>
<version>${bouncycastle.version}</version>
</dependency>

Expand Down Expand Up @@ -328,6 +328,7 @@
<plugin>
<groupId>org.jasig.maven</groupId>
<artifactId>maven-notice-plugin</artifactId>
<version>1.1.0</version>
<inherited>false</inherited>
<configuration>
<noticeTemplate>${root.dir}/src/license/NOTICE.template</noticeTemplate>
Expand Down
2 changes: 1 addition & 1 deletion src/license/mapping.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
</artifact>
<artifact>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<artifactId>bcprov-jdk18on</artifactId>
<license>Bouncy Castle/MIT License</license>
</artifact>
<artifact>
Expand Down

0 comments on commit e007ea3

Please sign in to comment.