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

cve fix and prep for oasv3 GA release #777

Merged
merged 3 commits into from
Oct 25, 2022
Merged

cve fix and prep for oasv3 GA release #777

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8e93a4f
cve fix and prep for oasv3 GA release
arvindkrishnakumar-okta Oct 25, 2022
2001382
removed unwanted yaml file
arvindkrishnakumar-okta Oct 25, 2022
a3208d3
revert jakarta annotation back to 1.3.5
arvindkrishnakumar-okta Oct 25, 2022
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
4 changes: 1 addition & 3 deletions THIRD-PARTY-NOTICES
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ This project includes:
Apache Commons Codec under Apache License, Version 2.0
Apache Commons IO under Apache License, Version 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
Apache HttpCore under Apache License, Version 2.0
Auto Common Libraries under Apache 2.0
Expand All @@ -38,7 +37,6 @@ This project includes:
Guava InternalFutureFailureAccess and InternalFutures under The Apache Software License, Version 2.0
Guava ListenableFuture only under The Apache Software License, Version 2.0
Guava: Google Core Libraries for Java under Apache License, Version 2.0
Handlebars under The Apache Software License, Version 2.0
J2ObjC Annotations under The Apache Software License, Version 2.0
Jackson datatype: Guava under The Apache Software License, Version 2.0
Jackson datatype: Joda under The Apache Software License, Version 2.0
Expand Down Expand Up @@ -66,7 +64,7 @@ This project includes:
json-patch under Lesser General Public License, version 3 or greater or Apache Software License, version 2.0
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
JsonNullable Jackson module under Apache License, Version 2.0
JsonNullable Jackson module under Apache License 2.0
libphonenumber under The Apache Software License, Version 2.0
Mozilla Rhino under Mozilla Public License, Version 2.0
msg-simple under Lesser General Public License, version 3 or greater or Apache Software License, version 2.0
Expand Down
21 changes: 14 additions & 7 deletions api/pom.xml
View file
Open in desktop
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>10.0.1-beta-SNAPSHOT</version>
<version>10.0.0-SNAPSHOT</version>
</parent>

<artifactId>okta-sdk-api</artifactId>
Expand All @@ -35,13 +35,12 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<swagger-annotations.version>1.6.6</swagger-annotations.version>
<spring-web.version>5.3.20</spring-web.version>
<swagger-annotations.version>1.6.8</swagger-annotations.version>
<spring-web.version>5.3.23</spring-web.version>
<spring-retry.version>1.3.3</spring-retry.version>
<jackson-databind-nullable.version>0.2.2</jackson-databind-nullable.version>
<jakarta-annotation.version>1.3.5</jakarta-annotation.version>
<jackson-databind-nullable.version>0.2.3</jackson-databind-nullable.version>
<jakarta-annotation.version>2.1.0</jakarta-annotation.version>
<jsr305.version>3.0.2</jsr305.version>
<gson.version>2.9.0</gson.version>
<junit.version>4.13.2</junit.version>
</properties>

Expand Down Expand Up @@ -137,7 +136,7 @@
<dependency>
<groupId>org.openapitools</groupId>
<artifactId>openapi-generator</artifactId>
<version>6.0.1</version>
<version>6.2.0</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
Expand All @@ -147,6 +146,14 @@
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
</exclusion>
<exclusion>
<groupId>com.github.jknack</groupId>
<artifactId>handlebars</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion coverage/pom.xml
View file
Open in desktop
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>10.0.1-beta-SNAPSHOT</version>
<version>10.0.0-SNAPSHOT</version>
</parent>

<artifactId>okta-sdk-coverage</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/pom.xml
View file
Open in desktop
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>10.0.1-beta-SNAPSHOT</version>
<version>10.0.0-SNAPSHOT</version>
</parent>

<artifactId>okta-sdk-examples</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/quickstart/pom.xml
View file
Open in desktop
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>10.0.1-beta-SNAPSHOT</version>
<version>10.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion impl/pom.xml
View file
Open in desktop
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>10.0.1-beta-SNAPSHOT</version>
<version>10.0.0-SNAPSHOT</version>
</parent>

<artifactId>okta-sdk-impl</artifactId>
Expand Down
32 changes: 1 addition & 31 deletions integration-tests/pom.xml
View file
Open in desktop
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>10.0.1-beta-SNAPSHOT</version>
<version>10.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -90,36 +90,6 @@
</dependencies>

