Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

java-springcloud: No dependency management if parent overridden #3301

Merged
merged 5 commits into from
Aug 5, 2019
Merged

java-springcloud: No dependency management if parent overridden #3301

merged 5 commits into from
Aug 5, 2019

Conversation

MelleD
Copy link
Contributor

@MelleD MelleD commented Jul 8, 2019

If a separate parent pom is specified, there should be no depdendency management

fixes #3230

PR checklist

  • Read the contribution guidelines.
  • Ran the shell script under ./bin/ to update Petstore sample so that CIs can verify the change. (For instance, only need to run ./bin/{LANG}-petstore.sh, ./bin/openapi3/{LANG}-petstore.sh if updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates). Windows batch files can be found in .\bin\windows\. If contributing template-only or documentation-only changes which will change sample output, be sure to build the project first.
  • Filed the PR against the correct branch: master. Default: master.
  • Copied the technical committee to review the pull request if your PR is targeting a particular programming language. @bbdouglas (2017/07) @sreeshas (2017/08) @jfiala (2017/08) @lukoyanov (2017/09) @cbornet (2017/09) @jeff9finger (2018/01) @karismann (2019/03) @Zomzog (2019/04)

Description of the PR

If a separate parent pom is specified, there should be no depdendency management, because that can lead to version conflicts

@MelleD
Copy link
Contributor Author

MelleD commented Aug 5, 2019

@macjohnny @bbdouglas @sreeshas @jfiala @lukoyanov @cbornet @jeff9finger @karismann @Zomzog @wing328

Is there any objection to merge this?
If this is into the next release, it would make a lot easier for us.
Thank you

@macjohnny macjohnny changed the title No depdendency management java-springcloud: No dependency management if parent overridden Aug 5, 2019
@macjohnny macjohnny merged commit b20118b into OpenAPITools:master Aug 5, 2019
@jmini
Copy link
Member

jmini commented Aug 5, 2019

CircleCI for the master branch after this merge (commit b20118b) is failing:
https://circleci.com/gh/OpenAPITools/openapi-generator/8135#tests/containers/2

Because the samples were not correctly update:

diff --git a/samples/client/petstore/spring-cloud-async/pom.xml b/samples/client/petstore/spring-cloud-async/pom.xml
index b14446583f..db09f2e259 100644
--- a/samples/client/petstore/spring-cloud-async/pom.xml
+++ b/samples/client/petstore/spring-cloud-async/pom.xml
@@ -66,5 +66,10 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.hibernate.validator</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <version>6.0.16.Final</version>
+        </dependency>
     </dependencies>
 </project>

This might be because of concurrent merges

@jmini
Copy link
Member

jmini commented Aug 5, 2019

Pushed as commit fae0738

@macjohnny
Copy link
Member

@jmini thanks for the updated samples.

# for free to join this conversation on GitHub. Already have an account? # to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] [SPRING-CLOUD] Remove dependency management tag
4 participants