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

[Martin Doerr]

On Mon, 4 Dec 2023 10:36:45 GMT, Amos Shi <ashi at openjdk.org> wrote:

> 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...

Your resolution looks very good. I've checked all your edits.
ShortResponseBodyWithRetry.java has been renamed to ShortResponseBodyPostWithRetry.java by https://github.com/openjdk/jdk11u/commit/2b75da651699bdbe44ba42be7259fade9e65dfcc.
I think the ShortResponseBodyWithRetry.java from https://github.com/openjdk/jdk/commit/4fe2edae5948e95f1940a64a3e9d4379e8362d8c should get integrated to the other file.

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

PR Comment: https://git.openjdk.org/jdk11u-dev/pull/2330#issuecomment-1846246954