Skip to content
Permalink
Browse files
8269993: [Test]: java/net/httpclient/DigestEchoClientSSL.java contain…
…s redundant @run tags

Reviewed-by: dfuchs, vtewari
  • Loading branch information
thejasviv authored and Abdul Kolarkunnu committed Jul 8, 2021
1 parent e54585b commit 4e18ec26ddfa0b44e8780ebd556a5e8aa2e90dc0
Showing 1 changed file with 0 additions and 6 deletions.
@@ -39,12 +39,6 @@
* @run main/othervm/timeout=300
* DigestEchoClientSSL SSL
* @run main/othervm/timeout=300
* DigestEchoClientSSL SSL
* @run main/othervm/timeout=300
* -Djdk.http.auth.proxying.disabledSchemes=
* -Djdk.http.auth.tunneling.disabledSchemes=
* DigestEchoClientSSL SSL PROXY
* @run main/othervm/timeout=300
* -Djdk.http.auth.proxying.disabledSchemes=
* -Djdk.http.auth.tunneling.disabledSchemes=
* DigestEchoClientSSL SSL PROXY

5 comments on commit 4e18ec2

@openjdk-notifier
Copy link

@openjdk-notifier openjdk-notifier bot commented on 4e18ec2 Jul 8, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@RealCLanger
Copy link
Contributor

@RealCLanger RealCLanger commented on 4e18ec2 Aug 27, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk17u

@RealCLanger
Copy link
Contributor

@RealCLanger RealCLanger commented on 4e18ec2 Aug 27, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk11u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 4e18ec2 Aug 27, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@RealCLanger the backport was successfully created on the branch RealCLanger-backport-4e18ec26 in my personal fork of openjdk/jdk17u. To create a pull request with this backport targeting openjdk/jdk17u:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

this pull request contains a backport of commit 4e18ec26 from the openjdk/jdk repository.

The commit being backported was authored by Thejasvi Voniadka on 8 Jul 2021 and was reviewed by Daniel Fuchs and Vyom Tewari.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk17u:

$ git fetch https://github.com/openjdk-bots/jdk17u RealCLanger-backport-4e18ec26:RealCLanger-backport-4e18ec26
$ git checkout RealCLanger-backport-4e18ec26
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u RealCLanger-backport-4e18ec26

@openjdk
Copy link

@openjdk openjdk bot commented on 4e18ec2 Aug 27, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@RealCLanger could not automatically backport 4e18ec26 to openjdk/jdk11u-dev due to conflicts in the following files:

  • test/jdk/java/net/httpclient/DigestEchoClientSSL.java

To manually resolve these conflicts run the following commands in your personal fork of openjdk/jdk11u-dev:

$ git checkout -b RealCLanger-backport-4e18ec26
$ git fetch --no-tags https://git.openjdk.java.net/jdk 4e18ec26ddfa0b44e8780ebd556a5e8aa2e90dc0
$ git cherry-pick --no-commit 4e18ec26ddfa0b44e8780ebd556a5e8aa2e90dc0
$ # Resolve conflicts
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport 4e18ec26ddfa0b44e8780ebd556a5e8aa2e90dc0'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk11u-dev with the title Backport 4e18ec26ddfa0b44e8780ebd556a5e8aa2e90dc0.

Please sign in to comment.