<profiles>
<!-- <profile>-->
<!-- <id>okhttp</id>-->
<!-- <activation>-->
<!-- <property>-->
<!-- <name>!httpclient</name>-->
<!-- </property>-->
<!-- </activation>-->
<!-- <dependencies>-->
<!-- <dependency>-->
<!-- <groupId>com.okta.sdk</groupId>-->
<!-- <artifactId>okta-sdk-okhttp</artifactId>-->
<!-- <scope>runtime</scope>-->
<!-- </dependency>-->
<!-- </dependencies>-->
<!-- </profile>-->
<!-- <profile>-->
<!-- <id>httpclient</id>-->
<!-- <activation>-->
<!-- <property>-->
<!-- <name>httpclient</name>-->
<!-- </property>-->
<!-- </activation>-->
<!-- <dependencies>-->
<!-- <dependency>-->
<!-- <groupId>com.okta.sdk</groupId>-->
<!-- <artifactId>okta-sdk-httpclient</artifactId>-->
<!-- <scope>runtime</scope>-->
<!-- </dependency>-->
<!-- </dependencies>-->
<!-- </profile>-->
<profile>
<id>mock-server</id>
<properties>
Expand Down
6 changes: 6 additions & 0 deletions integration-tests/src/test/groovy/com/okta/sdk/tests/it/PoliciesIT.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,9 @@ class PoliciesIT extends ITSupport {
assertThat(createdAccessPolicyRuleActions.getAppSignOn().getVerificationMethod().getType(), is("ASSURANCE"))
assertThat(createdAccessPolicyRuleActions.getAppSignOn().getVerificationMethod().getFactorMode(), is("1FA"))
assertThat(createdAccessPolicyRuleActions.getAppSignOn().getVerificationMethod().getReauthenticateIn(), is("PT43800H"))

policyApi.deactivatePolicyRule(accessPolicy.getId(), createdAccessPolicyRule.getId())
policyApi.deletePolicyRule(accessPolicy.getId(), createdAccessPolicyRule.getId())
}

@Test
Expand Down Expand Up @@ -180,6 +183,9 @@ class PoliciesIT extends ITSupport {

assertThat(createdPolicyRule.getId(), notNullValue())
assertThat(createdPolicyRule.name, is(policyRuleName))

policyApi.deactivatePolicyRule(policy.getId(), createdPolicyRule.getId())
policyApi.deletePolicyRule(policy.getId(), createdPolicyRule.getId())
}

@Test
Expand Down
12 changes: 6 additions & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
<parent>
<groupId>com.okta</groupId>
<artifactId>okta-parent</artifactId>
<version>24</version>
<version>25</version>
</parent>

<groupId>com.okta.sdk</groupId>
<artifactId>okta-sdk-root</artifactId>
<version>10.0.1-beta-SNAPSHOT</version>
<version>10.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Okta Java SDK</name>
Expand Down Expand Up @@ -66,12 +66,12 @@
<dependency>
<groupId>com.okta.sdk</groupId>
<artifactId>okta-sdk-api</artifactId>
<version>10.0.1-beta-SNAPSHOT</version>
<version>10.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.okta.sdk</groupId>
<artifactId>okta-sdk-impl</artifactId>
<version>10.0.1-beta-SNAPSHOT</version>
<version>10.0.0-SNAPSHOT</version>
</dependency>

<!-- Other Okta Projects -->
Expand Down Expand Up @@ -101,14 +101,14 @@
<dependency>
<groupId>com.okta.sdk</groupId>
<artifactId>okta-sdk-integration-tests</artifactId>
<version>10.0.1-beta-SNAPSHOT</version>
<version>10.0.0-SNAPSHOT</version>
</dependency>

<!-- Examples -->
<dependency>
<groupId>com.okta.sdk</groupId>
<artifactId>okta-sdk-examples-quickstart</artifactId>
<version>10.0.1-beta-SNAPSHOT</version>
<version>10.0.0-SNAPSHOT</version>
</dependency>

<!-- Logging -->
Expand Down
9 changes: 8 additions & 1 deletion src/owasp/owasp-suppression.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
~ specific language governing permissions and limitations
~ under the License.
-->
<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.1.xsd">
<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">

<!-- False Positive - See https://github.com/jeremylong/DependencyCheck/issues/4558 -->
<suppress>
Expand All @@ -30,4 +30,11 @@
<notes><![CDATA[ file name: package.json ]]></notes>
<cve>CVE-2021-3765</cve>
</suppress>

<!-- False Positive = See https://github.com/jeremylong/DependencyCheck/issues/4919 -->
<suppress>
<notes><![CDATA[ file name: snakeyaml-1.33.jar ]]></notes>
<cve>CVE-2022-38752</cve>
</suppress>

</suppressions>