Skip to content

chore: bump Gradle to 7.4.2#2535

Merged
vlsi merged 12 commits into
pgjdbc:masterfrom
vlsi:gradle7
Jun 17, 2022
Merged

chore: bump Gradle to 7.4.2#2535
vlsi merged 12 commits into
pgjdbc:masterfrom
vlsi:gradle7

Conversation

@vlsi

@vlsi vlsi commented Jun 5, 2022

Copy link
Copy Markdown
Member

@vlsi vlsi force-pushed the gradle7 branch 3 times, most recently from d88b28a to 8e8d899 Compare June 10, 2022 16:30
@vlsi

vlsi commented Jun 10, 2022

Copy link
Copy Markdown
Member Author
/home/runner/work/pgjdbc/pgjdbc/pgjdbc/src/main/java/org/postgresql/gss/MakeGSS.java:20: warning: [removal] AccessController in java.security has been deprecated and marked for removal
import java.security.AccessController;
                    ^
/home/runner/work/pgjdbc/pgjdbc/pgjdbc/src/main/java/org/postgresql/Driver.java:27: warning: [removal] AccessController in java.security has been deprecated and marked for removal
import java.security.AccessController;
                    ^
/home/runner/work/pgjdbc/pgjdbc/pgjdbc/src/main/java/org/postgresql/jdbc/PgConnection.java:1627: warning: [removal] SecurityManager in java.lang has been deprecated and marked for removal
    SecurityManager securityManager = System.getSecurityManager();
    ^
/home/runner/work/pgjdbc/pgjdbc/pgjdbc/src/main/java/org/postgresql/jdbc/PgConnection.java:1627: warning: [removal] getSecurityManager() in System has been deprecated and marked for removal
    SecurityManager securityManager = System.getSecurityManager();
                                            ^
/home/runner/work/pgjdbc/pgjdbc/pgjdbc/src/main/java/org/postgresql/gss/MakeGSS.java:52: warning: [removal] AccessController in java.security has been deprecated and marked for removal
      Subject sub = Subject.getSubject(AccessController.getContext());
                                       ^
/home/runner/work/pgjdbc/pgjdbc/pgjdbc/src/main/java/org/postgresql/gss/MakeGSS.java:52: warning: [removal] getSubject(AccessControlContext) in Subject has been deprecated and marked for removal
      Subject sub = Subject.getSubject(AccessController.getContext());
                           ^
/home/runner/work/pgjdbc/pgjdbc/pgjdbc/src/main/java/org/postgresql/Driver.java:91: warning: [removal] AccessController in java.security has been deprecated and marked for removal
          AccessController.doPrivileged(new PrivilegedExceptionAction<Properties>() {
          ^
/home/runner/work/pgjdbc/pgjdbc/pgjdbc/src/main/java/org/postgresql/Driver.java:274: warning: [removal] AccessControlException in java.security has been deprecated and marked for removal
    } catch (java.security.AccessControlException ace) {
                          ^

Subject.getSubject(AccessController.getContext()); will be replaced with a static Subject.current().

Any preferences on how we should tackle that?

a) Use SuppressWarnings. It would work, however, the code would break in Java 18
b) Rewrite with reflection (or MethodHandles)
c) add "comment preprocessor" and different class files for different Java versions.
d) use different source files for different Java versions

I'm inclined to a or b

@davecramer

Copy link
Copy Markdown
Member

I'd prefer the solution that will work in the future. So B
That said I wonder how it will play with graal ?

@vlsi

vlsi commented Jun 11, 2022

Copy link
Copy Markdown
Member Author

wonder how it will play with graal ?

GraalVM supports MethodHandle: oracle/graal#2761

@davecramer

Copy link
Copy Markdown
Member

wonder how it will play with graal ?

GraalVM supports MethodHandle: oracle/graal#2761

Then by all means solve this problem in such a way that it will work in the future.

@vlsi vlsi force-pushed the gradle7 branch 6 times, most recently from 4c8e9d3 to 6870af3 Compare June 12, 2022 08:18
@vlsi

vlsi commented Jun 12, 2022

Copy link
Copy Markdown
Member Author

Need to apply https://github.com/bndtools/bnd/pull/3904/files somehow

