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

8273655: content-types.properties files are missing some common types #1007

Closed

Conversation

gnu-andrew
Copy link
Member

@gnu-andrew gnu-andrew commented Apr 5, 2022

Hi all,

This pull request contains a backport of commit 65ed0a74 from the openjdk/jdk repository.

The commit being backported was authored by Julia Boes on 21 Sep 2021 and was reviewed by Brian Burkhalter and Daniel Fuchs.

This is a clean update of the OpenJDK mime types which has already been backported to 17u. The risk of extending the list of recognised types is low and will enable OpenJDK to correctly identify more file types.

Thanks!


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8273655: content-types.properties files are missing some common types

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/1007/head:pull/1007
$ git checkout pull/1007

Update a local copy of the PR:
$ git checkout pull/1007
$ git pull https://git.openjdk.java.net/jdk11u-dev pull/1007/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1007

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/1007.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 6, 2022

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

@openjdk openjdk bot changed the title Backport 65ed0a742e65fe7e661e8da2adea6cd41992869e 8273655: content-types.properties files are missing some common types Apr 6, 2022
@openjdk
Copy link

openjdk bot commented Apr 6, 2022

This backport pull request has now been updated with issue from the original commit.

@openjdk
Copy link

openjdk bot commented Apr 6, 2022

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

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

8273655: content-types.properties files are missing some common types

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.

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

@openjdk openjdk bot added ready Pull request is ready to be integrated rfr Pull request is ready for review labels Apr 6, 2022
@mlbridge
Copy link

mlbridge bot commented Apr 6, 2022

Webrevs

@gnu-andrew
Copy link
Member Author

Bug now has jdk11u-fix-yes

@gnu-andrew
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Apr 6, 2022

Going to push as commit b6f59f5.
Since your change was applied there has been 1 commit pushed to the master branch:

  • b9d0a03: 8283350: (tz) Update Timezone Data to 2022a

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Apr 6, 2022
@openjdk openjdk bot closed this Apr 6, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Apr 6, 2022
@openjdk
Copy link

openjdk bot commented Apr 6, 2022

@gnu-andrew Pushed as commit b6f59f5.

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

@DamonFool
Copy link
Member

Hi @gnu-andrew ,
java/nio/file/Files/probeContentType/Basic.java fails due to record is not supported by JDK11.

@GoeLin
Copy link
Member

GoeLin commented Apr 8, 2022

Hi @gnu-andrew, our CI shows this, too.

@DamonFool
Copy link
Member

Hi @gnu-andrew, our CI shows this, too.

Hi @GoeLin , shall we problemlist the test ?

@GoeLin
Copy link
Member

GoeLin commented Apr 27, 2022

I opened JDK-8285720 [11u 13u 15u] test/jdk/java/nio/file/Files/probeContentType/Basic.java fails after backport of 8273655

@gnu-andrew
Copy link
Member Author

Why was this not picked up by pre-submit testing? Are we not running enough tests in GHA?

@mlbridge
Copy link

mlbridge bot commented Apr 28, 2022

Mailing list message from Lindenmaier, Goetz on jdk-updates-dev:

Hi,

It is a jdk tier2 test.
I guess we can not run all tests in GHA.

Best regards,
Goetz

@gnu-andrew
Copy link
Member Author

Ok, I just wondered why it was missed. The SKARA backport command makes things so easy, I guess I forgot to do due diligence.
I'll try and get a fix for this proposed today.

@gnu-andrew
Copy link
Member Author

Finally submitted #1111

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated Pull request has been integrated
3 participants