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

Update version to 4.0.2-SNAPSHOT #3047

Merged
merged 5 commits into from Jun 2, 2019
Merged

Update version to 4.0.2-SNAPSHOT #3047

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
141cc53
Update version to 4.0.2-SNAPSHOT
jmini May 31, 2019
5dc0df9
Update samples
jmini May 31, 2019
1c95da6
Change AppVeyor script (test of gradle sample)
jmini May 31, 2019
a553408
Fix release version bump script (gradle plugin, sample poms)
jimschubert Jun 1, 2019
c828b73
Include sonatype snapshots in maven examples which reference 4.0.2-SN…
jimschubert Jun 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 2 additions & 1 deletion appveyor.yml
View file
Open in desktop
Expand Up @@ -30,7 +30,6 @@ install:
- cmd: SET M2_HOME=C:\maven\apache-maven-3.2.5
- cmd: java -version
- cmd: gradle -v
- cmd: gradle -b modules\openapi-generator-gradle-plugin\samples\local-spec\build.gradle buildGoSdk --info
- cmd: dir/w
- git clone https://github.com/wing328/swagger-samples
- ps: Start-Process -FilePath 'C:\maven\apache-maven-3.2.5\bin\mvn' -ArgumentList 'jetty:run' -WorkingDirectory "$env:appveyor_build_folder\swagger-samples\java\java-jersey-jaxrs-ci"
Expand All @@ -50,6 +49,8 @@ build_script:
- msbuild samples\client\petstore\csharp\OpenAPIClientNetStandard\Org.OpenAPITools.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
# install openapi-generator locally
- mvn clean install --quiet
# run the locally installed openapi-generator-gradle-plugin
- gradle -PopenApiGeneratorVersion=4.0.2-SNAPSHOT -b modules\openapi-generator-gradle-plugin\samples\local-spec\build.gradle buildGoSdk --info
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think -PopenApiGeneratorVersion=4.0.2-SNAPSHOT can be removed after changes to fix release_version_update.sh and release_version_update_docs.sh

test_script:
# restore test-related files
- copy /b/v/y CI\samples.ci\client\petstore\csharp\OpenAPIClient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj samples\client\petstore\csharp\OpenAPIClient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
Expand Down
4 changes: 3 additions & 1 deletion bin/utils/release_version_update.sh
View file
Open in desktop
Expand Up @@ -33,8 +33,10 @@ fi

echo "Release preparation: replacing $FROM with $TO in different files"