Build pgjdbc FAILURE reason:                                
    Execution failed for task ':postgresql:osgiJar':
        java.util.ConcurrentModificationException
            at aQute.bnd.osgi.Jar.putResource(Jar.java:335)
            at aQute.bnd.osgi.Jar.buildFromZip(Jar.java:263)
            at aQute.bnd.osgi.Jar.<init>(Jar.java:128)
            at aQute.bnd.osgi.Jar.<init>(Jar.java:219)
            at aQute.bnd.gradle.BundleTaskConvention$_buildBundle_closure5$_closure6.doCall(BundleTaskConvention.groovy:244)
            at org.apache.groovy.nio.extensions.NioExtensions.withCloseable(NioExtensions.java:1927)
            at aQute.bnd.gradle.BundleTaskConvention$_buildBundle_closure5.doCall(BundleTaskConvention.groovy:199)
at org.gradle.util.internal.ClosureBackedAction.execute(ClosureBackedAction.java:72)
at org.gradle.util.internal.ConfigureUtil.configureTarget(ConfigureUtil.java:155)
at org.gradle.util.internal.ConfigureUtil.configureSelf(ConfigureUtil.java:131)
at org.gradle.api.internal.AbstractTask.configure(AbstractTask.java:669)
at org.gradle.api.DefaultTask.configure(DefaultTask.java:309)
at org.gradle.api.DefaultTask.configure(DefaultTask.java:45)
            at aQute.bnd.gradle.BundleTaskConvention.buildBundle(BundleTaskConvention.groovy:194)
