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

SOLR-16540 Fix errors importing main and branch_9x into eclipse #1357

Merged
merged 2 commits into from Mar 1, 2023

Conversation

stillalex
Copy link
Member

@stillalex stillalex commented Feb 14, 2023

https://issues.apache.org/jira/browse/SOLR-16540

Description

Updates needed for a clean Eclipse project import.
Updated a few git/build settings to ignore eclipse generated files.
Removed 2 unnecessary package-info files.
Renamed one test that was clashing.

Solution

Please provide a short description of the approach taken to implement your solution.

Tests

Please describe the tests you've developed or run to confirm this patch implements the feature or solves the problem.

Checklist

Please review the following and check all that apply:

  • I have reviewed the guidelines for How to Contribute and my code conforms to the standards described there to the best of my ability.
  • I have created a Jira issue and added the issue ID to my pull request title.
  • I have given Solr maintainers access to contribute to my PR branch. (optional but recommended)
  • I have developed this patch against the main branch.
  • I have run ./gradlew check.
  • I have added tests for my changes.
  • I have added documentation for the Reference Guide

Copy link
Contributor

@gerlowskija gerlowskija left a comment

Choose a reason for hiding this comment

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

A few preliminary questions/comments.

Also, I assume these are all fixes you needed after running the ./gradlew eclipse command?

solr/CHANGES.txt Outdated
@@ -34,6 +34,8 @@ Other Changes
Previously, the modules would come transitively.
(David Smiley)

* SOLR-16540: Fix errors importing main and branch_9x into eclipse (Alex Deparvu)
Copy link
Contributor

Choose a reason for hiding this comment

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

I think we usually reserve CHANGES.txt for things a user might care about on upgrading. Internal refactors, doc changes, or dev-experience improvements don't usually get mentioned I don't think.

Copy link
Member Author

Choose a reason for hiding this comment

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

I put it under 'Other Changes', but sure I can remove it

Copy link
Member Author

Choose a reason for hiding this comment

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

removed

@@ -1,19 +0,0 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
Copy link
Contributor

Choose a reason for hiding this comment

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

[Q] What do these package-info files have to do with importing into Eclipse? Do they cause problems in some way?

Copy link
Member Author

Choose a reason for hiding this comment

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

they have a name clash with existing files under the same package in 'source' folders. all of them are under 'test' folders, I think the current situation could be a mistake.

Copy link
Member Author

Choose a reason for hiding this comment

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

@stillalex
Copy link
Member Author

Also, I assume these are all fixes you needed after running the ./gradlew eclipse command?

yes. and during the check command

@stillalex
Copy link
Member Author

@gerlowskija gentle ping. any open questions I need to address?

@gerlowskija
Copy link
Contributor

Nope, thanks for clarifying! I'm going to test it out locally today and plan to merge pending any surprises.

@gerlowskija gerlowskija merged commit 5188ae0 into apache:main Mar 1, 2023
gerlowskija pushed a commit that referenced this pull request Mar 1, 2023
@stillalex
Copy link
Member Author

thank you @gerlowskija!

@stillalex stillalex deleted the SOLR-16540 branch March 1, 2023 16:57
@stillalex
Copy link
Member Author

@gerlowskija do you want to mark SOLR-16540 as resolved too?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants