Skip to content

Commit d2de477

Browse files
authored
Update module description (#5999)
* Fixes #5886 by adding necessary module description * Update suggested module description. Might fix #5622. * Update build.gradle
1 parent b2ab177 commit d2de477

File tree

2 files changed

+58
-16
lines changed

2 files changed

+58
-16
lines changed

build.gradle

+55-15
Original file line numberDiff line numberDiff line change
@@ -582,41 +582,81 @@ jlink {
582582

583583
// TODO: Remove the following correction to the merged module
584584
// The module descriptor automatically generated by the plugin for the merged module contained some invalid entries.
585-
// Execute ./gradlew suggestMergedModuleInfo and include the incorrect directives here.
585+
// Execute ./gradlew suggestMergedModuleInfo and include the suggested directives here.
586586
mergedModule {
587-
requires 'java.logging'
588-
requires 'jdk.xml.dom'
589-
requires 'java.sql'
590-
requires 'java.rmi'
591587
requires 'java.xml'
592588
requires 'com.sun.xml.txw2'
593-
requires 'com.google.gson'
594589
requires 'java.desktop'
595-
requires 'java.security.jgss'
596-
requires 'jdk.jsobject'
590+
requires 'org.objectweb.asm'
591+
requires 'jdk.jfr'
597592
requires 'jdk.unsupported'
593+
requires 'com.google.gson'
598594
requires 'java.management'
599595
requires 'java.naming'
600-
requires 'jdk.unsupported.desktop'
601596
requires 'java.security.sasl'
597+
requires 'com.sun.xml.fastinfoset'
598+
requires 'jdk.security.jgss'
599+
requires 'java.logging'
600+
requires 'jdk.xml.dom'
601+
requires 'java.sql'
602+
requires 'java.rmi'
603+
requires 'java.security.jgss'
604+
requires 'com.oracle.truffle.regex'
605+
requires 'jdk.jsobject'
606+
requires 'jdk.management'
607+
requires 'jdk.unsupported.desktop'
608+
requires 'org.objectweb.asm.util'
602609
requires 'java.scripting'
610+
requires 'org.objectweb.asm.commons'
611+
requires 'org.graalvm.truffle'
603612
requires 'java.datatransfer'
604613
requires 'java.compiler'
614+
requires 'java.sql.rowset'
605615
requires 'java.transaction.xa'
606-
requires 'com.sun.xml.fastinfoset'
616+
requires 'org.graalvm.sdk'
607617
requires 'org.slf4j'
608-
uses 'com.airhacks.afterburner.injection.PresenterFactory'
618+
uses 'org.apache.logging.log4j.util.PropertySource'
619+
uses 'org.apache.logging.log4j.core.util.WatchEventService'
620+
uses 'org.apache.logging.log4j.plugins.processor.PluginService'
609621
uses 'org.controlsfx.glyphfont.GlyphFont'
610622
uses 'com.airhacks.afterburner.views.ResourceLocator'
623+
uses 'com.oracle.truffle.js.runtime.Evaluator'
624+
uses 'org.apache.logging.log4j.message.ThreadDumpMessage.ThreadInfoFactory'
625+
uses 'com.airhacks.afterburner.injection.PresenterFactory'
626+
uses 'com.oracle.truffle.js.runtime.builtins.JSFunctionLookup'
627+
uses 'org.apache.logging.log4j.spi.Provider'
628+
uses 'org.mariadb.jdbc.tls.TlsSocketPlugin'
629+
uses 'org.mariadb.jdbc.LocalInfileInterceptor'
611630
uses 'javax.xml.bind.JAXBContextFactory'
612-
provides 'java.sql.Driver' with 'org.postgresql.Driver'
631+
provides 'javax.annotation.processing.Processor' with 'org.apache.logging.log4j.plugins.processor.PluginProcessor'
613632
provides 'org.controlsfx.glyphfont.GlyphFont' with 'org.controlsfx.glyphfont.FontAwesome'
614-
provides 'org.apache.commons.logging.LogFactory' with 'org.apache.logging.log4j.jcl.LogFactoryImpl'
615-
provides 'org.slf4j.spi.SLF4JServiceProvider' with 'org.apache.logging.slf4j.SLF4JServiceProvider'
633+
provides 'org.apache.logging.log4j.message.ThreadDumpMessage.ThreadInfoFactory' with 'org.apache.logging.log4j.core.message.ExtendedThreadInfoFactory'
634+
provides 'org.mariadb.jdbc.tls.TlsSocketPlugin' with 'org.mariadb.jdbc.internal.protocol.tls.DefaultTlsSocketPlugin'
616635
provides 'com.microsoft.applicationinsights.core.dependencies.io.grpc.ServerProvider' with 'com.microsoft.applicationinsights.core.dependencies.io.grpc.netty.shaded.io.grpc.netty.NettyServerProvider'
636+
provides 'com.oracle.truffle.js.runtime.Evaluator' with 'com.oracle.truffle.js.parser.GraalJSEvaluator'
617637
provides 'com.microsoft.applicationinsights.core.dependencies.io.grpc.NameResolverProvider' with 'com.microsoft.applicationinsights.core.dependencies.io.grpc.internal.DnsNameResolverProvider'
618-
provides 'java.security.Provider' with 'org.bouncycastle.jce.provider.BouncyCastleProvider', 'org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider'
638+
provides 'org.apache.logging.log4j.util.PropertySource' with 'org.apache.logging.log4j.util.EnvironmentPropertySource',
639+
'org.apache.logging.log4j.util.SystemPropertiesPropertySource'
640+
provides 'java.sql.Driver' with 'org.postgresql.Driver'
641+
provides 'org.apache.logging.log4j.plugins.processor.PluginService' with 'org.apache.logging.log4j.plugins.convert.plugins.Log4jPlugins'
642+
provides 'org.mariadb.jdbc.authentication.AuthenticationPlugin' with 'org.mariadb.jdbc.internal.com.send.authentication.CachingSha2PasswordPlugin',
643+
'org.mariadb.jdbc.internal.com.send.authentication.ClearPasswordPlugin',
644+
'org.mariadb.jdbc.internal.com.send.authentication.Ed25519PasswordPlugin',
645+
'org.mariadb.jdbc.internal.com.send.authentication.NativePasswordPlugin',
646+
'org.mariadb.jdbc.internal.com.send.authentication.OldPasswordPlugin',
647+
'org.mariadb.jdbc.internal.com.send.authentication.SendGssApiAuthPacket',
648+
'org.mariadb.jdbc.internal.com.send.authentication.SendPamAuthPacket',
649+
'org.mariadb.jdbc.internal.com.send.authentication.Sha256PasswordPlugin'
650+
provides 'org.mariadb.jdbc.credential.CredentialPlugin' with 'org.mariadb.jdbc.credential.aws.AwsIamCredentialPlugin',
651+
'org.mariadb.jdbc.credential.env.EnvCredentialPlugin',
652+
'org.mariadb.jdbc.credential.system.PropertiesCredentialPlugin'
653+
provides 'org.apache.commons.logging.LogFactory' with 'org.apache.logging.log4j.jcl.LogFactoryImpl'
654+
provides 'org.slf4j.spi.SLF4JServiceProvider' with 'org.apache.logging.slf4j.SLF4JServiceProvider'
655+
provides 'org.apache.logging.log4j.spi.Provider' with 'org.apache.logging.log4j.core.impl.Log4jProvider'
656+
provides 'java.security.Provider' with 'org.bouncycastle.jce.provider.BouncyCastleProvider',
657+
'org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider'
619658
provides 'com.microsoft.applicationinsights.core.dependencies.io.grpc.ManagedChannelProvider' with 'com.microsoft.applicationinsights.core.dependencies.io.grpc.netty.shaded.io.grpc.netty.NettyChannelProvider'
659+
provides 'com.oracle.truffle.js.runtime.builtins.JSFunctionLookup' with 'com.oracle.truffle.js.builtins.JSDefaultBuiltinLookup'
620660
}
621661

622662
jpackage {

src/main/java/module-info.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
requires java.sql;
77

88
// JavaFX
9+
requires javafx.base;
910
requires javafx.graphics;
1011
requires javafx.swing;
1112
requires javafx.controls;
@@ -72,9 +73,10 @@
7273
requires java.string.similarity;
7374
requires ojdbc10;
7475
requires org.postgresql.jdbc;
76+
requires org.mariadb.jdbc;
77+
uses org.mariadb.jdbc.credential.CredentialPlugin;
7578
requires org.apache.commons.lang3;
7679
requires org.antlr.antlr4.runtime;
7780
requires flowless;
7881
requires org.apache.tika.core;
79-
requires javafx.base;
8082
}

0 commit comments

Comments
 (0)