diff --git a/README.md b/README.md index 2d2290c49ab..143b6a80bf7 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ desired version. You may also manually build and publish this image using: ```shell script -docker build -t oryd/sdk:latest . +docker build --platform linux/adm64 -t oryd/sdk:latest . docker tag oryd/sdk:latest oryd/sdk:v0.0.53 docker push oryd/sdk:v0.0.53 ``` @@ -33,6 +33,7 @@ docker push oryd/sdk:v0.0.53 If you wish to debug some generators or build steps, you can run the image locally: ```shell script +docker build -t oryd/sdk:latest . docker run --mount type=bind,source="$(pwd)",target=/project --name sdk --user "$(id -u):$(id -g)" -it oryd/sdk:latest /bin/sh ``` @@ -41,6 +42,7 @@ docker run --mount type=bind,source="$(pwd)",target=/project --name sdk --user " If a test fails in CI, you may run the following code snippet to reproduce the failure locally: ```shell script +docker build -t oryd/sdk:latest . docker run --mount type=bind,source="$(pwd)",target=/project --name sdk -it oryd/sdk:latest /bin/bash export FORCE_PROJECT=client # or hydra or something else diff --git a/contrib/clients/java/distributionManagement.xml b/contrib/clients/java/distributionManagement.xml deleted file mode 100644 index 3c1ccfdf947..00000000000 --- a/contrib/clients/java/distributionManagement.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - diff --git a/contrib/clients/java/hydra.pom.xml.backup b/contrib/clients/java/hydra.pom.xml.backup deleted file mode 100644 index 7e9371a2dbd..00000000000 --- a/contrib/clients/java/hydra.pom.xml.backup +++ /dev/null @@ -1,353 +0,0 @@ - - 4.0.0 - sh.ory.hydra - hydra-client - jar - hydra-client - - 0.0.0-SNAPSHOT - https://github.com/ory/hydra-client-java - Java Client for ORY hydra - - scm:git:git@github.com:ory/hydra-client-java.git - scm:git:git@github.com:ory/hydra-client-java.git - https://github.com/ory/hydra-client-java - - - - - Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0 - repo - - - - - - ORY - opensource@ory.sh - www.ory.sh - https://www.ory.sh - - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - 3.0.0-M1 - - - enforce-maven - - enforce - - - - - 2.2.0 - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.12 - - - - loggerPath - conf/log4j.properties - - - -Xms512m -Xmx1500m - methods - pertest - - - - maven-dependency-plugin - - - package - - copy-dependencies - - - ${project.build.directory}/lib - - - - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.2 - - - - jar - test-jar - - - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.10 - - - add_sources - generate-sources - - add-source - - - - src/main/java - - - - - add_test_sources - generate-test-sources - - add-test-source - - - - src/test/java - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.4 - - - attach-javadocs - - jar - - - - - - - http.response.details - a - Http Response Details: - - - - - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - - attach-sources - - jar-no-fork - - - - - - maven-deploy-plugin - 2.8.2 - - - default-deploy - deploy - - deploy - - - - - - org.apache.maven.plugins - maven-release-plugin - 2.5.3 - - true - false - forked-path - -Dgpg.passphrase=${gpg.passphrase} - - - - org.apache.maven.scm - maven-scm-provider-gitexe - 1.9.5 - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ossrh - https://oss.sonatype.org/ - true - - - - - - - - sign-artifacts - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.5 - - - sign-artifacts - verify - - sign - - - - - - - - - release-sign-artifacts - - - performRelease - true - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.6 - - - sign-artifacts - verify - - sign - - - - - - - - - - - - io.swagger - swagger-annotations - ${swagger-core-version} - - - - com.google.code.findbugs - jsr305 - 3.0.2 - - - com.squareup.okhttp3 - okhttp - ${okhttp-version} - - - com.squareup.okhttp3 - logging-interceptor - ${okhttp-version} - - - com.google.code.gson - gson - ${gson-version} - - - io.gsonfire - gson-fire - ${gson-fire-version} - - - org.apache.oltu.oauth2 - org.apache.oltu.oauth2.client - 1.0.1 - - - org.apache.commons - commons-lang3 - ${commons-lang3-version} - - - org.threeten - threetenbp - ${threetenbp-version} - - - javax.annotation - jsr250-api - ${javax-annotation-version} - - - - junit - junit - ${junit-version} - test - - - - 1.7 - ${java.version} - ${java.version} - 1.8.3 - 1.5.22 - 3.14.2 - 2.8.5 - 3.9 - 1.4.0 - 1.0.0 - 1.0 - 4.12 - UTF-8 - - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - diff --git a/contrib/clients/java/plugins.xml b/contrib/clients/java/plugins.xml deleted file mode 100644 index f652225bcbe..00000000000 --- a/contrib/clients/java/plugins.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ossrh - https://oss.sonatype.org/ - true - - - - org.apache.maven.plugins - maven-release-plugin - 2.5.3 - - true - false - forked-path - -Dgpg.passphrase=${gpg.passphrase} - - - - org.apache.maven.scm - maven-scm-provider-gitexe - 1.9.5 - - - - - maven-deploy-plugin - 2.8.2 - - - default-deploy - deploy - - deploy - - - - - \ No newline at end of file diff --git a/contrib/clients/java/profiles.xml b/contrib/clients/java/profiles.xml deleted file mode 100644 index ffd26870e8d..00000000000 --- a/contrib/clients/java/profiles.xml +++ /dev/null @@ -1,27 +0,0 @@ - - release-sign-artifacts - - - performRelease - true - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.6 - - - sign-artifacts - verify - - sign - - - - - - - diff --git a/contrib/clients/pom.xml b/contrib/clients/pom.xml deleted file mode 100644 index 7e9371a2dbd..00000000000 --- a/contrib/clients/pom.xml +++ /dev/null @@ -1,353 +0,0 @@ - - 4.0.0 - sh.ory.hydra - hydra-client - jar - hydra-client - - 0.0.0-SNAPSHOT - https://github.com/ory/hydra-client-java - Java Client for ORY hydra - - scm:git:git@github.com:ory/hydra-client-java.git - scm:git:git@github.com:ory/hydra-client-java.git - https://github.com/ory/hydra-client-java - - - - - Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0 - repo - - - - - - ORY - opensource@ory.sh - www.ory.sh - https://www.ory.sh - - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - 3.0.0-M1 - - - enforce-maven - - enforce - - - - - 2.2.0 - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.12 - - - - loggerPath - conf/log4j.properties - - - -Xms512m -Xmx1500m - methods - pertest - - - - maven-dependency-plugin - - - package - - copy-dependencies - - - ${project.build.directory}/lib - - - - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.2 - - - - jar - test-jar - - - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.10 - - - add_sources - generate-sources - - add-source - - - - src/main/java - - - - - add_test_sources - generate-test-sources - - add-test-source - - - - src/test/java - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.4 - - - attach-javadocs - - jar - - - - - - - http.response.details - a - Http Response Details: - - - - - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - - attach-sources - - jar-no-fork - - - - - - maven-deploy-plugin - 2.8.2 - - - default-deploy - deploy - - deploy - - - - - - org.apache.maven.plugins - maven-release-plugin - 2.5.3 - - true - false - forked-path - -Dgpg.passphrase=${gpg.passphrase} - - - - org.apache.maven.scm - maven-scm-provider-gitexe - 1.9.5 - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ossrh - https://oss.sonatype.org/ - true - - - - - - - - sign-artifacts - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.5 - - - sign-artifacts - verify - - sign - - - - - - - - - release-sign-artifacts - - - performRelease - true - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.6 - - - sign-artifacts - verify - - sign - - - - - - - - - - - - io.swagger - swagger-annotations - ${swagger-core-version} - - - - com.google.code.findbugs - jsr305 - 3.0.2 - - - com.squareup.okhttp3 - okhttp - ${okhttp-version} - - - com.squareup.okhttp3 - logging-interceptor - ${okhttp-version} - - - com.google.code.gson - gson - ${gson-version} - - - io.gsonfire - gson-fire - ${gson-fire-version} - - - org.apache.oltu.oauth2 - org.apache.oltu.oauth2.client - 1.0.1 - - - org.apache.commons - commons-lang3 - ${commons-lang3-version} - - - org.threeten - threetenbp - ${threetenbp-version} - - - javax.annotation - jsr250-api - ${javax-annotation-version} - - - - junit - junit - ${junit-version} - test - - - - 1.7 - ${java.version} - ${java.version} - 1.8.3 - 1.5.22 - 3.14.2 - 2.8.5 - 3.9 - 1.4.0 - 1.0.0 - 1.0 - 4.12 - UTF-8 - - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - diff --git a/contrib/poms/README.md b/contrib/poms/README.md new file mode 100644 index 00000000000..c2d5256328a --- /dev/null +++ b/contrib/poms/README.md @@ -0,0 +1,4 @@ +This repository contains modified POMs for each of the Ory SDKs. + +If you upgrade the Java generator, you need to compare the POMs in this repository with the version OpenAPI Generator +creates and adjust the POMs in this repository accordingly. diff --git a/contrib/poms/client/pom.xml b/contrib/poms/client/pom.xml index 5ad2388fccb..d6d2859a852 100644 --- a/contrib/poms/client/pom.xml +++ b/contrib/poms/client/pom.xml @@ -5,7 +5,6 @@ ory-client jar ory-client - 0.0.0-SNAPSHOT https://github.com/ory/client-java Java Client for Ory @@ -51,7 +50,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.1.0 + 3.4.1 enforce-maven @@ -71,14 +70,14 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M5 + 2.22.2 - + loggerPath conf/log4j.properties - + -Xms512m -Xmx1500m methods 10 @@ -94,7 +93,7 @@ maven-dependency-plugin - 3.3.0 + 3.6.1 package @@ -125,7 +124,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.3.0 + 3.5.0 add_sources @@ -156,7 +155,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.4.1 + 3.6.3 attach-javadocs @@ -179,7 +178,7 @@ org.apache.maven.plugins maven-source-plugin - 3.2.1 + 3.3.0 attach-sources @@ -286,7 +285,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.0.1 + 3.2.1 sign-artifacts @@ -420,15 +419,15 @@ 1.9.0 4.11.0 2.10.1 - 3.13.0 + 3.14.0 0.2.6 1.3.5 - 5.10.0 + 5.10.2 1.10.0 2.1.1 1.1.1 UTF-8 - 2.27.2 + 2.43.0 diff --git a/contrib/poms/hydra/pom.xml b/contrib/poms/hydra/pom.xml index 1ee9631eada..716778f344b 100644 --- a/contrib/poms/hydra/pom.xml +++ b/contrib/poms/hydra/pom.xml @@ -5,7 +5,6 @@ hydra-client jar hydra-client - 0.0.0-SNAPSHOT https://github.com/ory/hydra-client-java Java Client for Ory Hydra @@ -34,7 +33,7 @@ - + org.apache.maven.plugins maven-compiler-plugin 3.8.1 @@ -51,7 +50,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.1.0 + 3.4.1 enforce-maven @@ -71,22 +70,30 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M5 + 2.22.2 - + loggerPath conf/log4j.properties - + -Xms512m -Xmx1500m methods 10 + + + + org.junit.jupiter + junit-jupiter-engine + ${junit-version} + + maven-dependency-plugin - 3.3.0 + 3.6.1 package @@ -117,7 +124,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.3.0 + 3.5.0 add_sources @@ -148,7 +155,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.4.1 + 3.6.3 attach-javadocs @@ -171,7 +178,7 @@ org.apache.maven.plugins maven-source-plugin - 3.2.1 + 3.3.0 attach-sources @@ -230,42 +237,42 @@ Ref: https://github.com/diffplug/spotless/tree/main/plugin-maven --> - com.diffplug.spotless - spotless-maven-plugin - ${spotless.version} - - - - - - - .gitignore - - - - - - true - 4 - - - - - - + com.diffplug.spotless + spotless-maven-plugin + ${spotless.version} + + + + + + + .gitignore + + + + + + true + 4 + + + + + + - - - 1.8 - - true - + + + 1.8 + + true + - - + + - - + + @@ -278,7 +285,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.0.1 + 3.2.1 sign-artifacts @@ -412,15 +419,15 @@ 1.9.0 4.11.0 2.10.1 - 3.13.0 + 3.14.0 0.2.6 1.3.5 - 5.10.0 + 5.10.2 1.10.0 2.1.1 1.1.1 UTF-8 - 2.27.2 + 2.43.0 diff --git a/contrib/poms/keto/pom.xml b/contrib/poms/keto/pom.xml index f0fc6cce61b..8a55a2aacb8 100644 --- a/contrib/poms/keto/pom.xml +++ b/contrib/poms/keto/pom.xml @@ -5,7 +5,6 @@ keto-client jar keto-client - 0.0.0-SNAPSHOT https://github.com/ory/keto-client-java Java Client for Ory Keto @@ -34,7 +33,7 @@ - + org.apache.maven.plugins maven-compiler-plugin 3.8.1 @@ -51,7 +50,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.1.0 + 3.4.1 enforce-maven @@ -71,22 +70,30 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M5 + 2.22.2 - + loggerPath conf/log4j.properties - + -Xms512m -Xmx1500m methods 10 + + + + org.junit.jupiter + junit-jupiter-engine + ${junit-version} + + maven-dependency-plugin - 3.3.0 + 3.6.1 package @@ -117,7 +124,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.3.0 + 3.5.0 add_sources @@ -148,7 +155,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.4.1 + 3.6.3 attach-javadocs @@ -171,7 +178,7 @@ org.apache.maven.plugins maven-source-plugin - 3.2.1 + 3.3.0 attach-sources @@ -230,42 +237,42 @@ Ref: https://github.com/diffplug/spotless/tree/main/plugin-maven --> - com.diffplug.spotless - spotless-maven-plugin - ${spotless.version} - - - - - - - .gitignore - - - - - - true - 4 - - - - - - + com.diffplug.spotless + spotless-maven-plugin + ${spotless.version} + + + + + + + .gitignore + + + + + + true + 4 + + + + + + - - - 1.8 - - true - + + + 1.8 + + true + - - + + - - + + @@ -278,7 +285,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.0.1 + 3.2.1 sign-artifacts @@ -363,7 +370,7 @@ org.apache.oltu.oauth2 org.apache.oltu.oauth2.client - 1.0.1 + 1.0.2 org.apache.commons @@ -412,15 +419,15 @@ 1.9.0 4.11.0 2.10.1 - 3.13.0 + 3.14.0 0.2.6 1.3.5 - 5.10.0 + 5.10.2 1.10.0 2.1.1 1.1.1 UTF-8 - 2.27.2 + 2.43.0 diff --git a/contrib/poms/kratos/pom.xml b/contrib/poms/kratos/pom.xml index f31c6caf7a9..6a349e63987 100644 --- a/contrib/poms/kratos/pom.xml +++ b/contrib/poms/kratos/pom.xml @@ -5,7 +5,6 @@ kratos-client jar kratos-client - 0.0.0-SNAPSHOT https://github.com/ory/kratos-client-java Java Client for Ory Kratos @@ -34,7 +33,7 @@ - + org.apache.maven.plugins maven-compiler-plugin 3.8.1 @@ -51,7 +50,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.1.0 + 3.4.1 enforce-maven @@ -71,22 +70,30 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M5 + 2.22.2 - + loggerPath conf/log4j.properties - + -Xms512m -Xmx1500m methods 10 + + + + org.junit.jupiter + junit-jupiter-engine + ${junit-version} + + maven-dependency-plugin - 3.3.0 + 3.6.1 package @@ -117,7 +124,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.3.0 + 3.5.0 add_sources @@ -148,7 +155,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.4.1 + 3.6.3 attach-javadocs @@ -171,7 +178,7 @@ org.apache.maven.plugins maven-source-plugin - 3.2.1 + 3.3.0 attach-sources @@ -230,42 +237,42 @@ Ref: https://github.com/diffplug/spotless/tree/main/plugin-maven --> - com.diffplug.spotless - spotless-maven-plugin - ${spotless.version} - - - - - - - .gitignore - - - - - - true - 4 - - - - - - + com.diffplug.spotless + spotless-maven-plugin + ${spotless.version} + + + + + + + .gitignore + + + + + + true + 4 + + + + + + - - - 1.8 - - true - + + + 1.8 + + true + - - + + - - + + @@ -278,7 +285,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.0.1 + 3.2.1 sign-artifacts @@ -363,7 +370,7 @@ org.apache.oltu.oauth2 org.apache.oltu.oauth2.client - 1.0.1 + 1.0.2 org.apache.commons @@ -412,15 +419,15 @@ 1.9.0 4.11.0 2.10.1 - 3.13.0 + 3.14.0 0.2.6 1.3.5 - 5.10.0 + 5.10.2 1.10.0 2.1.1 1.1.1 UTF-8 - 2.27.2 + 2.43.0 diff --git a/contrib/poms/oathkeeper/pom.xml b/contrib/poms/oathkeeper/pom.xml index 4f1be9c6da4..37dc075e7e4 100644 --- a/contrib/poms/oathkeeper/pom.xml +++ b/contrib/poms/oathkeeper/pom.xml @@ -5,7 +5,6 @@ oathkeeper-client jar oathkeeper-client - 0.0.0-SNAPSHOT https://github.com/ory/oathkeeper-client-java Java Client for Ory Oathkeeper @@ -34,7 +33,7 @@ - + org.apache.maven.plugins maven-compiler-plugin 3.8.1 @@ -51,7 +50,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.1.0 + 3.4.1 enforce-maven @@ -71,22 +70,30 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M5 + 2.22.2 - + loggerPath conf/log4j.properties - + -Xms512m -Xmx1500m methods 10 + + + + org.junit.jupiter + junit-jupiter-engine + ${junit-version} + + maven-dependency-plugin - 3.3.0 + 3.6.1 package @@ -117,7 +124,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.3.0 + 3.5.0 add_sources @@ -148,7 +155,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.4.1 + 3.6.3 attach-javadocs @@ -171,7 +178,7 @@ org.apache.maven.plugins maven-source-plugin - 3.2.1 + 3.3.0 attach-sources @@ -230,42 +237,42 @@ Ref: https://github.com/diffplug/spotless/tree/main/plugin-maven --> - com.diffplug.spotless - spotless-maven-plugin - ${spotless.version} - - - - - - - .gitignore - - - - - - true - 4 - - - - - - + com.diffplug.spotless + spotless-maven-plugin + ${spotless.version} + + + + + + + .gitignore + + + + + + true + 4 + + + + + + - - - 1.8 - - true - + + + 1.8 + + true + - - + + - - + + @@ -278,7 +285,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.0.1 + 3.2.1 sign-artifacts @@ -363,7 +370,7 @@ org.apache.oltu.oauth2 org.apache.oltu.oauth2.client - 1.0.1 + 1.0.2 org.apache.commons @@ -412,15 +419,15 @@ 1.9.0 4.11.0 2.10.1 - 3.13.0 + 3.14.0 0.2.6 1.3.5 - 5.10.0 + 5.10.2 1.10.0 2.1.1 1.1.1 UTF-8 - 2.27.2 + 2.43.0 diff --git a/scripts/generate.sh b/scripts/generate.sh index 05a41c0903f..9888e33aa3a 100755 --- a/scripts/generate.sh +++ b/scripts/generate.sh @@ -41,7 +41,7 @@ typescript () { rm -rf "$dir" || true mkdir -p "$dir" - openapi-generator-cli version-manager set 7.4.0 + openapi-generator-cli version-manager set 7.7.0 openapi-generator-cli generate -i "${SPEC_FILE}" \ -g typescript-axios \ -o "$dir" \ @@ -65,7 +65,7 @@ typescript_fetch () { rm -rf "$dir" || true mkdir -p "$dir" - openapi-generator-cli version-manager set 7.4.0 + openapi-generator-cli version-manager set 7.7.0 openapi-generator-cli generate -i "${SPEC_FILE}" \ -g typescript-fetch \ -o "$dir" \ @@ -91,7 +91,9 @@ java () { # Upgrading Java requires adjusting the pom.xml files in contrib/client. Usually, # new versions of the generator introduce changes to the pom dependencies. - openapi-generator-cli version-manager set 7.3.0 + # + # Read contrib/poms/README.md for upgrade instructions. + openapi-generator-cli version-manager set 7.7.0 openapi-generator-cli generate -i "${SPEC_FILE}" \ -g java \ -o "$dir" \ @@ -100,53 +102,9 @@ java () { --git-host github.com \ -c ./config/client/java.yml.proc.yml + # Read contrib/poms/README.md for upgrade instructions. cp "contrib/poms/${PROJECT}/pom.xml" "clients/${PROJECT}/java/pom.xml" - # POM modification is disabled because openapi-generator does not re-generate the POM anyways. If, for some reason, - # the POM file is lost, you can recover it: - # - # $ cp contrib/clients/java//pom.xml.backup clients//java/pom.xml - - # Insert correct pom values... - # pom="clients/${PROJECT}/java/pom.xml" - # xmlstarlet ed -N "p=http://maven.apache.org/POM/4.0.0" -a "/p:project/p:build/p:plugins/p:plugin[last()]" -t elem -n plugin \ - # -v "$(xmlstarlet sel -t -c '//plugin/*' contrib/clients/java/plugin-01.xml)" "${pom}" \ - # | xmlstarlet unesc | xml fo > tmp.$$.xml && mv tmp.$$.xml "${pom}" - # - # xmlstarlet ed -N "p=http://maven.apache.org/POM/4.0.0" -a "/p:project/p:build/p:plugins/p:plugin[last()]" -t elem -n plugin \ - # -v "$(xmlstarlet sel -t -c '//plugin/*' contrib/clients/java/plugin-02.xml)" "${pom}" \ - # | xmlstarlet unesc | xml fo > tmp.$$.xml && mv tmp.$$.xml "${pom}" - # - # xmlstarlet ed -N "p=http://maven.apache.org/POM/4.0.0" -a "/p:project/p:build/p:plugins/p:plugin[last()]" -t elem -n plugin \ - # -v "$(xmlstarlet sel -t -c '//plugin/*' contrib/clients/java/plugin-03.xml)" "${pom}" \ - # | xmlstarlet unesc | xml fo > tmp.$$.xml && mv tmp.$$.xml "${pom}" - # - # xmlstarlet ed -N "p=http://maven.apache.org/POM/4.0.0" -a "/p:project/p:profiles/p:profile[last()]" -t elem -n profile \ - # -v "$(xmlstarlet sel -t -c '//plugin/*' contrib/clients/java/profile-01.xml)" "${pom}" \ - # | xmlstarlet unesc | xml fo > tmp.$$.xml && mv tmp.$$.xml "${pom}" - # - # xmlstarlet ed -N "p=http://maven.apache.org/POM/4.0.0" -a "/p:project/p:properties" -t elem -n distributionManagement \ - # -v "$(xmlstarlet sel -t -c '//distributionManagement/*' contrib/clients/java/distributionManagement.xml)" "${pom}" \ - # | xmlstarlet unesc | xml fo > tmp.$$.xml && mv tmp.$$.xml "${pom}" - # - # xmlstarlet ed --inplace -N "p=http://maven.apache.org/POM/4.0.0" \ - # --update "/p:project/p:version" \ - # --value '0.0.0-SNAPSHOT' \ - # --update "/p:project/p:url" \ - # --value "https://github.com/ory/${PROJECT}-client-java" \ - # --update "/p:project/p:description" \ - # --value "Java Client for ORY ${PROJECT}" \ - # --update "/p:project/p:scm/p:connection" \ - # --value "scm:git:git@github.com:ory/${PROJECT}-client-java.git" \ - # --update "/p:project/p:scm/p:developerConnection" \ - # --value "scm:git:git@github.com:ory/${PROJECT}-client-java.git" \ - # --update "/p:project/p:scm/p:url" \ - # --value "https://github.com/ory/${PROJECT}-client-java" \ - # "${pom}" - # - # tail -n +2 < "${pom}" > tmp.$$.xml && mv tmp.$$.xml "${pom}" - # - # cat "${pom}" cp "LICENSE" "clients/${PROJECT}/java" } @@ -157,7 +115,7 @@ php() { rm -rf "$dir" || true mkdir -p "$dir" - openapi-generator-cli version-manager set 7.4.0 + openapi-generator-cli version-manager set 7.7.0 openapi-generator-cli generate -i "${SPEC_FILE}" \ -g php \ -o "$dir" \ @@ -182,7 +140,7 @@ python () { rm -rf "$dir" || true mkdir -p "$dir" - openapi-generator-cli version-manager set 7.4.0 + openapi-generator-cli version-manager set 7.7.0 openapi-generator-cli generate -i "${SPEC_FILE}" \ -g python \ -o "$dir" \ @@ -202,7 +160,7 @@ ruby () { rm "${dir}/lib/${RUBY_PROJECT_NAME}/version.rb" || true - openapi-generator-cli version-manager set 7.4.0 + openapi-generator-cli version-manager set 7.7.0 openapi-generator-cli generate -i "${SPEC_FILE}" \ -g ruby \ -o "$dir" \ @@ -230,7 +188,7 @@ golang () { mkdir -p "${dir}" - openapi-generator-cli version-manager set 7.4.0 + openapi-generator-cli version-manager set 7.6.0 # 7.7.0 has an issue with an unused import. We can upgrade once this is fixed. openapi-generator-cli generate -i "${SPEC_FILE}" \ -g go \ -o "$dir" \ @@ -256,7 +214,7 @@ dotnet () { rm -rf "$dir" || true mkdir -p "$dir" - openapi-generator-cli version-manager set 7.4.0 + openapi-generator-cli version-manager set 7.7.0 openapi-generator-cli generate -i "${SPEC_FILE}" \ -g csharp \ -o "$dir" \ @@ -275,7 +233,7 @@ dart () { rm -rf "$dir" || true mkdir -p "$dir" - openapi-generator-cli version-manager set 7.4.0 + openapi-generator-cli version-manager set 7.7.0 openapi-generator-cli generate -i "${SPEC_FILE}" \ -g dart-dio \ -o "$dir" \ @@ -297,7 +255,7 @@ rust () { rm -rf "$dir" || true mkdir -p "$dir" - openapi-generator-cli version-manager set 7.4.0 + openapi-generator-cli version-manager set 7.7.0 # We use a custom rust template to fix some of the compilation issues: # - https://github.com/OpenAPITools/openapi-generator/issues/13257 # - https://github.com/OpenAPITools/openapi-generator/issues/10845 @@ -329,8 +287,8 @@ elixir () { file="${dir}/mix.exs" - # 7.4.0 - openapi-generator-cli version-manager set 7.4.0 + # 7.7.0 + openapi-generator-cli version-manager set 7.7.0 openapi-generator-cli generate -i "${SPEC_FILE}" \ -g elixir \ -o "$dir" \ @@ -345,7 +303,6 @@ elixir () { cp "LICENSE" "clients/${PROJECT}/elixir" } -# elixir is broken right now: https://github.com/ory/sdk/issues/350 elixir typescript typescript_fetch @@ -355,7 +312,6 @@ java php python -# ruby is broken right now: https://github.com/ory/sdk/issues/357 ruby dotnet dart diff --git a/scripts/release.sh b/scripts/release.sh index 8ba85e8ba92..1b90fa247f8 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -233,14 +233,14 @@ FAIL=0 echo "starting" python || let "FAIL+=1" -# ruby || let "FAIL+=1" +ruby || let "FAIL+=1" golang || let "FAIL+=1" php || let "FAIL+=1" typescript || let "FAIL+=1" typescript_fetch || let "FAIL+=1" -# dart || let "FAIL+=1" +dart || let "FAIL+=1" rust || let "FAIL+=1" -# elixir || let "FAIL+=1" +elixir || let "FAIL+=1" java || let "FAIL+=1" dotnet || let "FAIL+=1" upstream || let "FAIL+=1" diff --git a/scripts/test.sh b/scripts/test.sh index c5f4e219672..0a312d34e04 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -101,7 +101,7 @@ elixir () { (cd "${dir}"; mix test) } -# elixir +elixir typescript typescript_fetch rust @@ -109,6 +109,6 @@ golang java php python -# ruby +ruby dart csharp