Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 2 deletions .speakeasy/gen.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ management:
docVersion: 0.2.0
speakeasyVersion: 1.277.4
generationVersion: 2.318.3
releaseVersion: 0.6.7
configChecksum: cfb29ac9a83ddb66910c11ad8af72bac
releaseVersion: 0.6.8
configChecksum: 96c309e9401b2258edcc5314db7f8fd5
repoURL: https://github.com/StyraInc/opa-java.git
published: true
features:
Expand Down
2 changes: 1 addition & 1 deletion .speakeasy/gen.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ generation:
auth:
oAuth2ClientCredentialsEnabled: false
java:
version: 0.6.7
version: 0.6.8
additionalDependencies: []
artifactID: openapi
clientServerStatusCodesAsErrors: true
Expand Down
1 change: 1 addition & 0 deletions .speakeasy/workflow.lock
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ workflow:
ossrhPassword: $ossrh_password
gpgSecretKey: $java_gpg_secret_key
gpgPassPhrase: $java_gpg_passphrase
useSonatypeLegacy: true
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -175,15 +175,15 @@ The samples below show how a published SDK artifact is used:

Gradle:
```groovy
implementation 'com.styra.opa.openapi:api:0.6.7'
implementation 'com.styra.opa.openapi:api:0.6.8'
```

Maven:
```xml
<dependency>
<groupId>com.styra.opa.openapi</groupId>
<artifactId>api</artifactId>
<version>0.6.7</version>
<version>0.6.8</version>
</dependency>
```

Expand Down
12 changes: 11 additions & 1 deletion RELEASES.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,4 +102,14 @@ Based on:
### Generated
- [java v0.6.7] .
### Releases
- [Maven Central v0.6.7] https://central.sonatype.com/artifact/com.styra.opa/openapi/0.6.7 - .
- [Maven Central v0.6.7] https://central.sonatype.com/artifact/com.styra.opa/openapi/0.6.7 - .

## 2024-05-01 21:22:43
### Changes
Based on:
- OpenAPI Doc
- Speakeasy CLI 1.277.4 (2.318.3) https://github.com/speakeasy-api/speakeasy
### Generated
- [java v0.6.8] .
### Releases
- [Maven Central v0.6.8] https://central.sonatype.com/artifact/com.styra.opa/openapi/0.6.8 - .
84 changes: 78 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@

plugins {
// Apply the java-library plugin for API and implementation separation.
// NOTE: this block is managed by scripts/fix-build-gradle.sh, changes made
// to the plugins block by hand will be overwritten!
id 'java-library'
id 'java'
id "nebula.lint" version "17.8.0"
id 'checkstyle'
id 'maven-publish'
id 'signing'
id 'cl.franciscosolis.sonatype-central-upload' version '1.0.0'
}


compileJava.options.encoding = "UTF-8"
compileTestJava.options.encoding = "UTF-8"

Expand All @@ -29,7 +35,7 @@ model {
jar {
dependsOn(":generatePomFileForMavenPublication")

into("META-INF/maven/com.styra.opa/openapi") {
into("META-INF/maven/com.styra/opa") {
from("$buildDir/pom.xml")
}
}
Expand Down Expand Up @@ -62,9 +68,9 @@ publishing {

publications {
maven(MavenPublication) {
groupId = 'com.styra.opa'
artifactId = 'openapi'
version = '0.6.7'
groupId = 'com.styra'
artifactId = 'opa'
version = '0.6.8'

from components.java

Expand Down Expand Up @@ -114,8 +120,74 @@ dependencies {
implementation 'org.openapitools:jackson-databind-nullable:0.2.6'
implementation 'org.apache.httpcomponents:httpclient:4.5.14'
implementation 'org.apache.httpcomponents:httpmime:4.5.14'
implementation 'com.jayway.jsonpath:json-path:2.9.0'
implementation 'commons-io:commons-io:2.15.1'
}


// === build-footer ===
// NOTE: lines in build.gradle below this comment are managed by
// scripts/fix-build-gradle.sh and should not be managed by hand, as changes
// will be overwritten.

tasks.withType(Javadoc) {
autoLintGradle.enabled = false
failOnError false
}

// https://discuss.gradle.org/t/how-to-exclude-checkstyle-task-from-build-task/6692/5
//
// This prevents Checkstyle from running on ./gradlew build, but keeps it
// working for ./gradlew lint.
checkstyle {
sourceSets = []
}

// Exclude files generated by Speakeasy from linting.
tasks.withType(Checkstyle) {
configFile = file("${project.rootDir}/config/checkstyle/checkstyle.xml")
exclude 'com/styra/opa/openapi/**/*.java'
exclude 'com/styra/opa/openapi/*.java'
}

task lint {
autoLintGradle.enabled = true
dependsOn checkstyleTest
dependsOn checkstyleMain
gradleLint {
criticalRules=['all-dependency']
reportFormat = 'text'
excludedRules = [
// Enabling recommended-versions causes Gradle to complain about
// testcontainers, but applying the suggested fix (removing the version
// numbers from all but one of the testImplementation lines) causes
// gradle to fail in a more obscure way that I don't understand.
"recommended-versions"
]
}
}

dependencies {
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
runtimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
testImplementation 'org.testcontainers:testcontainers-bom:1.19.7'
testImplementation 'org.testcontainers:testcontainers:1.19.7'
testImplementation 'org.testcontainers:junit-jupiter:1.19.7'

implementation 'com.fasterxml.jackson.core:jackson-annotations:2.17.0'
implementation 'com.fasterxml.jackson.core:jackson-core:2.17.0'
implementation 'org.apache.httpcomponents:httpcore:4.4.16'
}

test {
useJUnitPlatform()
testLogging {
// uncomment for more verbose output during development
//events "passed", "skipped", "failed", "standard_out", "standard_error"
}
}

gradle.projectsEvaluated {
tasks.withType(JavaCompile) {
options.compilerArgs << "-Xlint:unchecked"
}
}
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
* in the user manual at https://docs.gradle.org/7.5.1/userguide/multi_project_builds.html
*/

rootProject.name = 'openapi'
rootProject.name = 'opa'
4 changes: 2 additions & 2 deletions src/main/java/com/styra/opa/openapi/SDKConfiguration.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ public Optional<SecuritySource> securitySource() {
public int serverIdx = 0;
public String language = "java";
public String openapiDocVersion = "0.2.0";
public String sdkVersion = "0.6.7";
public String sdkVersion = "0.6.8";
public String genVersion = "2.318.3";
public String userAgent = "speakeasy-sdk/java 0.6.7 2.318.3 0.2.0 com.styra.opa.openapi";
public String userAgent = "speakeasy-sdk/java 0.6.8 2.318.3 0.2.0 com.styra.opa.openapi";

private com.styra.opa.openapi.utils.Hooks _hooks = new com.styra.opa.openapi.utils.Hooks();

Expand Down