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

Cleanup of main branch #4747

Merged
merged 3 commits into from
Jul 24, 2024
Merged

Cleanup of main branch #4747

merged 3 commits into from
Jul 24, 2024

Conversation

ctubbsii
Copy link
Member

  • Remove log4j-1.2-api dependency except as a bridge in the binary assembly (left a note in the assemble/pom.xml)
  • Move log4j dependencies in core back to test scope. These were moved to the provided scope in Clean up the 2.1 build a bit #4743 to work around an issue because log4j-1.2-api was still used in the core module in 2.1; now that the legacy log4j stuff was removed from core in 3.1 and later, we can move these back to the test scope where they belong as Log message when Tablet has been unloading for over 15 minutes #4558 intended
  • Specify the exact version for deprecation "since" parameters (3.1.0, instead of 3.1)
  • Drop the unused and deprecated tserver.workq.threads property
  • Remove a few unused imports and variables, and drop the legacy MeterRegistryFactory that was deprecated in 2.1.3
  • Suppress some deprecation warnings and use var in a few places for readability
  • Delete unused test code in CompactionIT

* Remove log4j-1.2-api dependency except as a bridge in the binary
  assembly (left a note in the assemble/pom.xml)
* Move log4j dependencies in core back to test scope. These were moved
  to the provided scope in apache#4743 to work around an issue because
  log4j-1.2-api was still used in the core module in 2.1; now that the
  legacy log4j stuff was removed from core in 3.1 and later, we can move
  these back to the test scope where they belong as apache#4558 intended
* Specify the exact version for deprecation "since" parameters (3.1.0,
  instead of 3.1)
* Drop the unused and deprecated `tserver.workq.threads` property
* Remove a few unused imports and variables, and drop the legacy
  MeterRegistryFactory that was deprecated in 2.1.3
* Suppress some deprecation warnings and use var in a few places for
  readability
* Delete unused test code in CompactionIT
@ctubbsii ctubbsii added this to the 3.1.0 milestone Jul 22, 2024
@ctubbsii ctubbsii self-assigned this Jul 22, 2024
import org.apache.hadoop.io.Text;
import org.junit.jupiter.api.Test;

public class ColumnVisibilityTest {

@SuppressWarnings("deprecation")
Copy link
Contributor

Choose a reason for hiding this comment

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

Seeing these changes made me realize that maybe we could start removing some of the stuff that was deprecated re ColumnVisibility in 4.0.0.

Add legacy log4j API back as test dependency for hadoop minicluster,
which fixes HadoopCredentialProviderTest
@ctubbsii
Copy link
Member Author

It looks like we still need log4j-1.2-api on the classpath for hadoop minicluster's runtime. So, I'll have to re-add that back in for any tests or mini accumulo that use it before this can be merged.

Re-add log4j-1.2-api dependency in the proper scopes, as a required
runtime dependency of hadoop-client-minicluster
@ctubbsii
Copy link
Member Author

It looks like I fixed all the issues with the dependencies, so I'll merge this now.

@ctubbsii ctubbsii merged commit d54b4e5 into apache:main Jul 24, 2024
8 checks passed
@ctubbsii ctubbsii deleted the more-cleanup-main branch July 24, 2024 03:57
@ctubbsii ctubbsii linked an issue Jul 26, 2024 that may be closed by this pull request
ctubbsii pushed a commit to apache/accumulo-testing that referenced this pull request Aug 7, 2024
Remove the property usage because it was removed in apache/accumulo#4747

This fixes #280
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.

Remove TSERV_WORKQ_THREADS before 3.1 release?
2 participants