Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix CVE and refactor dependencies #918

Merged
merged 2 commits into from
Jun 29, 2023
Merged

Fix CVE and refactor dependencies #918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b38dc2
Fix CVEs
arvindkrishnakumar-okta Jun 29, 2023
d6fc242
updates
arvindkrishnakumar-okta Jun 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 18 additions & 14 deletions impl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,6 @@
<artifactId>javax.annotation-api</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<!-- compile time annotation processor -->
<groupId>com.google.auto.service</groupId>
<artifactId>auto-service</artifactId>
<optional>true</optional>
</dependency>

<!-- Test deps -->
<dependency>
Expand All @@ -109,7 +103,7 @@
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito2</artifactId>
<version>2.0.4</version>
<version>2.0.9</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -128,17 +122,14 @@
<version>9.30.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
</dependencies>

<build>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>false</filtering>
<excludes>
<exclude>**/version.properties</exclude>
</excludes>
</resource>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
Expand All @@ -152,6 +143,19 @@
</resources>

<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<annotationProcessorPaths>
<path>
<groupId>com.google.auto.service</groupId>
<artifactId>auto-service</artifactId>
<version>${com.google.auto.service.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
Expand Down
7 changes: 0 additions & 7 deletions integration-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,6 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>31.1-jre</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.aerogear</groupId>
<artifactId>aerogear-otp-java</artifactId>
<version>1.0.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
10 changes: 8 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
<org.apache.httpcomponents.client5.version>5.2.1</org.apache.httpcomponents.client5.version>
<okta.sdk.previousVersion>11.0.3</okta.sdk.previousVersion>
<okta.commons.version>1.3.3</okta.commons.version>
<com.google.auto.service.version>1.1.1</com.google.auto.service.version>
<github.slug>okta/okta-sdk-java</github.slug>
</properties>

Expand Down Expand Up @@ -175,10 +176,15 @@
<dependency>
<groupId>com.google.auto.service</groupId>
<artifactId>auto-service</artifactId>
<version>1.1.0</version>
<version>${com.google.auto.service.version}</version>
<optional>true</optional>
</dependency>

<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>32.0.1-jre</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
Expand Down
25 changes: 3 additions & 22 deletions src/owasp/owasp-suppression.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,29 +19,10 @@
-->
<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">

<!-- False Positive - See https://github.com/jeremylong/DependencyCheck/issues/4558 -->
<!-- False positive, see https://github.com/jeremylong/DependencyCheck/issues/5779 -->
<suppress>
<notes><![CDATA[ file name: spring-core-5.3.20.jar]]></notes>
<cve>CVE-2016-1000027</cve>
</suppress>

<!-- False Positive - See https://github.com/jeremylong/DependencyCheck/issues/5502 -->
<suppress>
<notes><![CDATA[FP per issue #5502]]></notes>
<cve>CVE-2022-45688</cve>
</suppress>

<!-- openapi generator is used for build time code generation purpose only, should not affect runtime -->
<suppress>
<notes><![CDATA[ file name: openapi-generator-core-6.4.0.jar]]></notes>
<cve>CVE-2023-27162</cve>
</suppress>

<!-- upgrade to spring 6 will resolve this -->
<suppress>
<notes><![CDATA[ file name: spring-core-5.3.23.jar]]></notes>
<cve>CVE-2023-20860</cve>
<cve>CVE-2023-20861</cve>
<notes><![CDATA[ file name: jackson-databind-2.15.2.jar]]></notes>
<cve>CVE-2023-35116</cve>
</suppress>

</suppressions>