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-2602: Replace Log4j with Reload4j #2609

Merged
merged 3 commits into from
Mar 24, 2022

Conversation

GCHQDeveloper314
Copy link
Member

@GCHQDeveloper314 GCHQDeveloper314 commented Mar 11, 2022

Log4j has been replaced with Reload4j. Maven enforcer plugin is also introduced to prevent future classpath problems if new or upgraded dependencies try to pull in Log4j or other related conflicting dependencies.

Related Issue

Also add enforcer plugin to prevent future problems
@codecov-commenter
Copy link

codecov-commenter commented Mar 11, 2022

Codecov Report

Merging #2609 (971c8fd) into develop (4ccb03f) will decrease coverage by 0.47%.
The diff coverage is 88.57%.

@@              Coverage Diff              @@
##             develop    #2609      +/-   ##
=============================================
- Coverage      66.69%   66.21%   -0.48%     
+ Complexity      2522     2521       -1     
=============================================
  Files            995      962      -33     
  Lines          32457    31002    -1455     
  Branches        3936     3730     -206     
=============================================
- Hits           21647    20529    -1118     
+ Misses          9114     8848     -266     
+ Partials        1696     1625      -71     
Impacted Files Coverage Δ
.../uk/gov/gchq/gaffer/cache/impl/HazelcastCache.java 89.47% <ø> (ø)
...n/java/uk/gov/gchq/gaffer/rest/SystemProperty.java 77.77% <ø> (ø)
.../uk/gov/gchq/gaffer/parquetstore/ParquetStore.java 85.71% <ø> (ø)
.../gov/gchq/gaffer/store/schema/SchemaOptimiser.java 84.94% <50.00%> (ø)
...affer/store/operation/handler/HasTraitHandler.java 75.00% <75.00%> (ø)
...a/uk/gov/gchq/gaffer/store/operation/HasTrait.java 95.83% <95.83%> (ø)
.../src/main/java/uk/gov/gchq/gaffer/store/Store.java 70.43% <100.00%> (+0.07%) ⬆️
.../gchq/gaffer/jsonserialisation/JSONSerialiser.java 72.47% <0.00%> (-1.84%) ⬇️
...java/uk/gov/gchq/gaffer/hbasestore/HBaseStore.java
...store/operation/handler/GetAdjacentIdsHandler.java
... and 33 more

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 bef66a1...971c8fd. Read the comment docs.

Copy link
Contributor

@t92549 t92549 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just some questions

pom.xml Show resolved Hide resolved
pom.xml Show resolved Hide resolved
example/basic/basic-model/pom.xml Show resolved Hide resolved
pom.xml Show resolved Hide resolved
@t92549 t92549 merged commit fb63fc2 into develop Mar 24, 2022
@t92549 t92549 deleted the gh-2602-port-log4j-replacement-to-gaffer-1 branch March 24, 2022 15:56
t92549 added a commit that referenced this pull request May 12, 2023
* Update docs links in README

* Revert "Update docs links in README"

This reverts commit 2d87bf3.

