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

7507: Fixing project setup #355

Closed
wants to merge 4 commits into from

Conversation

thegreystone
Copy link
Member

@thegreystone thegreystone commented Jan 13, 2022

...and some cleanup.


Progress

  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jmc pull/355/head:pull/355
$ git checkout pull/355

Update a local copy of the PR:
$ git checkout pull/355
$ git pull https://git.openjdk.java.net/jmc pull/355/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 355

View PR using the GUI difftool:
$ git pr show -t 355

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jmc/pull/355.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 13, 2022

👋 Welcome back hirt! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@thegreystone thegreystone requested a review from aptmac January 13, 2022 14:49
@thegreystone thegreystone changed the title 7505: Fixing project setup 7507: Fixing project setup Jan 13, 2022
@thegreystone thegreystone marked this pull request as ready for review January 13, 2022 15:25
@openjdk openjdk bot added the rfr label Jan 13, 2022
@thegreystone thegreystone requested a review from Gunde January 13, 2022 15:27
@mlbridge
Copy link

mlbridge bot commented Jan 13, 2022

Webrevs

org.apache.aries.spifly.dynamic.bundle,
org.openjdk.jmc.common,
org.openjdk.jmc.flightrecorder;visibility:=reexport,
org.openjdk.jmc.ui;visibility:=reexport,
org.openjdk.jmc.flightrecorder.serializers,
org.openjdk.jmc.ui.celleditors,
Copy link
Member

Choose a reason for hiding this comment

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

Duplicate entry

@@ -88,6 +88,16 @@
<artifactId>flightrecorder.rules.jdk</artifactId>
<version>${jmc.version}</version>
</dependency>
<dependency>
<groupId>org.openjdk.jmc</groupId>
<artifactId>flightrecorder.serializers</artifactId>
Copy link
Member

Choose a reason for hiding this comment

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

Is there anything in the uitests that use serializers and writer?

Copy link
Member Author

Choose a reason for hiding this comment

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

Writer, probably not right now, but doesn't hurt. I think the serializers are used by the Websocket stuff, so added them for good measure. Was trying to figure out why it's not possible to sometimes run the UI-tests after having run the RCP app from within Eclipse. I think the conclusion was that this doesn't matter, but having all of core available shouldn't hurt.

@bric3
Copy link
Collaborator

bric3 commented Jan 14, 2022

On clean git repository (after a the nuclear git clean -fdx), I noticed the org.openjdk.jmc.flightrecorder.writer.test project has compile errors, unless I do a right click on the project then Maven | Update Project.... Which result in this modification.

Other project's .classpath file seem to have this classpathentry element.

diff --git i/core/tests/org.openjdk.jmc.flightrecorder.writer.test/.classpath w/core/tests/org.openjdk.jmc.flightrecorder.writer.test/.classpath
index b5527438..5de0999d 100644
--- i/core/tests/org.openjdk.jmc.flightrecorder.writer.test/.classpath
+++ w/core/tests/org.openjdk.jmc.flightrecorder.writer.test/.classpath
@@ -37,4 +37,5 @@
                        <attribute name="maven.pomderived" value="true"/>
                </attributes>
        </classpathentry>
+  <classpathentry kind="output" path="target/classes"/>
 </classpath>

@thegreystone
Copy link
Member Author

You'd think it shouldn't be needed given that there is only test classes, but adding.

@openjdk
Copy link

openjdk bot commented Jan 14, 2022

@thegreystone This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

7507: Fixing project setup

Reviewed-by: aptmac

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 2 new commits pushed to the master branch:

  • 132d281: 7492: Update org.owasp.encoder to version 1.2.3
  • 70aa834: 7505: Cannot reset websocket server port to default

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready label Jan 14, 2022
@thegreystone
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Jan 14, 2022

Going to push as commit 8ade37d.
Since your change was applied there have been 2 commits pushed to the master branch:

  • 132d281: 7492: Update org.owasp.encoder to version 1.2.3
  • 70aa834: 7505: Cannot reset websocket server port to default

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated label Jan 14, 2022
@openjdk openjdk bot closed this Jan 14, 2022
@openjdk
Copy link

openjdk bot commented Jan 14, 2022

@thegreystone Pushed as commit 8ade37d.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@thegreystone thegreystone deleted the 7507-fixing-project branch October 16, 2022 22:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

3 participants