diff --git a/WORKSPACE b/WORKSPACE index d68457ac913bec..945bf2760e4bcc 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -387,14 +387,6 @@ dist_http_archive( name = "build_bazel_rules_nodejs", ) -http_archive( - name = "java_tools_langtools_javac11", - sha256 = "cf0814fa002ef3d794582bb086516d8c9ed0958f83f19799cdb08949019fe4c7", - urls = [ - "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk11_v2.zip", - ], -) - dist_http_archive( name = "platforms", ) @@ -666,4 +658,3 @@ debian_deps() load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace") bazel_skylib_workspace() - diff --git a/scripts/packages/debian/copyright b/scripts/packages/debian/copyright index 25981ab8c9be25..7f6ab842ae118e 100644 --- a/scripts/packages/debian/copyright +++ b/scripts/packages/debian/copyright @@ -25,7 +25,6 @@ License: Eclipse Distribution License 1.0 License: Eclipse Public License License: Eclipse Public License Version 1.0 License: GNU GPL v2 with Classpath exception -License: GNU GPL v2 with Classpath exception (plus other licenses, see third_party/java/jdk/langtools/LICENSE file). License: GNU GPL v2 with Classpath exception, portions MIT License: MIT License: MIT license diff --git a/src/BUILD b/src/BUILD index 18df981315f2ff..764ea1b679ff06 100644 --- a/src/BUILD +++ b/src/BUILD @@ -528,7 +528,6 @@ genrule( "//third_party/ijar:transitive_sources", "//third_party/java/jacoco:transitive_sources", "//third_party/java/proguard:srcs", - "@java_tools_langtools_javac11//:srcs", ], outs = ["java_tools_dist.zip"], cmd = "zip -qXr $@ $$(echo $(SRCS) | sort)", @@ -548,9 +547,7 @@ JAVA_TOOLS_DEPLOY_JARS = [ release_archive( name = "jars_java_tools_zip", - srcs = JAVA_TOOLS_DEPLOY_JARS + [ - "@java_tools_langtools_javac11//:javac_jar", - ], + srcs = JAVA_TOOLS_DEPLOY_JARS, package_dir = "java_tools", visibility = ["//visibility:private"], ) diff --git a/src/create_embedded_tools.py b/src/create_embedded_tools.py index 785e14b80a556d..9574e6e781031e 100644 --- a/src/create_embedded_tools.py +++ b/src/create_embedded_tools.py @@ -37,7 +37,6 @@ ('*tools/cpp/BUILD.tools', lambda x: 'tools/cpp/BUILD'), ('*tools/cpp/runfiles/generated_*', lambda x: 'tools/cpp/runfiles/' + os.path.basename(x)[len('generated_'):]), - ('*BUILD.java_langtools', lambda x: 'third_party/java/jdk/langtools/BUILD'), ('*launcher.exe', lambda x: 'tools/launcher/launcher.exe'), ('*def_parser.exe', lambda x: 'tools/def_parser/def_parser.exe'), ('*zipper.exe', lambda x: 'tools/zip/zipper/zipper.exe'), diff --git a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java index 6b5d0d57517c62..c8aaf643edb035 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java @@ -184,7 +184,6 @@ public void setupMockClient(MockToolsConfig config, List workspaceConten "java_toolchain_alias(name = 'current_java_toolchain')", "java_runtime_alias(name = 'current_java_runtime')", "java_host_runtime_alias(name = 'current_host_java_runtime')", - "filegroup(name='langtools', srcs=['jdk/lib/tools.jar'])", "filegroup(name='bootclasspath', srcs=['jdk/jre/lib/rt.jar'])", "filegroup(name='extdir', srcs=glob(['jdk/jre/lib/ext/*']))", "filegroup(name='java', srcs = ['jdk/jre/bin/java'])", diff --git a/src/test/java/com/google/devtools/build/lib/blackbox/bazel/BUILD b/src/test/java/com/google/devtools/build/lib/blackbox/bazel/BUILD index 35f6cd4fc5557e..dcd794cc8d5167 100644 --- a/src/test/java/com/google/devtools/build/lib/blackbox/bazel/BUILD +++ b/src/test/java/com/google/devtools/build/lib/blackbox/bazel/BUILD @@ -78,11 +78,9 @@ java_library( "JavaToolsSetup.java", ], data = [ - ":langtools-copy", "//src/java_tools/junitrunner/java/com/google/testing/junit/runner:Runner_deploy.jar", "//src/tools/singlejar", "//third_party/ijar", - "//third_party/java/jdk/langtools:test-srcs", "@bazel_tools//tools/jdk:current_java_runtime", ], visibility = [":tests"], @@ -92,15 +90,6 @@ java_library( ], ) -# needed by java tools -genrule( - name = "langtools-copy", - testonly = 1, - srcs = ["//third_party/java/jdk/langtools:javac_jar"], - outs = ["langtools.jar"], - cmd = "cp $< $@", -) - java_library( name = "cxx", testonly = 1, diff --git a/src/test/java/com/google/devtools/build/lib/blackbox/bazel/JavaToolsSetup.java b/src/test/java/com/google/devtools/build/lib/blackbox/bazel/JavaToolsSetup.java index d5e923deb00a8f..db7b9340609c5f 100644 --- a/src/test/java/com/google/devtools/build/lib/blackbox/bazel/JavaToolsSetup.java +++ b/src/test/java/com/google/devtools/build/lib/blackbox/bazel/JavaToolsSetup.java @@ -40,16 +40,5 @@ public void setup(BlackBoxTestContext context) throws IOException { Files.copy(buildFiles.get(0), buildFile); assertThat(buildFile.toFile().setWritable(true)).isTrue(); } - - String packageSubpath = JavaToolsSetup.class.getPackage().getName().replace('.', '/'); - Path langToolsJar = - RunfilesUtil.find(String.format("io_bazel/src/test/java/%s/langtools.jar", packageSubpath)); - Files.copy(langToolsJar, jdkDirectory.resolve("langtools.jar")); - PathUtils.writeBuild( - jdkDirectory, "filegroup(name = \"test-langtools\", srcs = [\"langtools.jar\"])"); - - PathUtils.copyTree( - RunfilesUtil.find("io_bazel/third_party/java/jdk/langtools/BUILD").getParent(), - context.getWorkDir().resolve("third_party/java/jdk/langtools")); } } diff --git a/src/test/shell/bazel/BUILD b/src/test/shell/bazel/BUILD index 5c19f21fde6b18..a72684d6430307 100644 --- a/src/test/shell/bazel/BUILD +++ b/src/test/shell/bazel/BUILD @@ -14,14 +14,6 @@ filegroup( visibility = ["//src/test/shell:__pkg__"], ) -genrule( - name = "langtools-copy", - testonly = 1, - srcs = ["//third_party/java/jdk/langtools:javac_jar"], - outs = ["langtools.jar"], - cmd = "cp $< $@", -) - gen_workspace_stanza( name = "rules_proto_stanza", out = "rules_proto_stanza.txt", @@ -51,7 +43,6 @@ filegroup( "cc_api_rules.bzl", "remote_helpers.sh", "testing_server.py", - ":langtools-copy", "//examples:srcs", "//src/conditions:srcs", "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/genclass:GenClass_deploy.jar", @@ -64,7 +55,6 @@ filegroup( "//src/tools/singlejar", "//third_party:srcs", "//third_party/ijar", - "//third_party/java/jdk/langtools:test-srcs", "//tools:srcs", "@bazel_skylib//:test_deps", "@bazel_tools//tools/jdk:current_java_runtime", diff --git a/src/test/shell/testenv.sh.tmpl b/src/test/shell/testenv.sh.tmpl index c78bec45b8937b..78b971908f0d78 100755 --- a/src/test/shell/testenv.sh.tmpl +++ b/src/test/shell/testenv.sh.tmpl @@ -94,11 +94,9 @@ if [[ $PLATFORM =~ msys ]]; then else jdk_dir="${TEST_SRCDIR}/local_jdk" fi -langtools="$(rlocation io_bazel/src/test/shell/bazel/langtools.jar)" # Tools directory location tools_dir="$(dirname $(rlocation io_bazel/tools/BUILD))" -langtools_dir="$(dirname $(rlocation io_bazel/third_party/java/jdk/langtools/BUILD))" # Platforms default_host_platform="@local_config_platform//:host" @@ -135,14 +133,6 @@ function copy_tools_directory() { if [ -f tools/build_defs/repo/BUILD.repo ]; then cp tools/build_defs/repo/BUILD.repo tools/build_defs/repo/BUILD fi - # To support custom langtools - cp ${langtools} tools/jdk/langtools.jar - cat >>tools/jdk/BUILD <<'EOF' -filegroup(name = "test-langtools", srcs = ["langtools.jar"]) -EOF - - mkdir -p third_party/java/jdk/langtools - cp -R ${langtools_dir}/* third_party/java/jdk/langtools chmod -R +w . } @@ -606,13 +596,9 @@ function create_new_workspace() { workspaces+=(${new_workspace_dir}) cd ${new_workspace_dir} mkdir tools - mkdir -p third_party/java/jdk/langtools copy_tools_directory - [ -e third_party/java/jdk/langtools/javac-9+181-r4173-1.jar ] \ - || ln -s "${langtools_path}" third_party/java/jdk/langtools/javac-9+181-r4173-1.jar - write_workspace_file "WORKSPACE" "$WORKSPACE_NAME" maybe_setup_python_windows_tools diff --git a/third_party/BUILD b/third_party/BUILD index 2f390b8fd8dcab..a0b6cf7497d65e 100644 --- a/third_party/BUILD +++ b/third_party/BUILD @@ -26,7 +26,6 @@ filegroup( "//third_party/java/jacoco:srcs", "//third_party/java/javapoet:srcs", "//third_party/java/jcommander:srcs", - "//third_party/java/jdk/langtools:srcs", "//third_party/java/proguard:srcs", "//third_party/javascript/bootstrap:srcs", "//third_party/jaxb:srcs", @@ -500,7 +499,7 @@ distrib_jar_filegroup( distrib_jar_filegroup( name = "guava-failureaccess-jar", srcs = [ - "guava/failureaccess-1.0.1.jar", + "guava/failureaccess-1.0.1.jar", ], enable_distributions = ["debian"], ) @@ -633,8 +632,8 @@ distrib_java_import( name = "netty_tcnative", enable_distributions = ["debian"], jars = [ - "netty_tcnative/netty-tcnative-classes-2.0.51.Final.jar", - ":netty_tcnative/netty-tcnative-filtered.jar", + "netty_tcnative/netty-tcnative-classes-2.0.51.Final.jar", + ":netty_tcnative/netty-tcnative-filtered.jar", ], ) diff --git a/third_party/ijar/test/BUILD b/third_party/ijar/test/BUILD index bed1af6dfccdad..95bf0722d7f2f1 100644 --- a/third_party/ijar/test/BUILD +++ b/third_party/ijar/test/BUILD @@ -14,7 +14,6 @@ sh_test( "$(JAVABASE)/bin/jar", "$(JAVABASE)/bin/javap", "$(location //third_party/ijar)", - "$(location //third_party/java/jdk/langtools:javac_jar)", # We assume unzip and zip to be on the path "unzip", "zip", @@ -48,7 +47,6 @@ sh_test( # wrong. "libwrongcentraldir.jar", "@bazel_tools//tools/jdk:current_java_runtime", - "//third_party/java/jdk/langtools:javac_jar", ], shard_count = 5, tags = ["zip"], diff --git a/third_party/ijar/test/ijar_test.sh b/third_party/ijar/test/ijar_test.sh index e916046bca5eee..905d0382642441 100755 --- a/third_party/ijar/test/ijar_test.sh +++ b/third_party/ijar/test/ijar_test.sh @@ -28,8 +28,6 @@ JAVAP=$1 shift IJAR=$1 shift -LANGTOOLS8=$1 -shift UNZIP=$1 shift ZIP=$1 diff --git a/third_party/java/jdk/README.md b/third_party/java/jdk/README.md deleted file mode 100644 index cfed43fd75ecac..00000000000000 --- a/third_party/java/jdk/README.md +++ /dev/null @@ -1,10 +0,0 @@ -# Java compilers in Bazel - -Bazel compiles Java code using a custom builder. This builder is called -JavaBuilder and its code lies in //src/java_tools/buildjar. To build Java -code, JavaBuilder use the Java compiler from the JDK. To support -[ErrorProne](http://errorprone.info) checks, we vendor a custom build -of the Java compiler code. This is the raw version of the Java compiler -from [OpenJDK](https://openjdk.java.net) but compiled for a lower -version of the JRE. Those builds are vendored in -//third_party/java/jdk/langtools. diff --git a/third_party/java/jdk/langtools/BUILD b/third_party/java/jdk/langtools/BUILD deleted file mode 100644 index 6073b3758291ab..00000000000000 --- a/third_party/java/jdk/langtools/BUILD +++ /dev/null @@ -1,54 +0,0 @@ -load("@rules_java//java:defs.bzl", "java_import") - -package(default_visibility = ["//visibility:public"]) - -licenses(["restricted"]) # GNU GPL v2 with Classpath exception - -filegroup( - name = "srcs", - srcs = glob(["**"]), -) - -filegroup( - name = "test-srcs", - srcs = [ - "BUILD", - "LICENSE", - "java_compiler.jar", - "java_compiler-src.jar", - "javac-9+181-r4173-1.jar", - "javac-9+181-r4173-1.srcjar", - "jdk_compiler.jar", - "jdk_compiler-src.jar", - ], -) - -filegroup( - name = "license-and-srcs", - srcs = [ - "LICENSE", - "java_compiler-src.jar", - "javac-9+181-r4173-1.srcjar", - "jdk_compiler-src.jar", - ], -) - -java_import( - name = "javac", - jars = ["javac-9+181-r4173-1.jar"], -) - -filegroup( - name = "javac_jar", - srcs = ["javac-9+181-r4173-1.jar"], -) - -filegroup( - name = "jdk_compiler_jar", - srcs = ["jdk_compiler.jar"], -) - -filegroup( - name = "java_compiler_jar", - srcs = ["java_compiler.jar"], -) diff --git a/third_party/java/jdk/langtools/LICENSE b/third_party/java/jdk/langtools/LICENSE deleted file mode 100644 index 8b400c7ab81b7b..00000000000000 --- a/third_party/java/jdk/langtools/LICENSE +++ /dev/null @@ -1,347 +0,0 @@ -The GNU General Public License (GPL) - -Version 2, June 1991 - -Copyright (C) 1989, 1991 Free Software Foundation, Inc. -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Everyone is permitted to copy and distribute verbatim copies of this license -document, but changing it is not allowed. - -Preamble - -The licenses for most software are designed to take away your freedom to share -and change it. By contrast, the GNU General Public License is intended to -guarantee your freedom to share and change free software--to make sure the -software is free for all its users. This General Public License applies to -most of the Free Software Foundation's software and to any other program whose -authors commit to using it. (Some other Free Software Foundation software is -covered by the GNU Library General Public License instead.) You can apply it to -your programs, too. - -When we speak of free software, we are referring to freedom, not price. Our -General Public Licenses are designed to make sure that you have the freedom to -distribute copies of free software (and charge for this service if you wish), -that you receive source code or can get it if you want it, that you can change -the software or use pieces of it in new free programs; and that you know you -can do these things. - -To protect your rights, we need to make restrictions that forbid anyone to deny -you these rights or to ask you to surrender the rights. These restrictions -translate to certain responsibilities for you if you distribute copies of the -software, or if you modify it. - -For example, if you distribute copies of such a program, whether gratis or for -a fee, you must give the recipients all the rights that you have. You must -make sure that they, too, receive or can get the source code. And you must -show them these terms so they know their rights. - -We protect your rights with two steps: (1) copyright the software, and (2) -offer you this license which gives you legal permission to copy, distribute -and/or modify the software. - -Also, for each author's protection and ours, we want to make certain that -everyone understands that there is no warranty for this free software. If the -software is modified by someone else and passed on, we want its recipients to -know that what they have is not the original, so that any problems introduced -by others will not reflect on the original authors' reputations. - -Finally, any free program is threatened constantly by software patents. We -wish to avoid the danger that redistributors of a free program will -individually obtain patent licenses, in effect making the program proprietary. -To prevent this, we have made it clear that any patent must be licensed for -everyone's free use or not licensed at all. - -The precise terms and conditions for copying, distribution and modification -follow. - -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - -0. This License applies to any program or other work which contains a notice -placed by the copyright holder saying it may be distributed under the terms of -this General Public License. The "Program", below, refers to any such program -or work, and a "work based on the Program" means either the Program or any -derivative work under copyright law: that is to say, a work containing the -Program or a portion of it, either verbatim or with modifications and/or -translated into another language. (Hereinafter, translation is included -without limitation in the term "modification".) Each licensee is addressed as -"you". - -Activities other than copying, distribution and modification are not covered by -this License; they are outside its scope. The act of running the Program is -not restricted, and the output from the Program is covered only if its contents -constitute a work based on the Program (independent of having been made by -running the Program). Whether that is true depends on what the Program does. - -1. You may copy and distribute verbatim copies of the Program's source code as -you receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice and -disclaimer of warranty; keep intact all the notices that refer to this License -and to the absence of any warranty; and give any other recipients of the -Program a copy of this License along with the Program. - -You may charge a fee for the physical act of transferring a copy, and you may -at your option offer warranty protection in exchange for a fee. - -2. You may modify your copy or copies of the Program or any portion of it, thus -forming a work based on the Program, and copy and distribute such modifications -or work under the terms of Section 1 above, provided that you also meet all of -these conditions: - - a) You must cause the modified files to carry prominent notices stating - that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in whole or - in part contains or is derived from the Program or any part thereof, to be - licensed as a whole at no charge to all third parties under the terms of - this License. - - c) If the modified program normally reads commands interactively when run, - you must cause it, when started running for such interactive use in the - most ordinary way, to print or display an announcement including an - appropriate copyright notice and a notice that there is no warranty (or - else, saying that you provide a warranty) and that users may redistribute - the program under these conditions, and telling the user how to view a copy - of this License. (Exception: if the Program itself is interactive but does - not normally print such an announcement, your work based on the Program is - not required to print an announcement.) - -These requirements apply to the modified work as a whole. If identifiable -sections of that work are not derived from the Program, and can be reasonably -considered independent and separate works in themselves, then this License, and -its terms, do not apply to those sections when you distribute them as separate -works. But when you distribute the same sections as part of a whole which is a -work based on the Program, the distribution of the whole must be on the terms -of this License, whose permissions for other licensees extend to the entire -whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest your -rights to work written entirely by you; rather, the intent is to exercise the -right to control the distribution of derivative or collective works based on -the Program. - -In addition, mere aggregation of another work not based on the Program with the -Program (or with a work based on the Program) on a volume of a storage or -distribution medium does not bring the other work under the scope of this -License. - -3. You may copy and distribute the Program (or a work based on it, under -Section 2) in object code or executable form under the terms of Sections 1 and -2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable source - code, which must be distributed under the terms of Sections 1 and 2 above - on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three years, to - give any third party, for a charge no more than your cost of physically - performing source distribution, a complete machine-readable copy of the - corresponding source code, to be distributed under the terms of Sections 1 - and 2 above on a medium customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer to - distribute corresponding source code. (This alternative is allowed only - for noncommercial distribution and only if you received the program in - object code or executable form with such an offer, in accord with - Subsection b above.) - -The source code for a work means the preferred form of the work for making -modifications to it. For an executable work, complete source code means all -the source code for all modules it contains, plus any associated interface -definition files, plus the scripts used to control compilation and installation -of the executable. However, as a special exception, the source code -distributed need not include anything that is normally distributed (in either -source or binary form) with the major components (compiler, kernel, and so on) -of the operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the source -code from the same place counts as distribution of the source code, even though -third parties are not compelled to copy the source along with the object code. - -4. You may not copy, modify, sublicense, or distribute the Program except as -expressly provided under this License. Any attempt otherwise to copy, modify, -sublicense or distribute the Program is void, and will automatically terminate -your rights under this License. However, parties who have received copies, or -rights, from you under this License will not have their licenses terminated so -long as such parties remain in full compliance. - -5. You are not required to accept this License, since you have not signed it. -However, nothing else grants you permission to modify or distribute the Program -or its derivative works. These actions are prohibited by law if you do not -accept this License. Therefore, by modifying or distributing the Program (or -any work based on the Program), you indicate your acceptance of this License to -do so, and all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - -6. Each time you redistribute the Program (or any work based on the Program), -the recipient automatically receives a license from the original licensor to -copy, distribute or modify the Program subject to these terms and conditions. -You may not impose any further restrictions on the recipients' exercise of the -rights granted herein. You are not responsible for enforcing compliance by -third parties to this License. - -7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), conditions -are imposed on you (whether by court order, agreement or otherwise) that -contradict the conditions of this License, they do not excuse you from the -conditions of this License. If you cannot distribute so as to satisfy -simultaneously your obligations under this License and any other pertinent -obligations, then as a consequence you may not distribute the Program at all. -For example, if a patent license would not permit royalty-free redistribution -of the Program by all those who receive copies directly or indirectly through -you, then the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply and -the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any patents or -other property right claims or to contest validity of any such claims; this -section has the sole purpose of protecting the integrity of the free software -distribution system, which is implemented by public license practices. Many -people have made generous contributions to the wide range of software -distributed through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing to -distribute software through any other system and a licensee cannot impose that -choice. - -This section is intended to make thoroughly clear what is believed to be a -consequence of the rest of this License. - -8. If the distribution and/or use of the Program is restricted in certain -countries either by patents or by copyrighted interfaces, the original -copyright holder who places the Program under this License may add an explicit -geographical distribution limitation excluding those countries, so that -distribution is permitted only in or among countries not thus excluded. In -such case, this License incorporates the limitation as if written in the body -of this License. - -9. The Free Software Foundation may publish revised and/or new versions of the -General Public License from time to time. Such new versions will be similar in -spirit to the present version, but may differ in detail to address new problems -or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any later -version", you have the option of following the terms and conditions either of -that version or of any later version published by the Free Software Foundation. -If the Program does not specify a version number of this License, you may -choose any version ever published by the Free Software Foundation. - -10. If you wish to incorporate parts of the Program into other free programs -whose distribution conditions are different, write to the author to ask for -permission. For software which is copyrighted by the Free Software Foundation, -write to the Free Software Foundation; we sometimes make exceptions for this. -Our decision will be guided by the two goals of preserving the free status of -all derivatives of our free software and of promoting the sharing and reuse of -software generally. - -NO WARRANTY - -11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR -THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE -STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE -PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND -PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, -YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL -ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE -PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR -INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA -BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER -OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -END OF TERMS AND CONDITIONS - -How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest possible -use to the public, the best way to achieve this is to make it free software -which everyone can redistribute and change under these terms. - -To do so, attach the following notices to the program. It is safest to attach -them to the start of each source file to most effectively convey the exclusion -of warranty; and each file should have at least the "copyright" line and a -pointer to where the full notice is found. - - One line to give the program's name and a brief idea of what it does. - - Copyright (C) - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the Free - Software Foundation; either version 2 of the License, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this when it -starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author Gnomovision comes - with ABSOLUTELY NO WARRANTY; for details type 'show w'. This is free - software, and you are welcome to redistribute it under certain conditions; - type 'show c' for details. - -The hypothetical commands 'show w' and 'show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may be -called something other than 'show w' and 'show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your school, -if any, to sign a "copyright disclaimer" for the program, if necessary. Here -is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - 'Gnomovision' (which makes passes at compilers) written by James Hacker. - - signature of Ty Coon, 1 April 1989 - - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General Public -License instead of this License. - - -"CLASSPATH" EXCEPTION TO THE GPL - -Certain source files distributed by Oracle America and/or its affiliates are -subject to the following clarification and special exception to the GPL, but -only where Oracle has expressly included in the particular source file's header -the words "Oracle designates this particular file as subject to the "Classpath" -exception as provided by Oracle in the LICENSE file that accompanied this code." - - Linking this library statically or dynamically with other modules is making - a combined work based on this library. Thus, the terms and conditions of - the GNU General Public License cover the whole combination. - - As a special exception, the copyright holders of this library give you - permission to link this library with independent modules to produce an - executable, regardless of the license terms of these independent modules, - and to copy and distribute the resulting executable under terms of your - choice, provided that you also meet, for each linked independent module, - the terms and conditions of the license of that module. An independent - module is a module which is not derived from or based on this library. If - you modify this library, you may extend this exception to your version of - the library, but you are not obligated to do so. If you do not wish to do - so, delete this exception statement from your version. diff --git a/third_party/java/jdk/langtools/java_compiler-src.jar b/third_party/java/jdk/langtools/java_compiler-src.jar deleted file mode 100644 index 7b86145b1487f4..00000000000000 Binary files a/third_party/java/jdk/langtools/java_compiler-src.jar and /dev/null differ diff --git a/third_party/java/jdk/langtools/java_compiler.jar b/third_party/java/jdk/langtools/java_compiler.jar deleted file mode 100644 index e605e2cb9c908f..00000000000000 Binary files a/third_party/java/jdk/langtools/java_compiler.jar and /dev/null differ diff --git a/third_party/java/jdk/langtools/javac-9+181-r4173-1.jar b/third_party/java/jdk/langtools/javac-9+181-r4173-1.jar deleted file mode 100644 index 168633db132845..00000000000000 Binary files a/third_party/java/jdk/langtools/javac-9+181-r4173-1.jar and /dev/null differ diff --git a/third_party/java/jdk/langtools/javac-9+181-r4173-1.srcjar b/third_party/java/jdk/langtools/javac-9+181-r4173-1.srcjar deleted file mode 100644 index 8a1f20f60651b6..00000000000000 Binary files a/third_party/java/jdk/langtools/javac-9+181-r4173-1.srcjar and /dev/null differ diff --git a/third_party/java/jdk/langtools/jdk_compiler-src.jar b/third_party/java/jdk/langtools/jdk_compiler-src.jar deleted file mode 100644 index d4e007aa82a8ae..00000000000000 Binary files a/third_party/java/jdk/langtools/jdk_compiler-src.jar and /dev/null differ diff --git a/third_party/java/jdk/langtools/jdk_compiler.jar b/third_party/java/jdk/langtools/jdk_compiler.jar deleted file mode 100644 index 3a406e4b0dfadb..00000000000000 Binary files a/third_party/java/jdk/langtools/jdk_compiler.jar and /dev/null differ diff --git a/tools/jdk/BUILD b/tools/jdk/BUILD index 1603fe3dce609a..b78e0a337094ce 100644 --- a/tools/jdk/BUILD +++ b/tools/jdk/BUILD @@ -9,7 +9,6 @@ filegroup( name = "srcs", srcs = [ "BUILD", - "BUILD.java_langtools", "BUILD.java_tools", "BUILD.java_tools_prebuilt", "BUILD-jdk", # Tools are build from the workspace for tests. diff --git a/tools/jdk/jdk.BUILD b/tools/jdk/jdk.BUILD index 6a95e85b09dca1..034d79d61b52f0 100644 --- a/tools/jdk/jdk.BUILD +++ b/tools/jdk/jdk.BUILD @@ -165,12 +165,18 @@ filegroup( #This folder holds security policies filegroup( name = "jdk-conf", - srcs = glob(["conf/**"], allow_empty = True), + srcs = glob( + ["conf/**"], + allow_empty = True, + ), ) filegroup( name = "jdk-include", - srcs = glob(["include/**"], allow_empty = True), + srcs = glob( + ["include/**"], + allow_empty = True, + ), ) filegroup( @@ -195,19 +201,6 @@ java_runtime( ], ) -filegroup( - name = "langtools", - srcs = ["lib/tools.jar"], - deprecation = DEPRECATION_MESSAGE, -) - -java_import( - name = "langtools-neverlink", - deprecation = DEPRECATION_MESSAGE, - jars = ["lib/tools.jar"], - neverlink = 1, -) - config_setting( name = "windows", constraint_values = ["@platforms//os:windows"],