* gh-2559 added hasTrait, its handler and corresponding tests (#2561)

* gh-2559 added hasTrait, its handler and corresponding tests

* gh-2559 amended comment in HasTrait, added additional tests for the handler

* gh-2559 null check & tidy test

Co-authored-by: t92549 <80890692+t92549@users.noreply.github.com>

* Update links to Gaffer docs in all files (#2566)

Co-authored-by: t92549 <80890692+t92549@users.noreply.github.com>

* gh-2604: Deprecates Parquet (#2606)

* gh-2556: Add HBaseStore deprecated tag, javadocs and note to README (#2605)

* gh-2556: Add HBaseStore deprecated tag, javadocs and note to README

* gh-2556: Amend version number

* Upgrade Hazelcast version to 5.1.1 (#2612)

Co-authored-by: t92549 <80890692+t92549@users.noreply.github.com>

* Gh-2602: Replace Log4j with Reload4j (#2609)

* Replace Log4j with Reload4j
Also add enforcer plugin to prevent future problems

* FederatedStoreGetTraitsTest did not delete the cache service before carrying out each test causing it to fail when run as part of the maven tests. In isolation it passed. Found that the FederatedGraphStorageTraitsTest was also not clearing the cache. Added the before and after cache clearance and bumped the JUnit version of FederatedStoreGetTraitsTest from 4 to 5. Tests now pass (#2617)

Co-authored-by: r32575 <63105662+r32575@users.noreply.github.com>

* Gh 2562 GetElementsWithinSet not allowing for the exclusion of properties - Gaffer v1 (#2597)

* Fixed bug gh-2562. View properties are now being filtered. Added tests

* After a review moved the return statements inside the doPostFilter if-check and changed a conditional fail to an assertThat test

* Removed the try-finally blocks as the classes implement CloseableIterable

* Added failure message to test

* Adjusted javadoc formatting

* Removed rogue letter

Co-authored-by: t92549 <80890692+t92549@users.noreply.github.com>

* prepare release gaffer2-1.22.0

* prepare for next development iteration

* gh-2618: Cleanup inconsistent use of logging strings (#2651)

* Found 1 extra inconsistency than the mentioned one

* found and fixed other inconsitencies

* further fixes

* further fixes 2

* fixed 3 out of 4 checkstyle errors - 1 more to fix

* all checkstyle errors fixed

* removed use of String.format

* removed another instance of using String.format

* more changes

* additional change

* reverted changes

* replaced to SLF4J (#2663)

* gh-2669: Added new aggregation function endpoints (#2670)

* gh-2673: Fix links to koryphe core (#2674)

* Gh 2705 operation details spring (#2706)

* gh-2705: Cherry pick new spring endpoint

* gh-2696: Added tests for new all operation details endpoint (#2700)

* gh-2696: Added tests for new all operation details endpoint

* gh-2696: Spotless apply

* gh-2705: Copyright fix

* Gh-2745: Fix crown copyright link

Fixed Crown Copyright Link on Line 44

* Gh-2776: Create issue templates (#2777)

* Create issue templates

* Simplify bug report

* build(deps): bump hazelcast (#2848)

Bumps [hazelcast](https://github.com/hazelcast/hazelcast) from 5.1.1 to 5.1.3.
- [Release notes](https://github.com/hazelcast/hazelcast/releases)
- [Commits](hazelcast/hazelcast@v5.1.1...v5.1.3)

---
updated-dependencies:
- dependency-name: com.hazelcast:hazelcast
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* GH-2845: updt class var parameter to use Map interface (#2846)

Co-authored-by: t92549 <80890692+t92549@users.noreply.github.com>

* Gh-2914: Remove redundant constants class (#2927)

* #2914 Issue: Remove redundant constants class

* Simplify charset

* Fix import

* Remove erroneous use of charset with JSONSerialiser.serialise

* Use StandardCharsets inbuilt function
---------

Co-authored-by: GCHQDeveloper314 <94527357+GCHQDeveloper314@users.noreply.github.com>

* prepare release gaffer2-1.23.0

* prepare for next development iteration

* Fix field names in ToCsv

* Refactor to string enums

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: GCHQDeveloper314 <94527357+GCHQDeveloper314@users.noreply.github.com>
Co-authored-by: p3430233 <61738524+p3430233@users.noreply.github.com>
Co-authored-by: r32575 <63105662+r32575@users.noreply.github.com>
Co-authored-by: Gaffer <github-actions@github.com>
Co-authored-by: Robert <33911814+RobertG111@users.noreply.github.com>
Co-authored-by: Anirban Patra <96457415+AnirbanPatragithub@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: kvaithin <68995267+kvaithin@users.noreply.github.com>
Co-authored-by: Brijesh Yadav <brijeshyadavjthj@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Port Log4J replacement to Gaffer 1.*
5 participants