# This script assumes the files defined here have a version surrounded by angle brackets within an xml node.
# For example, >4.0.0< becomes >4.0.1-SNAPSHOT<.
# Verify the sed command below against a file before adding here.
declare -a files=("modules/openapi-generator-cli/pom.xml"
"modules/openapi-generator-gradle-plugin/gradle.properties"
"modules/openapi-generator-gradle-plugin/pom.xml"
"modules/openapi-generator-core/pom.xml"
"modules/openapi-generator-maven-plugin/pom.xml"
Expand Down
2 changes: 2 additions & 0 deletions bin/utils/release_version_update_docs.sh
View file
Open in desktop
Expand Up @@ -34,10 +34,12 @@ fi
echo "Release preparation: replacing $FROM with $TO in different files"

declare -a files=("modules/openapi-generator-maven-plugin/README.md"
"modules/openapi-generator-maven-plugin/examples/multi-module/java-client/pom.xml"
"modules/openapi-generator-maven-plugin/examples/java-client.xml"
"modules/openapi-generator-maven-plugin/examples/non-java-invalid-spec.xml"
"modules/openapi-generator-maven-plugin/examples/non-java.xml"
"modules/openapi-generator-gradle-plugin/README.adoc"
"modules/openapi-generator-gradle-plugin/gradle.properties"
"modules/openapi-generator-gradle-plugin/samples/local-spec/gradle.properties"
"modules/openapi-generator-gradle-plugin/samples/local-spec/build.gradle"
"modules/openapi-generator-gradle-plugin/samples/local-spec/README.md"
Expand Down
2 changes: 1 addition & 1 deletion modules/openapi-generator-cli/pom.xml
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.openapitools</groupId>
<artifactId>openapi-generator-project</artifactId>
<version>4.0.1</version>
<version>4.0.2-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion modules/openapi-generator-core/pom.xml
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>openapi-generator-project</artifactId>
<groupId>org.openapitools</groupId>
<version>4.0.1</version>
<version>4.0.2-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion modules/openapi-generator-gradle-plugin/gradle.properties
View file
Open in desktop
@@ -1,4 +1,4 @@
openApiGeneratorVersion=4.0.1-SNAPSHOT
openApiGeneratorVersion=4.0.2-SNAPSHOT

# BEGIN placeholders
# these are just placeholders to allow contributors to build directly
Expand Down
2 changes: 1 addition & 1 deletion modules/openapi-generator-gradle-plugin/pom.xml
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.openapitools</groupId>
<artifactId>openapi-generator-project</artifactId>
<version>4.0.1</version>
<version>4.0.2-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion modules/openapi-generator-maven-plugin/examples/java-client.xml
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@
<plugin>
<groupId>org.openapitools</groupId>
<artifactId>openapi-generator-maven-plugin</artifactId>
<version>4.0.1</version>
<version>4.0.2-SNAPSHOT</version>
<executions>
<execution>
<goals>
Expand Down
2 changes: 1 addition & 1 deletion modules/openapi-generator-maven-plugin/examples/multi-module/java-client/pom.xml
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@
<plugin>
<groupId>org.openapitools</groupId>
<artifactId>openapi-generator-maven-plugin</artifactId>
<version>4.0.0</version>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file was previously not being updated, which is why there's a jump from 4.0.0 to 4.0.2-SNAPSHOT in this PR.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated the release checklist to include this file: https://github.com/OpenAPITools/openapi-generator/wiki/Release-Checklist

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It really depends what we would like to do.

I like when documentation and usage examples (maven & gradle) use the last released version. But we can do it an other way in this project.

If we use the current SNAPSHOT version, at least we should add this at the top of the pom:

  <pluginRepositories>
    <pluginRepository>
      <id>sonatype-snapshots</id>
      <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
    </pluginRepository>
  </pluginRepositories>

in order for the users to be able to try the lib without having to compile the plugin locally them-self.
(and add of course the equivalent for the gradle examples)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've added the pluginRepository config to the maven plugin's examples which are referenced in the release_version_update_docs.sh script:

 java-client.xml
 multi-module/java-client/pom.xml
 non-java-invalid-spec.xml
 non-java.xml

I think it would make sense for documentation to always reference a major version, but I think samples in the repository should probably reference the current version of the repository. That is, maven examples are the same as everything under ./samples, since they're examples of how the maven plugin works. I would personally think it was a bug if if I found an example in another repository that didn't track the same version of the repository.

I don't feel too strongly about this, though.

<version>4.0.2-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
Expand Down
2 changes: 1 addition & 1 deletion modules/openapi-generator-maven-plugin/examples/non-java-invalid-spec.xml
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@
<plugin>
<groupId>org.openapitools</groupId>
<artifactId>openapi-generator-maven-plugin</artifactId>
<version>4.0.1</version>
<version>4.0.2-SNAPSHOT</version>
<executions>
<execution>
<goals>
Expand Down
2 changes: 1 addition & 1 deletion modules/openapi-generator-maven-plugin/examples/non-java.xml
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@
<plugin>
<groupId>org.openapitools</groupId>
<artifactId>openapi-generator-maven-plugin</artifactId>
<version>4.0.1</version>
<version>4.0.2-SNAPSHOT</version>
<executions>
<execution>
<goals>
Expand Down
2 changes: 1 addition & 1 deletion modules/openapi-generator-maven-plugin/pom.xml
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.openapitools</groupId>
<artifactId>openapi-generator-project</artifactId>
<version>4.0.1</version>
<version>4.0.2-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<artifactId>openapi-generator-maven-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion modules/openapi-generator-online/pom.xml
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.openapitools</groupId>
<artifactId>openapi-generator-project</artifactId>
<version>4.0.1</version>
<version>4.0.2-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<artifactId>openapi-generator-online</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions modules/openapi-generator/pom.xml
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.openapitools</groupId>
<artifactId>openapi-generator-project</artifactId>
<version>4.0.1</version>
<version>4.0.2-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down Expand Up @@ -313,7 +313,7 @@
<dependency>
<groupId>org.openapitools</groupId>
<artifactId>openapi-generator-core</artifactId>
<version>4.0.1</version>
<version>4.0.2-SNAPSHOT</version>
</dependency>
</dependencies>
<repositories>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Expand Up @@ -9,7 +9,7 @@
<artifactId>openapi-generator-project</artifactId>
<packaging>pom</packaging>
<name>openapi-generator-project</name>
<version>4.0.1</version>
<version>4.0.2-SNAPSHOT</version>
<url>https://github.com/openapitools/openapi-generator</url>
<scm>
<connection>scm:git:git@github.com:openapitools/openapi-generator.git</connection>
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/R/.openapi-generator/VERSION
View file
Open in desktop
@@ -1 +1 @@
4.0.1-SNAPSHOT
4.0.2-SNAPSHOT
2 changes: 1 addition & 1 deletion samples/client/petstore/apex/.openapi-generator/VERSION
View file
Open in desktop
@@ -1 +1 @@
4.0.1-SNAPSHOT
4.0.2-SNAPSHOT
2 changes: 1 addition & 1 deletion samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/VERSION
View file
Open in desktop
@@ -1 +1 @@
4.0.1-SNAPSHOT
4.0.2-SNAPSHOT
2 changes: 1 addition & 1 deletion samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/VERSION
View file
Open in desktop
@@ -1 +1 @@
4.0.1-SNAPSHOT
4.0.2-SNAPSHOT
2 changes: 1 addition & 1 deletion samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/VERSION
View file
Open in desktop
@@ -1 +1 @@
4.0.1-SNAPSHOT
4.0.2-SNAPSHOT
2 changes: 1 addition & 1 deletion samples/client/petstore/elixir/.openapi-generator/VERSION
View file
Open in desktop
@@ -1 +1 @@
4.0.1-SNAPSHOT
4.0.2-SNAPSHOT
2 changes: 1 addition & 1 deletion samples/client/petstore/go/go-petstore/.openapi-generator/VERSION
View file
Open in desktop
@@ -1 +1 @@
4.0.1-SNAPSHOT
4.0.2-SNAPSHOT
2 changes: 1 addition & 1 deletion samples/client/petstore/groovy/.openapi-generator/VERSION
View file
Open in desktop
@@ -1 +1 @@
4.0.1-SNAPSHOT
4.0.2-SNAPSHOT
2 changes: 1 addition & 1 deletion samples/client/petstore/haskell-http-client/.openapi-generator/VERSION
View file
Open in desktop
@@ -1 +1 @@
4.0.1-SNAPSHOT
4.0.2-SNAPSHOT
2 changes: 1 addition & 1 deletion samples/client/petstore/java/feign/.openapi-generator/VERSION
View file
Open in desktop
@@ -1 +1 @@
4.0.1-SNAPSHOT
4.0.2-SNAPSHOT
2 changes: 1 addition & 1 deletion samples/client/petstore/java/feign10x/.openapi-generator/VERSION
View file
Open in desktop
@@ -1 +1 @@
4.0.1-SNAPSHOT
4.0.2-SNAPSHOT
2 changes: 1 addition & 1 deletion samples/client/petstore/java/google-api-client/.openapi-generator/VERSION
View file
Open in desktop
@@ -1 +1 @@
4.0.1-SNAPSHOT
4.0.2-SNAPSHOT
2 changes: 1 addition & 1 deletion samples/client/petstore/java/jersey1/.openapi-generator/VERSION
View file
Open in desktop
@@ -1 +1 @@
4.0.1-SNAPSHOT
4.0.2-SNAPSHOT
2 changes: 1 addition & 1 deletion samples/client/petstore/java/jersey2-java6/.openapi-generator/VERSION
View file
Open in desktop
@@ -1 +1 @@
4.0.1-SNAPSHOT
4.0.2-SNAPSHOT
2 changes: 1 addition & 1 deletion samples/client/petstore/java/jersey2-java8/.openapi-generator/VERSION
View file
Open in desktop
@@ -1 +1 @@
4.0.1-SNAPSHOT
4.0.2-SNAPSHOT
2 changes: 1 addition & 1 deletion samples/client/petstore/java/jersey2/.openapi-generator/VERSION
View file
Open in desktop
@@ -1 +1 @@
4.0.1-SNAPSHOT
4.0.2-SNAPSHOT
2 changes: 1 addition & 1 deletion samples/client/petstore/java/okhttp-gson-parcelableModel/.openapi-generator/VERSION
View file
Open in desktop
@@ -1 +1 @@
4.0.1-SNAPSHOT
4.0.2-SNAPSHOT
2 changes: 1 addition & 1 deletion samples/client/petstore/java/okhttp-gson/.openapi-generator/VERSION
View file
Open in desktop
@@ -1 +1 @@
4.0.1-SNAPSHOT
4.0.2-SNAPSHOT
2 changes: 1 addition & 1 deletion samples/client/petstore/java/rest-assured/.openapi-generator/VERSION
View file
Open in desktop
@@ -1 +1 @@
4.0.1-SNAPSHOT
4.0.2-SNAPSHOT
2 changes: 1 addition & 1 deletion samples/client/petstore/java/resteasy/.openapi-generator/VERSION
View file
Open in desktop
@@ -1 +1 @@
4.0.1-SNAPSHOT
4.0.2-SNAPSHOT
2 changes: 1 addition & 1 deletion samples/client/petstore/java/resttemplate-withXml/.openapi-generator/VERSION
View file
Open in desktop
@@ -1 +1 @@
4.0.1-SNAPSHOT
4.0.2-SNAPSHOT
2 changes: 1 addition & 1 deletion samples/client/petstore/java/resttemplate/.openapi-generator/VERSION
View file
Open in desktop
@@ -1 +1 @@
4.0.1-SNAPSHOT
4.0.2-SNAPSHOT
2 changes: 1 addition & 1 deletion samples/client/petstore/java/retrofit/.openapi-generator/VERSION
View file
Open in desktop
@@ -1 +1 @@
4.0.1-SNAPSHOT
4.0.2-SNAPSHOT
2 changes: 1 addition & 1 deletion samples/client/petstore/java/retrofit2-play24/.openapi-generator/VERSION
View file
Open in desktop
@@ -1 +1 @@
4.0.1-SNAPSHOT
4.0.2-SNAPSHOT
2 changes: 1 addition & 1 deletion samples/client/petstore/java/retrofit2-play25/.openapi-generator/VERSION
View file
Open in desktop
@@ -1 +1 @@
4.0.1-SNAPSHOT
4.0.2-SNAPSHOT
2 changes: 1 addition & 1 deletion samples/client/petstore/java/retrofit2-play26/.openapi-generator/VERSION
View file
Open in desktop
@@ -1 +1 @@
4.0.1-SNAPSHOT
4.0.2-SNAPSHOT
2 changes: 1 addition & 1 deletion samples/client/petstore/java/retrofit2/.openapi-generator/VERSION
View file
Open in desktop
@@ -1 +1 @@
4.0.1-SNAPSHOT
4.0.2-SNAPSHOT
2 changes: 1 addition & 1 deletion samples/client/petstore/java/retrofit2rx/.openapi-generator/VERSION
View file
Open in desktop
@@ -1 +1 @@
4.0.1-SNAPSHOT
4.0.2-SNAPSHOT
2 changes: 1 addition & 1 deletion samples/client/petstore/java/retrofit2rx2/.openapi-generator/VERSION
View file
Open in desktop
@@ -1 +1 @@
4.0.1-SNAPSHOT
4.0.2-SNAPSHOT
2 changes: 1 addition & 1 deletion samples/client/petstore/java/vertx/.openapi-generator/VERSION
View file
Open in desktop
@@ -1 +1 @@
4.0.1-SNAPSHOT
4.0.2-SNAPSHOT
2 changes: 1 addition & 1 deletion samples/client/petstore/java/webclient/.openapi-generator/VERSION
View file
Open in desktop
@@ -1 +1 @@
4.0.1-SNAPSHOT
4.0.2-SNAPSHOT
2 changes: 1 addition & 1 deletion samples/client/petstore/javascript-es6/.openapi-generator/VERSION
View file
Open in desktop
@@ -1 +1 @@
4.0.1-SNAPSHOT
4.0.2-SNAPSHOT
2 changes: 1 addition & 1 deletion samples/client/petstore/javascript-promise-es6/.openapi-generator/VERSION
View file
Open in desktop
@@ -1 +1 @@
4.0.1-SNAPSHOT
4.0.2-SNAPSHOT
2 changes: 1 addition & 1 deletion samples/client/petstore/javascript-promise/.openapi-generator/VERSION
View file
Open in desktop
@@ -1 +1 @@
4.0.1-SNAPSHOT
4.0.2-SNAPSHOT
2 changes: 1 addition & 1 deletion samples/client/petstore/javascript-promise/src/ApiClient.js
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
*
* OpenAPI Generator version: 4.0.1-SNAPSHOT
* OpenAPI Generator version: 4.0.2-SNAPSHOT
*
* Do not edit the class manually.
*
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/javascript-promise/src/api/AnotherFakeApi.js
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
*
* OpenAPI Generator version: 4.0.1-SNAPSHOT
* OpenAPI Generator version: 4.0.2-SNAPSHOT
*
* Do not edit the class manually.
*
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/javascript-promise/src/api/FakeApi.js
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
*
* OpenAPI Generator version: 4.0.1-SNAPSHOT
* OpenAPI Generator version: 4.0.2-SNAPSHOT
*
* Do not edit the class manually.
*
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/javascript-promise/src/api/FakeClassnameTags123Api.js
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
*
* OpenAPI Generator version: 4.0.1-SNAPSHOT
* OpenAPI Generator version: 4.0.2-SNAPSHOT
*
* Do not edit the class manually.
*
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/javascript-promise/src/api/PetApi.js
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
*
* OpenAPI Generator version: 4.0.1-SNAPSHOT
* OpenAPI Generator version: 4.0.2-SNAPSHOT
*
* Do not edit the class manually.
*
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/javascript-promise/src/api/StoreApi.js
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
*
* OpenAPI Generator version: 4.0.1-SNAPSHOT
* OpenAPI Generator version: 4.0.2-SNAPSHOT
*
* Do not edit the class manually.
*
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/javascript-promise/src/api/UserApi.js
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
*
* OpenAPI Generator version: 4.0.1-SNAPSHOT
* OpenAPI Generator version: 4.0.2-SNAPSHOT
*
* Do not edit the class manually.
*
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/javascript-promise/src/index.js
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
*
* OpenAPI Generator version: 4.0.1-SNAPSHOT
* OpenAPI Generator version: 4.0.2-SNAPSHOT
*
* Do not edit the class manually.
*
Expand Down