[jdk11u-dev] RFR: 8211978: Move testlibrary/jdk/testlibrary/SimpleSSLContext.java and testkeys to network testlibrary [v2]

Amos Shi ashi at openjdk.org
Wed Dec 13 22:34:18 UTC 2023


> Backport of [JDK-8211978](https://bugs.openjdk.org/browse/JDK-8211978)
> 
> The following files need manual merge:
> - `test/jdk/java/net/HttpURLConnection/SetAuthenticator/HTTPSetAuthenticatorTest.java`
>   - `Copyright (c) year` sections cannot be auto merged
>   - The curent `year` in [jdk11u-dev](https://github.com/openjdk/jdk11u-dev) is newer, so the change can be considered as **clean**
> - `test/jdk/java/net/HttpURLConnection/SetAuthenticator/HTTPTest.java`
>   - `Copyright (c) year` sections cannot be auto merged
>   - The curent `year` in [jdk11u-dev](https://github.com/openjdk/jdk11u-dev) is newer, so the change can be considered as **clean**
> - `test/jdk/java/net/httpclient/AbstractThrowingPushPromises.java` 
>   - The base line number is different so cannot be auto merged; 
>   - the changes are the same as original commit in [jdk](https://github.com/openjdk/jdk) repo, so the change is **clean**
> - `test/jdk/java/net/httpclient/HttpsTunnelTest.java` 
>   - The base line number is different so cannot be auto merged; 
>   - the changes are the same as original commit in [jdk](https://github.com/openjdk/jdk) repo, so the change is **clean**
> - `test/jdk/java/net/httpclient/InvalidSSLContextTest.java` 
>   - The base line number is different so cannot be auto merged; 
>   - the changes are the same as original commit in [jdk](https://github.com/openjdk/jdk) repo, so the change is **clean**
> - `test/jdk/java/net/httpclient/ShortResponseBody.java` 
>   - `@library /lib/testlibrary` and `@build jdk.testlibrary.SimpleSSLContext` lines does not exist, just as [jdk](https://github.com/openjdk/jdk) repo, so we san safely ignore them, so the change is **clean**
> - `test/jdk/java/net/httpclient/SmokeTest.java` 
>   - The base line number is different so cannot be auto merged; 
>   - the changes are the same as original commit in [jdk](https://github.com/openjdk/jdk) repo, so the change is **clean**
> - `test/jdk/java/net/httpclient/SpecialHeadersTest.java` 
>   - The base line number is different so cannot be auto merged; 
>   - the changes are the same as original commit in [jdk](https://github.com/openjdk/jdk) repo, so the change is **clean**
> - `test/jdk/java/net/httpclient/UnknownBodyLengthTest.java` 
>   - The base line number is different so cannot be auto merged; 
>   - the changes are the same as original commit in [jdk](https://github.com/openjdk/jdk) repo, so the change is **clean**
> - `test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/FlowTest.java` 
>   - `Copyright (c) yea...

Amos Shi has updated the pull request incrementally with one additional commit since the last revision:

  Backport 4fe2edae5948e95f1940a64a3e9d4379e8362d8c

-------------

Changes:
  - all: https://git.openjdk.org/jdk11u-dev/pull/2330/files
  - new: https://git.openjdk.org/jdk11u-dev/pull/2330/files/66599291..01d0d52b

Webrevs:
 - full: https://webrevs.openjdk.org/?repo=jdk11u-dev&pr=2330&range=01
 - incr: https://webrevs.openjdk.org/?repo=jdk11u-dev&pr=2330&range=00-01

  Stats: 2 lines in 1 file changed: 0 ins; 0 del; 2 mod
  Patch: https://git.openjdk.org/jdk11u-dev/pull/2330.diff
  Fetch: git fetch https://git.openjdk.org/jdk11u-dev.git pull/2330/head:pull/2330

PR: https://git.openjdk.org/jdk11u-dev/pull/2330


More information about the jdk-updates-dev mailing list