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

Remove compile dep on openapigenerator #911

Merged
merged 2 commits into from
Jun 26, 2023
Merged

Remove compile dep on openapigenerator #911

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0da014
remove compile dep on openapigenerator
arvindkrishnakumar-okta Jun 26, 2023
b53c1cd
Merge branch 'master' into ak_remove_compile_dep_openapigenerator
arvindkrishnakumar-okta Jun 26, 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
39 changes: 0 additions & 39 deletions THIRD-PARTY-NOTICES
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,81 +14,42 @@ 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 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 HttpComponents Core HTTP/1.1 under Apache License, Version 2.0
Apache HttpComponents Core HTTP/2 under Apache License, Version 2.0
Auto Common Libraries under Apache 2.0
Automaton under BSD
AutoService under Apache 2.0
AutoService Processor under Apache 2.0
Bean Validation API under The Apache Software License, Version 2.0
Bouncy Castle ASN.1 Extension and Utility APIs under Bouncy Castle Licence
Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs under Bouncy Castle Licence
Bouncy Castle Provider under Bouncy Castle Licence
btf under Lesser General Public License, version 3 or greater or Apache Software License, version 2.0
Caffeine cache under Apache License, Version 2.0
Checker Qual under The MIT License
commonmark-java core under BSD 2-Clause License
error-prone annotations under Apache 2.0
FindBugs-jsr305 under The Apache Software License, Version 2.0
Generex under The Apache Software License, Version 2.0
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
Jackson datatype: JSR310 under The Apache Software License, Version 2.0
Jackson module: Old JAXB Annotations (javax.xml.bind) 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-coreutils under Lesser General Public License, version 3 or greater or Apache Software License, version 2.0
jackson-coreutils-equivalence under Lesser General Public License, version 3 or greater or Apache Software License, version 2.0
jackson-databind under The Apache Software License, Version 2.0
Jackson-dataformat-YAML under The Apache Software License, Version 2.0
Jackson-Datatype-ThreeTenBackport under The Apache Software License, Version 2.0
Jackson-JAXRS: base under The Apache Software License, Version 2.0
Jackson-JAXRS: JSON under The Apache Software License, Version 2.0
Jakarta Activation API jar under EDL 1.0
Jakarta Bean Validation API under Apache License 2.0
Jakarta XML Binding API under Eclipse Distribution License - v 1.0
Java Native Access under LGPL-2.1-or-later or Apache-2.0
JavaMail API (no providers) under CDDL/GPLv2+CE
javax.annotation API under CDDL + GPLv2 with classpath exception
JJWT :: API under Apache License, Version 2.0
jmustache under The (New) BSD License
Joda-Time under Apache License, Version 2.0
JOpt Simple under The MIT License
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 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
Okta Commons :: Config Check under The Apache License, Version 2.0
Okta Commons :: HTTP :: API under The Apache License, Version 2.0
Okta Commons :: Lang under The Apache License, Version 2.0
openapi-generator (core library) under Apache License 2.0
openapi-generator-core under Apache License 2.0
RgxGen under The Apache Software License, Version 2.0
SLF4J API Module under MIT License
SLF4J Extensions Module under MIT License
SnakeYAML under Apache License, Version 2.0
swagger-annotations under Apache License 2.0
swagger-compat-spec-parser under Apache License 2.0
swagger-core under Apache License 2.0
swagger-models under Apache License 2.0
swagger-parser under Apache License 2.0
swagger-parser-v2-converter under Apache License 2.0
swagger-parser-v3 under Apache License 2.0
ThreeTen backport under BSD 3-clause
uri-template under Lesser General Public License, version 3 or greater or Apache Software License, version 2.0


This project also includes modified code based on the following copyrights:
Expand Down
28 changes: 0 additions & 28 deletions api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,34 +137,6 @@
<artifactId>handlebars-jackson2</artifactId>
<version>${com.github.jknack.handlebars.version}</version>
</dependency>

<dependency>
<groupId>org.openapitools</groupId>
<artifactId>openapi-generator</artifactId>
<version>${openapi-generator.version}</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
<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>
<exclusion>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

<build>
Expand Down
11 changes: 0 additions & 11 deletions impl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,6 @@
<groupId>com.okta.sdk</groupId>
<artifactId>okta-sdk-api</artifactId>
</dependency>
<dependency>
<groupId>org.openapitools</groupId>
<artifactId>openapi-generator</artifactId>
<version>6.4.0</version>
<exclusions>
<exclusion>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions impl/src/main/java/com/okta/sdk/impl/retry/RetryUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
package com.okta.sdk.impl.retry;

import org.apache.commons.lang3.StringUtils;
import org.apache.hc.core5.util.TextUtils;
import org.apache.hc.core5.http.Header;
import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.ProtocolException;
Expand Down Expand Up @@ -76,6 +76,6 @@ static Date dateFromHeader(HttpResponse response) {

static long getRateLimitResetValue(HttpResponse response) {
Header header = response.getFirstHeader("x-rate-limit-reset");
return header != null && StringUtils.isNotBlank(header.getValue()) ? Long.parseLong(header.getValue()) : -1L;
return header != null && !TextUtils.isBlank(header.getValue()) ? Long.parseLong(header.getValue()) : -1L;
}
}