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

Martin Doerr mdoerr at openjdk.org
Thu Dec 14 09:40:46 UTC 2023


On Wed, 13 Dec 2023 22:34:18 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/...
>
> Amos Shi has updated the pull request incrementally with one additional commit since the last revision:
> 
>   Backport 4fe2edae5948e95f1940a64a3e9d4379e8362d8c

Thanks! Looks good, now.

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

Marked as reviewed by mdoerr (Reviewer).

PR Review: https://git.openjdk.org/jdk11u-dev/pull/2330#pullrequestreview-1781411998


More information about the jdk-updates-dev mailing list