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

7512: Update lz4-java and remove the osgi bundle name override #356

Closed
wants to merge 2 commits into from

Conversation

bric3
Copy link
Collaborator

@bric3 bric3 commented Jan 13, 2022

The core library dependency decalred in maven is aligned with the one in the .target files, 1.8.0.

Also I noticed the lz4-java library has an OSGI bundle symbolic name: lz4-java, introduced in 1.3.0 : https://github.com/lz4/lz4-java/pull/39/files#diff-e3399fe1dc27b086e517883c6cab943edbfab64139839c965b14db8d11c8a99aR1-R4
However probably due to some previous bugs this required an override, done here, but this may not be necessary anymore. Hence this PR tries to use the actual osgi name.

The change is little, and hopefully won't ripple beyond.


Progress

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

Issue

  • JMC-7512: Update lz4-java and remove the osgi bundle name override

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 356

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 13, 2022

👋 Welcome back bric3! 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.

@bric3 bric3 force-pushed the bump-l4-java-core branch from db1ab07 to 77c7dda Compare January 14, 2022 15:58
@thegreystone thegreystone changed the title Bump lz4-java, removes the osgi bundle name override 7512: Update lz4-java and remove the osgi bundle name override Jan 16, 2022
@thegreystone
Copy link
Member

Will need to also update the new targets. Let's take this one after #360 and #361.

@bric3 bric3 force-pushed the bump-l4-java-core branch from 77c7dda to 56bb815 Compare January 18, 2022 10:10
@bric3 bric3 marked this pull request as ready for review January 18, 2022 10:11
@openjdk openjdk bot added the rfr label Jan 18, 2022
@mlbridge
Copy link

mlbridge bot commented Jan 18, 2022

Webrevs

@thegreystone
Copy link
Member

Hi @bric3 - got to resolve the conflicts (just accepting that the files have been deleted).

@bric3 bric3 force-pushed the bump-l4-java-core branch from 56bb815 to f813fef Compare January 25, 2022 14:14
@bric3
Copy link
Collaborator Author

bric3 commented Jan 25, 2022

@thegreystone Done

@thegreystone thegreystone self-requested a review January 25, 2022 16:29
application/org.openjdk.jmc.feature.core/feature.xml Outdated Show resolved Hide resolved
releng/platform-definitions/pom.xml Outdated Show resolved Hide resolved
releng/third-party/pom.xml Outdated Show resolved Hide resolved
@bric3 bric3 force-pushed the bump-l4-java-core branch from f813fef to 661c875 Compare January 25, 2022 23:55
@thegreystone
Copy link
Member

There is no need to force push changes. The tooling will take care of the squashing and merging automatically. It's actually easier to do the review if changes aren't force pushed.

@bric3
Copy link
Collaborator Author

bric3 commented Jan 26, 2022

Noted

@openjdk
Copy link

openjdk bot commented Jan 27, 2022

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

7512: Update lz4-java and remove the osgi bundle name override

Reviewed-by: hirt

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@thegreystone) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

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

Hi @bric3! Please type /integrate in a comment to integrate this PR.

@bric3
Copy link
Collaborator Author

bric3 commented Jan 28, 2022

/integrate

@openjdk openjdk bot added the sponsor label Jan 28, 2022
@openjdk
Copy link

openjdk bot commented Jan 28, 2022

@bric3
Your change (at version e72ce0a) is now ready to be sponsored by a Committer.

@thegreystone
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Jan 28, 2022

Going to push as commit 9ec05b3.

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

openjdk bot commented Jan 28, 2022

@thegreystone @bric3 Pushed as commit 9ec05b3.

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

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