at org.gradle.internal.metaobject.BeanDynamicObject$MetaClassAdapter.invokeMethod(BeanDynamicObject.java:484)
at org.gradle.internal.metaobject.BeanDynamicObject.tryInvokeMethod(BeanDynamicObject.java:196)
at org.gradle.internal.extensibility.DefaultConvention$ExtensionsDynamicObject.tryInvokeMethod(DefaultConvention.java:[308](https://github.com/pgjdbc/pgjdbc/runs/6848672098?check_suite_focus=true#step:8:313))
at org.gradle.internal.metaobject.CompositeDynamicObject.tryInvokeMethod(CompositeDynamicObject.java:98)
at org.gradle.internal.extensibility.MixInClosurePropertiesAsMethodsDynamicObject.tryInvokeMethod(MixInClosurePropertiesAsMethodsDynamicObject.java:34)
at org.gradle.internal.metaobject.AbstractDynamicObject.invokeMethod(AbstractDynamicObject.java:163)
            at aQute.bnd.gradle.Bundle.copy(Bundle.groovy:52)
at org.gradle.internal.reflect.JavaMethod.invoke(JavaMethod.java:104)
at org.gradle.api.internal.project.taskfactory.StandardTaskAction.doExecute(StandardTaskAction.java:58)
at org.gradle.api.internal.project.taskfactory.StandardTaskAction.execute(StandardTaskAction.java:51)
at org.gradle.api.internal.project.taskfactory.StandardTaskAction.execute(StandardTaskAction.java:29)
at org.gradle.api.internal.tasks.execution.TaskExecution$3.run(TaskExecution.java:242)
at org.gradle.internal.operations.DefaultBuildOperationRunner$1.execute(DefaultBuildOperationRunner.java:29)
at org.gradle.internal.operations.DefaultBuildOperationRunner$1.execute(DefaultBuildOperationRunner.java:26)
at org.gradle.internal.operations.DefaultBuildOperationRunner$2.execute(DefaultBuildOperationRunner.java:66)
at org.gradle.internal.operations.DefaultBuildOperationRunner$2.execute(DefaultBuildOperationRunner.java:59)
at org.gradle.internal.operations.DefaultBuildOperationRunner.execute(DefaultBuildOperationRunner.java:157)
at org.gradle.internal.operations.DefaultBuildOperationRunner.execute(DefaultBuildOperationRunner.java:59)
at org.gradle.internal.operations.DefaultBuildOperationRunner.run(DefaultBuildOperationRunner.java:47)
at org.gradle.internal.operations.DefaultBuildOperationExecutor.run(DefaultBuildOperationExecutor.java:68)
at org.gradle.api.internal.tasks.execution.TaskExecution.executeAction(TaskExecution.java:227)
at org.gradle.api.internal.tasks.execution.TaskExecution.executeActions(TaskExecution.java:210)
at org.gradle.api.internal.tasks.execution.TaskExecution.executeWithPreviousOutputFiles(TaskExecution.java:193)
at org.gradle.api.internal.tasks.execution.TaskExecution.execute(TaskExecution.java:171)
at org.gradle.internal.execution.steps.ExecuteStep.executeInternal(ExecuteStep.java:89)
at org.gradle.internal.execution.steps.ExecuteStep.access$000(ExecuteStep.java:40)
at org.gradle.internal.execution.steps.ExecuteStep$1.call(ExecuteStep.java:53)
at org.gradle.internal.execution.steps.ExecuteStep$1.call(ExecuteStep.java:50)
at org.gradle.internal.operations.DefaultBuildOperationRunner$CallableBuildOperationWorker.execute(DefaultBuildOperationRunner.java:204)
at org.gradle.internal.operations.DefaultBuildOperationRunner$CallableBuildOperationWorker.execute(DefaultBuildOperationRunner.java:199)
at org.gradle.internal.operations.DefaultBuildOperationRunner$2.execute(DefaultBuildOperationRunner.java:66)
at org.gradle.internal.operations.DefaultBuildOperationRunner$2.execute(DefaultBuildOperationRunner.java:59)
at org.gradle.internal.operations.DefaultBuildOperationRunner.execute(DefaultBuildOperationRunner.java:157)
at org.gradle.internal.operations.DefaultBuildOperationRunner.execute(DefaultBuildOperationRunner.java:59)
at org.gradle.internal.operations.DefaultBuildOperationRunner.call(DefaultBuildOperationRunner.java:53)
at org.gradle.internal.operations.DefaultBuildOperationExecutor.call(DefaultBuildOperationExecutor.java:73)
at org.gradle.internal.execution.steps.ExecuteStep.execute(ExecuteStep.java:50)
at org.gradle.internal.execution.steps.ExecuteStep.execute(ExecuteStep.java:40)
at org.gradle.internal.execution.steps.RemovePreviousOutputsStep.execute(RemovePreviousOutputsStep.java:68)
at org.gradle.internal.execution.steps.RemovePreviousOutputsStep.execute(RemovePreviousOutputsStep.java:38)
at org.gradle.internal.execution.steps.ResolveInputChangesStep.execute(ResolveInputChangesStep.java:48)
at org.gradle.internal.execution.steps.ResolveInputChangesStep.execute(ResolveInputChangesStep.java:36)
at org.gradle.internal.execution.steps.CancelExecutionStep.execute(CancelExecutionStep.java:41)
at org.gradle.internal.execution.steps.TimeoutStep.executeWithoutTimeout(TimeoutStep.java:74)
at org.gradle.internal.execution.steps.TimeoutStep.execute(TimeoutStep.java:55)
at org.gradle.internal.execution.steps.CreateOutputsStep.execute(CreateOutputsStep.java:51)
at org.gradle.internal.execution.steps.CreateOutputsStep.execute(CreateOutputsStep.java:29)
at org.gradle.internal.execution.steps.CaptureStateAfterExecutionStep.execute(CaptureStateAfterExecutionStep.java:61)
at org.gradle.internal.execution.steps.CaptureStateAfterExecutionStep.execute(CaptureStateAfterExecutionStep.java:42)
at org.gradle.internal.execution.steps.BroadcastChangingOutputsStep.execute(BroadcastChangingOutputsStep.java:60)
at org.gradle.internal.execution.steps.BroadcastChangingOutputsStep.execute(BroadcastChangingOutputsStep.java:27)
at org.gradle.internal.execution.steps.BuildCacheStep.executeWithoutCache(BuildCacheStep.java:180)
at org.gradle.internal.execution.steps.BuildCacheStep.lambda$execute$1(BuildCacheStep.java:75)
at org.gradle.internal.Either$Right.fold(Either.java:175)
at org.gradle.internal.execution.caching.CachingState.fold(CachingState.java:59)
at org.gradle.internal.execution.steps.BuildCacheStep.execute(BuildCacheStep.java:73)
at org.gradle.internal.execution.steps.BuildCacheStep.execute(BuildCacheStep.java:48)
at org.gradle.internal.execution.steps.StoreExecutionStateStep.execute(StoreExecutionStateStep.java:36)
at org.gradle.internal.execution.steps.StoreExecutionStateStep.execute(StoreExecutionStateStep.java:25)
at org.gradle.internal.execution.steps.RecordOutputsStep.execute(RecordOutputsStep.java:36)
at org.gradle.internal.execution.steps.RecordOutputsStep.execute(RecordOutputsStep.java:22)
at org.gradle.internal.execution.steps.SkipUpToDateStep.executeBecause(SkipUpToDateStep.java:110)
at org.gradle.internal.execution.steps.SkipUpToDateStep.lambda$execute$2(SkipUpToDateStep.java:56)
at org.gradle.internal.execution.steps.SkipUpToDateStep.execute(SkipUpToDateStep.java:56)
at org.gradle.internal.execution.steps.SkipUpToDateStep.execute(SkipUpToDateStep.java:38)
at org.gradle.internal.execution.steps.ResolveChangesStep.execute(ResolveChangesStep.java:73)
at org.gradle.internal.execution.steps.ResolveChangesStep.execute(ResolveChangesStep.java:44)
at org.gradle.internal.execution.steps.legacy.MarkSnapshottingInputsFinishedStep.execute(MarkSnapshottingInputsFinishedStep.java:37)
at org.gradle.internal.execution.steps.legacy.MarkSnapshottingInputsFinishedStep.execute(MarkSnapshottingInputsFinishedStep.java:27)
at org.gradle.internal.execution.steps.ResolveCachingStateStep.execute(ResolveCachingStateStep.java:89)
at org.gradle.internal.execution.steps.ResolveCachingStateStep.execute(ResolveCachingStateStep.java:50)
at org.gradle.internal.execution.steps.ValidateStep.execute(ValidateStep.java:114)
at org.gradle.internal.execution.steps.ValidateStep.execute(ValidateStep.java:57)
at org.gradle.internal.execution.steps.CaptureStateBeforeExecutionStep.execute(CaptureStateBeforeExecutionStep.java:76)
at org.gradle.internal.execution.steps.CaptureStateBeforeExecutionStep.execute(CaptureStateBeforeExecutionStep.java:50)
at org.gradle.internal.execution.steps.SkipEmptyWorkStep.executeWithNoEmptySources(SkipEmptyWorkStep.java:249)
at org.gradle.internal.execution.steps.SkipEmptyWorkStep.executeWithNoEmptySources(SkipEmptyWorkStep.java:204)
at org.gradle.internal.execution.steps.SkipEmptyWorkStep.execute(SkipEmptyWorkStep.java:83)
at org.gradle.internal.execution.steps.SkipEmptyWorkStep.execute(SkipEmptyWorkStep.java:54)
at org.gradle.internal.execution.steps.RemoveUntrackedExecutionStateStep.execute(RemoveUntrackedExecutionStateStep.java:32)
at org.gradle.internal.execution.steps.RemoveUntrackedExecutionStateStep.execute(RemoveUntrackedExecutionStateStep.java:21)
at org.gradle.internal.execution.steps.legacy.MarkSnapshottingInputsStartedStep.execute(MarkSnapshottingInputsStartedStep.java:38)
at org.gradle.internal.execution.steps.LoadPreviousExecutionStateStep.execute(LoadPreviousExecutionStateStep.java:43)
at org.gradle.internal.execution.steps.LoadPreviousExecutionStateStep.execute(LoadPreviousExecutionStateStep.java:31)
at org.gradle.internal.execution.steps.AssignWorkspaceStep.lambda$execute$0(AssignWorkspaceStep.java:40)
at org.gradle.api.internal.tasks.execution.TaskExecution$4.withWorkspace(TaskExecution.java:287)
at org.gradle.internal.execution.steps.AssignWorkspaceStep.execute(AssignWorkspaceStep.java:40)
at org.gradle.internal.execution.steps.AssignWorkspaceStep.execute(AssignWorkspaceStep.java:30)
at org.gradle.internal.execution.steps.IdentityCacheStep.execute(IdentityCacheStep.java:37)
at org.gradle.internal.execution.steps.IdentityCacheStep.execute(IdentityCacheStep.java:27)
at org.gradle.internal.execution.steps.IdentifyStep.execute(IdentifyStep.java:44)
at org.gradle.internal.execution.steps.IdentifyStep.execute(IdentifyStep.java:33)

@vlsi vlsi force-pushed the gradle7 branch 6 times, most recently from 60ace06 to 7eb5d85 Compare June 12, 2022 17:53
@vlsi

vlsi commented Jun 12, 2022

Copy link
Copy Markdown
Member Author

This looks mergeable to me.
I'm not fond of all those try-catch-MethodHandle stuff, however, there are only a couple of cases, so it is not that bad.

vlsi added 7 commits June 17, 2022 13:43
The finalize is deprecated for removal in Java 17+, so add suppress warnings
to unlock build under Java 17+
We treat javadoc warnings as build errors, however, it looks like
recent Java starts requiring javadoc for everything.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants