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.

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

fix(build): use versions of dependencies that are available on maven central #1894

Merged
merged 4 commits into from
Aug 19, 2021

Conversation

dbyron-sf
Copy link
Contributor

This effectively combines the autobump PRs for clouddriver, fiat, front50, and spinnaker-gradle-project, along with the maven coordinate change from com.netflix.spinnaker to io.spinnaker.

There are also some other version changes to use dependencies that exist on maven central, though I haven't been able to exercise them much because...

There have been some changes to clouddriver-cloudfoundry that mean we need some tweaks here too. Or at least I get the following compiler errors:

$ ./gradlew build

> Task :halyard-config:compileJava
/Users/dbyron/src/spinnaker/halyard/halyard-config/src/main/java/com/netflix/spinnaker/halyard/config/validate/v1/providers/cloudfoundry/CloudFoundryAccountValidator.java:124: error: cannot find symbol
      int count = spaceService.all(null, null, null).getResources().size();
                                                    ^
  symbol:   method getResources()
  location: interface Call<Pagination<Space>>
/Users/dbyron/src/spinnaker/halyard/halyard-config/src/main/java/com/netflix/spinnaker/halyard/config/validate/v1/providers/cloudfoundry/CloudFoundryAccountValidator.java:161: error: incompatible types: Call<Token> cannot be converted to Token
    return uaaService.passwordToken("password", user, password, "cf", "");
                                   ^
Note: Some input files use or override a deprecated API.
Note: Recompile with -Xlint:deprecation for details.
Note: Some input files use unchecked or unsafe operations.
Note: Recompile with -Xlint:unchecked for details.
2 errors

> Task :halyard-config:compileJava FAILED

FAILURE: Build failed with an exception.

* What went wrong:
Execution failed for task ':halyard-config:compileJava'.
> Compilation failed; see the compiler error output for details.

* Try:
Run with --stacktrace option to get the stack trace. Run with --info or --debug option to get more log output. Run with --scan to get full insights.

* Get more help at https://help.gradle.org

Deprecated Gradle features were used in this build, making it incompatible with Gradle 7.0.
Use '--warning-mode all' to show the individual deprecation warnings.
See https://docs.gradle.org/6.7/userguide/command_line_interface.html#sec:command_line_warnings

BUILD FAILED in 5s
48 actionable tasks: 3 executed, 45 up-to-date

@dbyron-sf
Copy link
Contributor Author

@rvazquezglez or @zachsmith1 any chance you can make the okhttp/retrofit changes here similar to spinnaker/clouddriver@f11b7b7 ?

@spinnakerbot
Copy link
Contributor

The following commits need their title changed:

Please format your commit title into the form:

<type>(<scope>): <subject>, e.g. fix(kubernetes): address NPE in status check

This allows us to easily generate changelogs & determine semantic version numbers when cutting releases. You can read more about commit conventions here.

@zachsmith1
Copy link
Contributor

@dbyron-sf sorry not following — what is needed here?

@zachsmith1
Copy link
Contributor

Oh I think I know what happened. Will TAL tomorrow

@zachsmith1
Copy link
Contributor

@dbyron-sf fixed the CF stuff but looks like there is another issue elsewhere

…central

now that bintray is gone (https://status.bintray.com/).  Keep up with maven coordinate
change from com.netflix.spinnaker to io.spinnaker.
zachsmith1 and others added 2 commits August 18, 2021 23:07
instead of org.lognet:grpc-spring-boot-starter:2.3.2 since
org.lognet:grpc-spring-boot-starter:2.3.2 isn't available at maven central.
since 1.71 isn't available at maven central.  1.72 is available, but doesn't compile.
Update use of getMainParameter / getMainParameterValue now that getMainParameterValue
needs a null check.

Note that a transitive dependency elsewhere (org.testng:testng:6.13.1) expects version
1.72 of jcommander.
@link108 link108 added the ready to merge Approved and ready for a merge label Aug 19, 2021
@mergify mergify bot merged commit 7b7bb06 into master Aug 19, 2021
@mergify mergify bot added the auto merged label Aug 19, 2021
@dbyron-sf dbyron-sf deleted the fixup-build branch August 19, 2021 14:31
dbyron-sf added a commit to dbyron-sf/halyard that referenced this pull request Oct 26, 2021
spinnaker#1894 brought in version 1.75 of
com.beust:jcommander where we previously had 1.71.  1.75 includes
cbeust/jcommander@192ec86 which
adds additional arity validation, which causes halyard commands with main parameters that
specify an arity to fail.  I suspect it's a bug in jcommander, but...

1.75 also includes
cbeust/jcommander@d51a5b7 which
allows us to replace List<String> and arity of 1 with String, simplifying our code.  It
would be nice for jcommander's validation to handle the missing case, but this is still
simpler than what we had before, and works.

Bumping to 1.81 at the same time to stay up to date, and to demonstrate that specifying
arity = 1 still doesn't work with 1.81, but these fixes do.
mergify bot pushed a commit that referenced this pull request Oct 27, 2021
#1894 brought in version 1.75 of
com.beust:jcommander where we previously had 1.71.  1.75 includes
cbeust/jcommander@192ec86 which
adds additional arity validation, which causes halyard commands with main parameters that
specify an arity to fail.  I suspect it's a bug in jcommander, but...

1.75 also includes
cbeust/jcommander@d51a5b7 which
allows us to replace List<String> and arity of 1 with String, simplifying our code.  It
would be nice for jcommander's validation to handle the missing case, but this is still
simpler than what we had before, and works.

Bumping to 1.81 at the same time to stay up to date, and to demonstrate that specifying
arity = 1 still doesn't work with 1.81, but these fixes do.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
auto merged ready to merge Approved and ready for a merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants