Skip to content
This repository has been archived by the owner on Oct 16, 2023. It is now read-only.

Gh-987: Upgrade dependencies #995

Merged
merged 10 commits into from
May 3, 2022
Merged

Gh-987: Upgrade dependencies #995

merged 10 commits into from
May 3, 2022

Conversation

GCHQDeveloper314
Copy link
Member

@GCHQDeveloper314 GCHQDeveloper314 commented Apr 5, 2022

@GCHQDeveloper314
Copy link
Member Author

This PR is for compatibility with Gaffer 2 alpha 2. CI will fail until that version is used in Gaffer tools, this branch will then build.

@GCHQDeveloper314 GCHQDeveloper314 linked an issue Apr 5, 2022 that may be closed by this pull request
@t92549
Copy link
Contributor

t92549 commented Apr 5, 2022

After alpha 2 is released, a PR to update the Gaffer version will be made into this branch. That will mean the CI can be tested.

@codecov-commenter
Copy link

codecov-commenter commented Apr 22, 2022

Codecov Report

Merging #995 (7aa3db1) into v2-alpha (d856cd7) will increase coverage by 0.15%.
The diff coverage is 80.00%.

❗ Current head 7aa3db1 differs from pull request most recent head 02ecdd9. Consider uploading reports for the commit 02ecdd9 to get more accurate results

Impacted file tree graph

@@              Coverage Diff               @@
##             v2-alpha     #995      +/-   ##
==============================================
+ Coverage       45.00%   45.15%   +0.15%     
  Complexity        101      101              
==============================================
  Files              25       25              
  Lines             900      897       -3     
  Branches           74       73       -1     
==============================================
  Hits              405      405              
+ Misses            465      462       -3     
  Partials           30       30              
Impacted Files Coverage Δ
...niaccumulocluster/MiniAccumuloShellController.java 0.00% <0.00%> (ø)
...accumulocluster/MiniAccumuloClusterController.java 36.74% <100.00%> (ø)
...etesting/ingest/BytesWritableElementGenerator.java 81.81% <100.00%> (ø)
...chq/gaffer/performancetesting/query/QueryTest.java 66.26% <100.00%> (ø)
...tgeneration/cache/PreferentialAttachmentCache.java 65.30% <100.00%> (ø)
...gchq/gaffer/randomelementgeneration/Constants.java 0.00% <0.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 278791f...02ecdd9. Read the comment docs.

t92549 and others added 3 commits April 22, 2022 14:53
* Updated Gaffer version to 2.0.0-alpha-0.2

* Added new koryphe function to gafferpy

Co-authored-by: Gaffer <github-actions@github.com>
@GCHQDeveloper314
Copy link
Member Author

Because of Gaffer #2634 tests which require WARs are failing. This will be fixed in the next alpha.

@GCHQDeveloper314 GCHQDeveloper314 force-pushed the gh-987-upgrade-dependencies branch from 7aa3db1 to 02ecdd9 Compare April 29, 2022 15:30
@GCHQDeveloper314
Copy link
Member Author

This PR will need to be merged as is, unless we delay a release until alpha 3. The Gaffer WARs for alpha 2 are broken, they are used for these CI tests and so they will always fail.

The WAR problem was fixed in Gaffer #2635. To test this branch, clone 2635 and build it, then clone this branch, change the gaffer versions to the SNAPSHOT version used by 2635 and then run the tests - they should all pass. @t92549 - could you take a look at testing and confirming this locally?

@t92549 t92549 merged commit 6687617 into v2-alpha May 3, 2022
@t92549 t92549 deleted the gh-987-upgrade-dependencies branch May 3, 2022 12:08
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Upgrade dependencies for Gaffer 2 Upgrade gaffer-tools to build with Java 8 and Java 11
3 participants