JDK-8252870: Finalize (remove "incubator" from) jpackage #633
Conversation
Merge branch 'finalize' into JDK-8252870
|
|
@andyherrick The following labels will be automatically applied to this pull request:
When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command. |
/csr |
/reviewer almatvee, asemenyuk, prr, kcr |
@andyherrick this pull request will not be integrated until the CSR request JDK-8253722 for issue JDK-8252870 has been approved. |
@andyherrick Syntax:
|
/reviewer credit almatvee asemenyuk prr kcr |
@andyherrick Reviewer Reviewer Reviewer |
I spot checked it and left a couple comments. The rest looks good. I'll review it in more detail later this week. |
@@ -26,6 +26,6 @@ | |||
# ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ### | |||
# ########################################################## | |||
# | |||
module name jdk.incubator.jpackage | |||
header requires name\u0020;java.base\u0020;flags\u0020;8000,name\u0020;jdk.jlink\u0020;flags\u0020;0,name\u0020;java.desktop\u0020;flags\u0020;0 uses jdk/incubator/jpackage/internal/Bundler,jdk/incubator/jpackage/internal/Bundlers provides interface\u0020;java/util/spi/ToolProvider\u0020;impls\u0020;jdk/incubator/jpackage/internal/JPackageToolProvider,interface\u0020;jdk/incubator/jpackage/internal/Bundler\u0020;impls\u0020;jdk/incubator/jpackage/internal/LinuxAppBundler\u005C;u002C;jdk/incubator/jpackage/internal/LinuxDebBundler\u005C;u002C;jdk/incubator/jpackage/internal/LinuxRpmBundler,interface\u0020;jdk/incubator/jpackage/internal/Bundlers\u0020;impls\u0020;jdk/incubator/jpackage/internal/BasicBundlers target linux-amd64 resolution 9 flags 8000 | |||
module name jdk.jpackage |
kevinrushforth
Oct 13, 2020
Member
I think you need to revert this. Note this comment:
# ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ###
I think you need to revert this. Note this comment:
# ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ###
andyherrick
Oct 13, 2020
Author
reverted
reverted
@@ -37,5 +37,5 @@ platform version A base 9 files java.activation-A.sym.txt:java.base-A.sym.txt:ja | |||
platform version B base A files java.activation-B.sym.txt:java.base-B.sym.txt:java.compiler-B.sym.txt:java.corba-B.sym.txt:java.datatransfer-B.sym.txt:java.desktop-B.sym.txt:java.instrument-B.sym.txt:java.logging-B.sym.txt:java.management-B.sym.txt:java.management.rmi-B.sym.txt:java.naming-B.sym.txt:java.net.http-B.sym.txt:java.prefs-B.sym.txt:java.rmi-B.sym.txt:java.scripting-B.sym.txt:java.se-B.sym.txt:java.se.ee-B.sym.txt:java.security.jgss-B.sym.txt:java.security.sasl-B.sym.txt:java.smartcardio-B.sym.txt:java.sql-B.sym.txt:java.sql.rowset-B.sym.txt:java.transaction-B.sym.txt:java.transaction.xa-B.sym.txt:java.xml-B.sym.txt:java.xml.bind-B.sym.txt:java.xml.crypto-B.sym.txt:java.xml.ws-B.sym.txt:java.xml.ws.annotation-B.sym.txt:jdk.accessibility-B.sym.txt:jdk.attach-B.sym.txt:jdk.charsets-B.sym.txt:jdk.compiler-B.sym.txt:jdk.crypto.cryptoki-B.sym.txt:jdk.crypto.ec-B.sym.txt:jdk.dynalink-B.sym.txt:jdk.editpad-B.sym.txt:jdk.hotspot.agent-B.sym.txt:jdk.httpserver-B.sym.txt:jdk.incubator.httpclient-B.sym.txt:jdk.jartool-B.sym.txt:jdk.javadoc-B.sym.txt:jdk.jcmd-B.sym.txt:jdk.jconsole-B.sym.txt:jdk.jdeps-B.sym.txt:jdk.jdi-B.sym.txt:jdk.jdwp.agent-B.sym.txt:jdk.jfr-B.sym.txt:jdk.jlink-B.sym.txt:jdk.jshell-B.sym.txt:jdk.jsobject-B.sym.txt:jdk.jstatd-B.sym.txt:jdk.localedata-B.sym.txt:jdk.management-B.sym.txt:jdk.management.agent-B.sym.txt:jdk.management.jfr-B.sym.txt:jdk.naming.dns-B.sym.txt:jdk.naming.rmi-B.sym.txt:jdk.net-B.sym.txt:jdk.pack-B.sym.txt:jdk.rmic-B.sym.txt:jdk.scripting.nashorn-B.sym.txt:jdk.sctp-B.sym.txt:jdk.security.auth-B.sym.txt:jdk.security.jgss-B.sym.txt:jdk.unsupported-B.sym.txt:jdk.xml.dom-B.sym.txt:jdk.zipfs-B.sym.txt | |||
platform version C base B files java.base-C.sym.txt:java.compiler-C.sym.txt:java.desktop-C.sym.txt:java.naming-C.sym.txt:java.rmi-C.sym.txt:java.xml-C.sym.txt:jdk.compiler-C.sym.txt:jdk.jfr-C.sym.txt:jdk.jsobject-C.sym.txt:jdk.unsupported-C.sym.txt | |||
platform version D base C files java.base-D.sym.txt:java.compiler-D.sym.txt:java.desktop-D.sym.txt:java.management-D.sym.txt:java.management.rmi-D.sym.txt:java.net.http-D.sym.txt:java.security.jgss-D.sym.txt:java.xml-D.sym.txt:java.xml.crypto-D.sym.txt:jdk.compiler-D.sym.txt:jdk.httpserver-D.sym.txt:jdk.jartool-D.sym.txt:jdk.javadoc-D.sym.txt:jdk.jlink-D.sym.txt:jdk.jshell-D.sym.txt | |||
platform version E base D files java.base-E.sym.txt:java.compiler-E.sym.txt:java.desktop-E.sym.txt:java.xml-E.sym.txt:jdk.compiler-E.sym.txt:jdk.httpserver-E.sym.txt:jdk.incubator.foreign-E.sym.txt:jdk.incubator.jpackage-E.sym.txt:jdk.jfr-E.sym.txt:jdk.jlink-E.sym.txt:jdk.jshell-E.sym.txt:jdk.jsobject-E.sym.txt:jdk.management-E.sym.txt:jdk.net-E.sym.txt:jdk.pack-E.sym.txt | |||
platform version E base D files java.base-E.sym.txt:java.compiler-E.sym.txt:java.desktop-E.sym.txt:java.xml-E.sym.txt:jdk.compiler-E.sym.txt:jdk.httpserver-E.sym.txt:jdk.incubator.foreign-E.sym.txt:jdk.jpackage-E.sym.txt:jdk.jfr-E.sym.txt:jdk.jlink-E.sym.txt:jdk.jshell-E.sym.txt:jdk.jsobject-E.sym.txt:jdk.management-E.sym.txt:jdk.net-E.sym.txt:jdk.pack-E.sym.txt |
kevinrushforth
Oct 13, 2020
Member
Similarly, I think you need to revert this.
Similarly, I think you need to revert this.
andyherrick
Oct 13, 2020
Author
reverted
reverted
* @since 14 | ||
*/ | ||
|
||
module jdk.incubator.jpackage { | ||
module jdk.jpackage { |
kevinrushforth
Oct 13, 2020
Member
Change to @since 16
Change to @since 16
@andyherrick the "reviewer credit" command should not be used in this manner. It is intended for the case where an offline review of a PR has been done elsewhere and you wish to record that in the commit. It is not how you ask someone to do a review. |
You can't directly, so I usually just mention in a comment who I want to review it. If you use their GitHub username it will notify them (unless they have disabled all notifications). Something like this: @prrace @kevinrushforth @sashamatveev @alexeysemenyukoracle please review |
/reviewer remove almatvee asemenyuk prr kcr |
@andyherrick Reviewer Reviewer Reviewer |
- reverting two auto-generated files, and changing module-info to "@SInCE 16"
Build changes look good. |
provides jdk.jpackage.internal.Bundler with | ||
jdk.jpackage.internal.LinuxAppBundler, | ||
jdk.jpackage.internal.LinuxDebBundler, | ||
jdk.jpackage.internal.LinuxRpmBundler; |
sashamatveev
Oct 13, 2020
Member
Not sure why it was changed. Looks like git recorded file renaming incorrectly.
Not sure why it was changed. Looks like git recorded file renaming incorrectly.
kevinrushforth
Oct 13, 2020
Member
Yes, sometime GIt / Github get a bit confused about identifying rename/copy when generating a diff for a renamed file with changes. The result is correct, but the diff looks odd.
Yes, sometime GIt / Github get a bit confused about identifying rename/copy when generating a diff for a renamed file with changes. The result is correct, but the diff looks odd.
jdk.jpackage.internal.MacAppBundler, | ||
jdk.jpackage.internal.MacAppStoreBundler, | ||
jdk.jpackage.internal.MacDmgBundler, | ||
jdk.jpackage.internal.MacPkgBundler; |
sashamatveev
Oct 13, 2020
Member
Looks like another rename issue.
Looks like another rename issue.
kevinrushforth
Oct 13, 2020
Member
Yes (or more precisely another issue displaying the diffs for a renamed file with changes).
Yes (or more precisely another issue displaying the diffs for a renamed file with changes).
provides jdk.jpackage.internal.Bundler with | ||
jdk.jpackage.internal.WinAppBundler, | ||
jdk.jpackage.internal.WinExeBundler, | ||
jdk.jpackage.internal.WinMsiBundler; |
sashamatveev
Oct 13, 2020
Member
Another rename issue.
Another rename issue.
Looks good. I double-checked all of the file renames and all are exactly as expected. The diffs got a bit confused in a couple cases, where it thought that a renamed and modified file was copied from somewhere else (see inline comments), but that can happen given that git doesn't actually track renames and copies). |
provides jdk.jpackage.internal.Bundler with | ||
jdk.jpackage.internal.LinuxAppBundler, | ||
jdk.jpackage.internal.LinuxDebBundler, | ||
jdk.jpackage.internal.LinuxRpmBundler; |
kevinrushforth
Oct 13, 2020
Member
Yes, sometime GIt / Github get a bit confused about identifying rename/copy when generating a diff for a renamed file with changes. The result is correct, but the diff looks odd.
Yes, sometime GIt / Github get a bit confused about identifying rename/copy when generating a diff for a renamed file with changes. The result is correct, but the diff looks odd.
jdk.jpackage.internal.MacAppBundler, | ||
jdk.jpackage.internal.MacAppStoreBundler, | ||
jdk.jpackage.internal.MacDmgBundler, | ||
jdk.jpackage.internal.MacPkgBundler; |
kevinrushforth
Oct 13, 2020
Member
Yes (or more precisely another issue displaying the diffs for a renamed file with changes).
Yes (or more precisely another issue displaying the diffs for a renamed file with changes).
not related to this change directly, but even in 14 there was no MacAppStoreBundler - actually there is, but it should be removed, it's isSupported() method always returns false. |
Amazing how many places the word incubator appeared. |
@andyherrick This change now passes all automated pre-integration checks. After integration, the commit message for the final commit will be:
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
Please see this link for an up-to-date comparison between the source branch of this pull request and the
|
Build changes look good. |
/integrate |
@andyherrick Since your change was applied there have been 2 commits pushed to the
Your commit was automatically rebased without conflicts. Pushed as commit 26e7ef7. |
Reviewed-by: kcr, erikj, almatvee, asemenyuk, prr, ihse
JDK-8252870: Finalize (remove "incubator" from) jpackage
Progress
Testing
Issue
Reviewers
Download
$ git fetch https://git.openjdk.java.net/jdk pull/633/head:pull/633
$ git checkout pull/633