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

Gh-3244 fix ci versioning #3245

Merged
merged 3 commits into from
Jul 1, 2024
Merged

Gh-3244 fix ci versioning #3245

merged 3 commits into from
Jul 1, 2024

Conversation

tb06904
Copy link
Member

@tb06904 tb06904 commented Jun 24, 2024

Moves to using mavens 'revision' property so don't have to rely on the release plugin anymore (further reading). This requires editing all the poms to abstract out the version hence lots of file changes.

This also includes a fix so that the version is consistently pulled from the milestone closing so the version on develop should be incremented correctly (set to always be the patch version increasing by default)

Set the version to 2.3.0 -SNAPSHOT in line with next milestone

Related issue

@tb06904 tb06904 requested review from cn337131, l46978 and p29876 June 24, 2024 16:08
@tb06904 tb06904 linked an issue Jun 24, 2024 that may be closed by this pull request
Copy link

Copy link

codecov bot commented Jun 24, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 67.07%. Comparing base (d948fa5) to head (197e39a).

Additional details and impacted files
@@              Coverage Diff              @@
##             develop    #3245      +/-   ##
=============================================
+ Coverage      67.06%   67.07%   +0.01%     
- Complexity      2556     2558       +2     
=============================================
  Files            919      919              
  Lines          29492    29492              
  Branches        3288     3288              
=============================================
+ Hits           19778    19782       +4     
+ Misses          8263     8261       -2     
+ Partials        1451     1449       -2     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@wb36499 wb36499 merged commit 4520b25 into develop Jul 1, 2024
29 checks passed
@wb36499 wb36499 deleted the gh-3244-fix-ci-versioning branch July 1, 2024 08:44
@cn337131 cn337131 added the automation GitHub Actions, CI/CD label Aug 13, 2024
@cn337131 cn337131 added this to the v2.3.0 milestone Aug 13, 2024
@cn337131 cn337131 added the bug Confirmed or suspected bug label Aug 13, 2024
wb36499 added a commit that referenced this pull request Aug 13, 2024
* prepare for next development iteration

* prepare for next development iteration

* prepare for next development iteration

* Gh-3244 fix ci versioning (#3245)

* move to revision property

* update ci

* update ignore

* Gh-3085 Fix payloadOperation being exposed by getOperations (#3247)

* Gh-3085 Fix payloadOperation being exposed by getOperations

* headers

* add test

* Gh-3220: Standardise GafferPop Tests (#3243)

* update graph IT tests

* Rename GraphIT -> GraphTest

* create graph IT

* Create Modern Federated example graph

run graph tests on multiple graph types

* Update federated IT tests

move non-federates specific tests to graph tests

* tidying

* remove public + spotless

* sonarcloud

* sonarcloud

* Use allEdges/allEntities

* tidy

---------

Co-authored-by: wb36499 <[email protected]>

* Gh-3237 Implement DeleteElements for Map Store (#3239)

* Gh-3237 Implement DeleteElements for Map Store

* remove unused param

* spotless

* codecov and sonarcloud

* improve codecov and sonarcloud

* reduce test duplication and add to federated store

* checkstyle

* remove unused properties and improve check

* address PR comments and improve tests

* fix indent

* checkstyle

* copyright

* bump version

* address comments

* add comment

---------

Co-authored-by: cn337131 <[email protected]>
Co-authored-by: tb06904 <[email protected]>

* Gh-3238: target delete accumulo (#3249)

* Gh-3237 Implement DeleteElements for Map Store

* remove unused param

* spotless

* wip

* finish

* checkstyle

* codecov and sonarcloud

* improve codecov and sonarcloud

* reduce test duplication and add to federated store

* checkstyle

* remove unused properties and improve check

* Gh-3238 Implement DeleteElements for Accumulo

* add accumulo test to federated store

* remove commented test

* address comments

* address comments

* checkstyle

* checkstyle

* headers

* code cov

* remove public

* remove AccumuloClient

* code cov

* checkystle

* add test

---------

Co-authored-by: cn337131 <[email protected]>

* Gh-3246: Add an explain step and GafferPop to REST API (#3248)

* basic rest controller for gremlin

* basic websocket endpoint for gremlin inside the rest api

* improvements to the gremlin ws endpoint

* basic hooks for storing last chain

* Add working explain endpoint and tidy websocket

* Add open telementry reporting

* overhaul gremlin user auth and move cypher translator

* basic testing for gremlin controller

* move to utils class

* basic testing updates

* update the options parsing and testing

* test tweaks

* updates from testing

* tweaks

* spotless

* address comments

---------

Co-authored-by: wb36499 <[email protected]>

* Gh-3250: GetElementsWithinSet bug fix (#3251)

* initial testing and changes

* tidy up, remove bug test and copyright headers

* fix commented out lines

* additional federated tests

* reduce duplicate tests

* checkstyle

* add inOutType

* copyright

* fix version variable

* address comments

---------

Co-authored-by: wb36499 <[email protected]>

* Gh-3253 Fix custom types in gremlin (#3255)

* add conversions so gafferpop edges and vertexes are graphson compliant

* update testing

* update testing

* javadoc

* make sure cypher types can be used correctly

* typo

* Gh-3259: Improve release process (#3260)

* update release pipelines

* simplify

* release notes fix

* remove comment

* address comments

* Make gremlin config message clearer (#3264)

* Gh-3258: Sonarcloud Issues (#3261)

* initial improvements

* more test tidy up

* more fixes

* improve coverage

* copyright

* fix DeleteAllData test

* checkstyle

* address comments

* address comments

* checkstyle

* checkstyle

---------

Co-authored-by: wb36499 <[email protected]>

* Gh-3254: Standardise Spring REST user authentication (#3263)

* remove unnecessary controller interfaces and add http header setting

* test tweaks

* Update rest-api/spring-rest/src/main/java/uk/gov/gchq/gaffer/rest/controller/JobController.java

Co-authored-by: cn337131 <[email protected]>

---------

Co-authored-by: cn337131 <[email protected]>
Co-authored-by: wb36499 <[email protected]>

* prepare release gaffer2-2.3.0

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: tb06904 <[email protected]>
Co-authored-by: p29876 <[email protected]>
Co-authored-by: wb36499 <[email protected]>
Co-authored-by: cn337131 <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automation GitHub Actions, CI/CD bug Confirmed or suspected bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Fix the auto up versioning in CI
4 participants