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

7378: Update platform to 2021-06 #301

Closed

Conversation

thegreystone
Copy link
Member

@thegreystone thegreystone commented Aug 9, 2021

...and removing old ones.


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/301/head:pull/301
$ git checkout pull/301

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 301

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 9, 2021

👋 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
Copy link
Member Author

We could revert this change with module export added in its respective pom.xml (commented above).

I think it's fine. We don't support Java 1.4 anymore. :)

@thegreystone
Copy link
Member Author

@guruhb - do you happen to know if there is a way to suppress all the new Tycho warnings?

@thegreystone
Copy link
Member Author

(Maven Artifact blablabla is not a bundle and will be ignored, automatic wrapping of such artifacts can be enabled with wrapAsBundle in target platform configuration)

@thegreystone thegreystone marked this pull request as ready for review September 6, 2021 12:57
@thegreystone thegreystone requested a review from guruhb September 6, 2021 12:57
@openjdk openjdk bot added the rfr label Sep 6, 2021
@mlbridge
Copy link

mlbridge bot commented Sep 6, 2021

Webrevs

@guruhb
Copy link
Contributor

guruhb commented Sep 6, 2021

(Maven Artifact blablabla is not a bundle and will be ignored, automatic wrapping of such artifacts can be enabled with wrapAsBundle in target platform configuration)

This looks very interesting to solve and tycho is now capable of converting non OSGi Bundle to OSGi for maven dependency if we add <pomDependencies>wrapAsBundle</pomDependencies> . Note : https://wiki.eclipse.org/Tycho/Target_Platform#.22POM_dependencies_consider.22

but there is a catch .. If we use non OSGi dependency the "Bundle Symbolic name generated by tycho 2.x will be "groupid.artifactId" where as the p2-maven-plugin (currently used for converting non OSGi to OSGi and hosting as a local p2 server convert Bundle Symbolic name to "groupId" (Note the missing artifactId

There are two solution i could think off and None of them are good at this point of time

Solution 1 : Unify Core with application and remove p2-maven-plugin (+ remove releng /third-party)
Solution 2 : Append Symbolic name with artifactId generated by p2-maven-plugin to match with the expected tycho compiler plugin (Not tested , but this might work) .

Copy link
Contributor

@guruhb guruhb left a comment

Choose a reason for hiding this comment

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

looks good to me

@openjdk
Copy link

openjdk bot commented Sep 6, 2021

@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:

7378: Update platform to 2021-06

Reviewed-by: ghb

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:

  • 0e794a9: 7386: Remove reference to Fedora in the readme
  • 511071d: 7377: Update master to 8.2

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 Sep 6, 2021
@thegreystone
Copy link
Member Author

For me, the UI-tests will not start with this PR (on Windows).

@thegreystone
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Sep 9, 2021

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

  • 341f3d5: 7338: Add parser support for frame types generated by async-profiler
  • 2844db9: 7393: Add vanilla Java JSON serializer for IItemCollections
  • ff29931: 7332: Show stacktraces for constant values from stacktrace pool
  • 0e794a9: 7386: Remove reference to Fedora in the readme
  • 511071d: 7377: Update master to 8.2

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Sep 9, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Sep 9, 2021
@openjdk
Copy link

openjdk bot commented Sep 9, 2021

@thegreystone Pushed as commit d05f377.

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

@thegreystone
Copy link
Member Author

thegreystone commented Sep 9, 2021

So. After not being able to figure out what is wrong, I nuked my local repo, my .m2 cache etc. And, yep, the UI tests work now. :'(

@thegreystone thegreystone deleted the 7378-platform-2021-06 branch September 9, 2021 19:34
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.

2 participants