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

chore: bump scala to 2.13 #1851

Merged
merged 10 commits into from May 5, 2021
Merged

Conversation

@subotic
Copy link
Collaborator

@subotic subotic commented Apr 30, 2021

resolves DSP-1589

@subotic subotic self-assigned this Apr 30, 2021
@benjamingeer
Copy link
Contributor

@benjamingeer benjamingeer commented May 3, 2021

Tests now failing because of:

Error:  OneForOneStrategy - You are using version 10.2.4 of Akka HTTP, but it appears you (perhaps indirectly)
also depend on older versions of related artifacts. You can solve this by adding an explicit dependency on version
10.2.4 of the [akka-http-spray-json, akka-http-testkit, akka-http-xml] artifacts to your project. See also:
https://doc.akka.io/docs/akka/current/common/binary-compatibility-rules.html#mixed-versioning-is-not-allowed
@subotic
Copy link
Collaborator Author

@subotic subotic commented May 3, 2021

Tests now failing because of:

Error:  OneForOneStrategy - You are using version 10.2.4 of Akka HTTP, but it appears you (perhaps indirectly)
also depend on older versions of related artifacts. You can solve this by adding an explicit dependency on version
10.2.4 of the [akka-http-spray-json, akka-http-testkit, akka-http-xml] artifacts to your project. See also:
https://doc.akka.io/docs/akka/current/common/binary-compatibility-rules.html#mixed-versioning-is-not-allowed

Thanks. Do you want to try and resolve this, or should I?

@subotic subotic marked this pull request as draft May 3, 2021
@benjamingeer
Copy link
Contributor

@benjamingeer benjamingeer commented May 3, 2021

I can try

@benjamingeer
Copy link
Contributor

@benjamingeer benjamingeer commented May 3, 2021

Fixed that, now it fails with:

java.lang.NoClassDefFoundError: org/bouncycastle/crypto/generators/SCrypt
	at org.springframework.security.crypto.scrypt.SCryptPasswordEncoder.decodeAndCheckMatches(SCryptPasswordEncoder.java:152)
	at org.springframework.security.crypto.scrypt.SCryptPasswordEncoder.matches(SCryptPasswordEncoder.java:134)
	at org.knora.webapi.messages.admin.responder.usersmessages.UserADM.$anonfun$passwordMatch$1(UsersMessagesADM.scala:533)
@benjamingeer
Copy link
Contributor

@benjamingeer benjamingeer commented May 3, 2021

OK fixed that I think

@benjamingeer
Copy link
Contributor

@benjamingeer benjamingeer commented May 3, 2021

@subotic OK everything compiles now and the tests pass.

@subotic subotic marked this pull request as ready for review May 3, 2021
@subotic
Copy link
Collaborator Author

@subotic subotic commented May 3, 2021

@subotic OK everything compiles now and the tests pass.

@benjamingeer great, thanks!

@subotic subotic requested review from benjamingeer and SepidehAlassi May 3, 2021
Copy link
Contributor

@SepidehAlassi SepidehAlassi left a comment

LGTM

@benjamingeer
Copy link
Contributor

@benjamingeer benjamingeer commented May 5, 2021

@SepidehAlassi Thank you for reviewing this!

@benjamingeer benjamingeer merged commit 5feb915 into main May 5, 2021
11 checks passed
11 checks passed
@github-actions
Build Everything
Details
@github-actions
Prepare next release
Details
@github-actions
Test client-test-data
Details
@github-actions
API Unit Tests
Details
@github-actions
API E2E Tests
Details
@github-actions
API Integration Tests
Details
@github-actions
Upgrade Integration Tests
Details
@github-actions
Docs Build Test
Details
@github-actions
Publish (on release only)
Details
@github-actions
Deploy docs (on release only)
Details
@github-actions
Google chat notification about release and published version
Details
@benjamingeer benjamingeer deleted the wip/DSP-1589-Bump-DSP-API-to-Scala-2-13 branch May 5, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants