Skip to content

Commit

Permalink
8309870: Using -proc:full should be considered requesting explicit an…
Browse files Browse the repository at this point in the history
…notation processing

Reviewed-by: jjg
  • Loading branch information
jddarcy committed Jun 12, 2023
1 parent 1612b6d commit 3ce1240
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1999, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -1288,7 +1288,10 @@ static boolean explicitAnnotationProcessingRequested(Options options) {
options.isSet(PROCESSOR_PATH) ||
options.isSet(PROCESSOR_MODULE_PATH) ||
options.isSet(PROC, "only") ||
options.isSet(PROC, "full") ||
options.isSet(A) ||
options.isSet(XPRINT);
// Skipping -XprintRounds and -XprintProcessorInfo
}

public void setDeferredDiagnosticHandler(Log.DeferredDiagnosticHandler deferredDiagnosticHandler) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2006, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -83,6 +83,11 @@
* {@code handleOption} then calls {@link #process process} providing a suitable
* {@link OptionHelper} to provide access the compiler state.
*
*
* <p>Maintenance note: when adding new annotation processing related
* options, the list of options regarded as requesting explicit
* annotation processing in JavaCompiler should be updated.
*
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own
* risk. This code and its internal interfaces are subject to change
Expand Down

7 comments on commit 3ce1240

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

@luchenlin
Copy link

Choose a reason for hiding this comment

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

/backport jdk17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 3ce1240 Jan 26, 2024

Choose a reason for hiding this comment

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

@luchenlin Could not automatically backport 3ce1240c to openjdk/jdk17u-dev due to conflicts in the following files:

  • src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk17u-dev. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk17u-dev.git master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b backport-luchenlin-3ce1240c

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk.git 3ce1240ca1b4139980444c171e317f4bfeff9314

# Backport the commit
$ git cherry-pick --no-commit 3ce1240ca1b4139980444c171e317f4bfeff9314
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport 3ce1240ca1b4139980444c171e317f4bfeff9314'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk17u-dev with the title Backport 3ce1240ca1b4139980444c171e317f4bfeff9314.

Below you can find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 3ce1240c from the openjdk/jdk repository.

The commit being backported was authored by Joe Darcy on 12 Jun 2023 and was reviewed by Jonathan Gibbons.

Thanks!

@luchenlin
Copy link

Choose a reason for hiding this comment

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

/backport jdk17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 3ce1240 Jan 26, 2024

Choose a reason for hiding this comment

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

@luchenlin Could not automatically backport 3ce1240c to openjdk/jdk17u-dev due to conflicts in the following files:

  • src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk17u-dev. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk17u-dev.git master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b backport-luchenlin-3ce1240c

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk.git 3ce1240ca1b4139980444c171e317f4bfeff9314

# Backport the commit
$ git cherry-pick --no-commit 3ce1240ca1b4139980444c171e317f4bfeff9314
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport 3ce1240ca1b4139980444c171e317f4bfeff9314'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk17u-dev with the title Backport 3ce1240ca1b4139980444c171e317f4bfeff9314.

Below you can find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 3ce1240c from the openjdk/jdk repository.

The commit being backported was authored by Joe Darcy on 12 Jun 2023 and was reviewed by Jonathan Gibbons.

Thanks!

@luchenlin
Copy link

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 3ce1240 Jan 29, 2024

Choose a reason for hiding this comment

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

@luchenlin Could not automatically backport 3ce1240c to openjdk/jdk11u-dev due to conflicts in the following files:

  • src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java
  • src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk11u-dev. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk11u-dev.git master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b backport-luchenlin-3ce1240c

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk.git 3ce1240ca1b4139980444c171e317f4bfeff9314

# Backport the commit
$ git cherry-pick --no-commit 3ce1240ca1b4139980444c171e317f4bfeff9314
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport 3ce1240ca1b4139980444c171e317f4bfeff9314'

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

Below you can find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 3ce1240c from the openjdk/jdk repository.

The commit being backported was authored by Joe Darcy on 12 Jun 2023 and was reviewed by Jonathan Gibbons.

Thanks!

Please sign in to comment.