Skip to content

Commit 2f847ea

Browse files
shs96cshs96c
committed
Add the patches we need back
1 parent 5df8878 commit 2f847ea

File tree

2 files changed

+186
-13
lines changed

2 files changed

+186
-13
lines changed

‎MODULE.bazel‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ git_override(
3232
module_name = "rules_jvm_external",
3333
remote = "https://github.com/bazel-contrib/rules_jvm_external.git",
3434
commit = "d8af22108bd8b353a226140570008231f2921931",
35+
patch_strip = 1,
36+
patches = ["//java:rules_jvm_external_javadoc.patch"],
3537
)
3638

3739
linter = use_extension("@apple_rules_lint//lint:extensions.bzl", "linter")

‎java/maven_install.json‎

Lines changed: 184 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
33
"__INPUT_ARTIFACTS_HASH": -2012151202,
4-
"__RESOLVED_ARTIFACTS_HASH": -1886509148,
4+
"__RESOLVED_ARTIFACTS_HASH": -1174870935,
55
"artifacts": {
66
"com.beust:jcommander": {
77
"shasums": {
@@ -410,10 +410,10 @@
410410
},
411411
"io.projectreactor:reactor-core": {
412412
"shasums": {
413-
"jar": "6e235f0be9732ebd6a42c585dfd53274065978bfbc28d721d7ecf487fde27b52",
414-
"sources": "57e48b121636923ec362aa337556150edc8bc29ccba686c21d36016e05207b23"
413+
"jar": "44f055fbd033b6c976c53fb2e04b59027e79fb2312c37d2eaa54c77ea1ea80fe",
414+
"sources": "fee913ed4e41d79ce1cf7db4526d23e848719083b65a4041dea590f91b1ef2f6"
415415
},
416-
"version": "3.6.2"
416+
"version": "3.6.6"
417417
},
418418
"io.reactivex.rxjava3:rxjava": {
419419
"shasums": {
@@ -487,10 +487,10 @@
487487
},
488488
"org.apache.commons:commons-lang3": {
489489
"shasums": {
490-
"jar": "7b96bf3ee68949abb5bc465559ac270e0551596fa34523fddf890ec418dde13c",
491-
"sources": "ab3b86afb898f1026dbe43aaf71e9c1d719ec52d6e41887b362d86777c299b6f"
490+
"jar": "6ee731df5c8e5a2976a1ca023b6bb320ea8d3539fbe64c8a1d5cb765127c33b4",
491+
"sources": "5fdcac21ad329766054a95367d7583dfcdca737d221d5e01a5f2a198c04c6b18"
492492
},
493-
"version": "3.14.0"
493+
"version": "3.17.0"
494494
},
495495
"org.apache.commons:commons-text": {
496496
"shasums": {
@@ -676,10 +676,10 @@
676676
},
677677
"org.objenesis:objenesis": {
678678
"shasums": {
679-
"jar": "95488102feaf2e2858adf6b299353677dac6c15294006f8ed1c5556f8e3cd251",
680-
"sources": "896fa899a262c2f0f7e661848025fad22349300a5247ac175510993a9a5eede9"
679+
"jar": "02dfd0b0439a5591e35b708ed2f5474eb0948f53abf74637e959b8e4ef69bfeb",
680+
"sources": "d06164f8ca002c8ef193cef2d682822014dd330505616af93a3fb64226fc131d"
681681
},
682-
"version": "3.4"
682+
"version": "3.3"
683683
},
684684
"org.opentest4j:opentest4j": {
685685
"shasums": {
@@ -725,10 +725,10 @@
725725
},
726726
"org.reactivestreams:reactive-streams": {
727727
"shasums": {
728-
"jar": "f75ca597789b3dac58f61857b9ac2e1034a68fa672db35055a8fb4509e325f28",
729-
"sources": "5a7a36ae9536698c434ebe119feb374d721210fee68eb821a37ef3859b64b708"
728+
"jar": "1dee0481072d19c929b623e155e14d2f6085dc011529a0a0dbefc84cf571d865",
729+
"sources": "d5b4070a22c9b1ca5b9b5aa668466bcca391dbe5d5fe8311c300765c1621feba"
730730
},
731-
"version": "1.0.4"
731+
"version": "1.0.3"
732732
},
733733
"org.redisson:redisson": {
734734
"shasums": {
@@ -788,6 +788,12 @@
788788
"version": "0.6.0"
789789
}
790790
},
791+
"conflict_resolution": {
792+
"io.projectreactor:reactor-core:3.6.2": "io.projectreactor:reactor-core:3.6.6",
793+
"org.apache.commons:commons-lang3:3.14.0": "org.apache.commons:commons-lang3:3.17.0",
794+
"org.objenesis:objenesis:3.4": "org.objenesis:objenesis:3.3",
795+
"org.reactivestreams:reactive-streams:1.0.4": "org.reactivestreams:reactive-streams:1.0.3"
796+
},
791797
"dependencies": {
792798
"com.esotericsoftware:kryo": [
793799
"com.esotericsoftware:minlog",
@@ -981,6 +987,9 @@
981987
"io.opentelemetry:opentelemetry-api-incubator",
982988
"io.opentelemetry:opentelemetry-sdk-common"
983989
],
990+
"io.projectreactor:reactor-core": [
991+
"org.reactivestreams:reactive-streams"
992+
],
984993
"io.reactivex.rxjava3:rxjava": [
985994
"org.reactivestreams:reactive-streams"
986995
],
@@ -3105,5 +3114,167 @@
31053114
"org.zeromq:jeromq:jar:sources"
31063115
]
31073116
},
3117+
"services": {
3118+
"com.fasterxml.jackson.core:jackson-core": {
3119+
"com.fasterxml.jackson.core.JsonFactory": [
3120+
"com.fasterxml.jackson.core.JsonFactory"
3121+
]
3122+
},
3123+
"com.fasterxml.jackson.core:jackson-databind": {
3124+
"com.fasterxml.jackson.core.ObjectCodec": [
3125+
"com.fasterxml.jackson.databind.ObjectMapper"
3126+
]
3127+
},
3128+
"com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": {
3129+
"com.fasterxml.jackson.core.JsonFactory": [
3130+
"com.fasterxml.jackson.dataformat.yaml.YAMLFactory"
3131+
],
3132+
"com.fasterxml.jackson.core.ObjectCodec": [
3133+
"com.fasterxml.jackson.dataformat.yaml.YAMLMapper"
3134+
]
3135+
},
3136+
"com.google.auto.service:auto-service": {
3137+
"javax.annotation.processing.Processor": [
3138+
"com.google.auto.service.processor.AutoServiceProcessor"
3139+
]
3140+
},
3141+
"com.google.googlejavaformat:google-java-format": {
3142+
"java.util.spi.ToolProvider": [
3143+
"com.google.googlejavaformat.java.GoogleJavaFormatToolProvider"
3144+
],
3145+
"javax.tools.Tool": [
3146+
"com.google.googlejavaformat.java.GoogleJavaFormatTool"
3147+
]
3148+
},
3149+
"io.lettuce:lettuce-core": {
3150+
"io.lettuce.core.json.JsonParser": [
3151+
"io.lettuce.core.json.DefaultJsonParser"
3152+
],
3153+
"javax.enterprise.inject.spi.Extension": [
3154+
"io.lettuce.core.support.LettuceCdiExtension"
3155+
]
3156+
},
3157+
"io.netty:netty-common": {
3158+
"reactor.blockhound.integration.BlockHoundIntegration": [
3159+
"io.netty.util.internal.Hidden$NettyBlockHoundIntegration"
3160+
]
3161+
},
3162+
"io.opentelemetry:opentelemetry-exporter-logging": {
3163+
"io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider": [
3164+
"io.opentelemetry.exporter.logging.internal.ConsoleLogRecordExporterComponentProvider",
3165+
"io.opentelemetry.exporter.logging.internal.ConsoleMetricExporterComponentProvider",
3166+
"io.opentelemetry.exporter.logging.internal.ConsoleSpanExporterComponentProvider"
3167+
],
3168+
"io.opentelemetry.sdk.autoconfigure.spi.logs.ConfigurableLogRecordExporterProvider": [
3169+
"io.opentelemetry.exporter.logging.internal.ConsoleLogRecordExporterProvider",
3170+
"io.opentelemetry.exporter.logging.internal.LoggingLogRecordExporterProvider"
3171+
],
3172+
"io.opentelemetry.sdk.autoconfigure.spi.metrics.ConfigurableMetricExporterProvider": [
3173+
"io.opentelemetry.exporter.logging.internal.ConsoleMetricExporterProvider",
3174+
"io.opentelemetry.exporter.logging.internal.LoggingMetricExporterProvider"
3175+
],
3176+
"io.opentelemetry.sdk.autoconfigure.spi.traces.ConfigurableSpanExporterProvider": [
3177+
"io.opentelemetry.exporter.logging.internal.ConsoleSpanExporterProvider",
3178+
"io.opentelemetry.exporter.logging.internal.LoggingSpanExporterProvider"
3179+
]
3180+
},
3181+
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure": {
3182+
"io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider": [
3183+
"io.opentelemetry.sdk.autoconfigure.internal.EnvironmentResourceProvider"
3184+
]
3185+
},
3186+
"io.opentelemetry:opentelemetry-sdk-testing": {
3187+
"io.opentelemetry.context.ContextStorageProvider": [
3188+
"io.opentelemetry.sdk.testing.context.SettableContextStorageProvider"
3189+
]
3190+
},
3191+
"io.projectreactor:reactor-core": {
3192+
"io.micrometer.context.ContextAccessor": [
3193+
"reactor.util.context.ReactorContextAccessor"
3194+
],
3195+
"reactor.blockhound.integration.BlockHoundIntegration": [
3196+
"reactor.core.scheduler.ReactorBlockHoundIntegration"
3197+
]
3198+
},
3199+
"net.sf.saxon:Saxon-HE": {
3200+
"javax.xml.transform.TransformerFactory": [
3201+
"net.sf.saxon.TransformerFactoryImpl"
3202+
]
3203+
},
3204+
"org.apache.logging.log4j:log4j-api": {
3205+
"org.apache.logging.log4j.util.PropertySource": [
3206+
"org.apache.logging.log4j.util.EnvironmentPropertySource",
3207+
"org.apache.logging.log4j.util.SystemPropertiesPropertySource"
3208+
]
3209+
},
3210+
"org.apache.logging.log4j:log4j-core": {
3211+
"javax.annotation.processing.Processor": [
3212+
"org.apache.logging.log4j.core.config.plugins.processor.PluginProcessor"
3213+
],
3214+
"org.apache.logging.log4j.core.util.ContextDataProvider": [
3215+
"org.apache.logging.log4j.core.impl.ThreadContextDataProvider"
3216+
],
3217+
"org.apache.logging.log4j.message.ThreadDumpMessage$ThreadInfoFactory": [
3218+
"org.apache.logging.log4j.core.message.ExtendedThreadInfoFactory"
3219+
],
3220+
"org.apache.logging.log4j.spi.Provider": [
3221+
"org.apache.logging.log4j.core.impl.Log4jProvider"
3222+
]
3223+
},
3224+
"org.bouncycastle:bcprov-jdk18on": {
3225+
"java.security.Provider": [
3226+
"org.bouncycastle.jce.provider.BouncyCastleProvider",
3227+
"org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider"
3228+
]
3229+
},
3230+
"org.hsqldb:hsqldb": {
3231+
"java.sql.Driver": [
3232+
"org.hsqldb.jdbc.JDBCDriver"
3233+
]
3234+
},
3235+
"org.junit.jupiter:junit-jupiter-engine": {
3236+
"org.junit.platform.engine.TestEngine": [
3237+
"org.junit.jupiter.engine.JupiterTestEngine"
3238+
]
3239+
},
3240+
"org.junit.platform:junit-platform-engine": {
3241+
"org.junit.platform.engine.discovery.DiscoverySelectorIdentifierParser": [
3242+
"org.junit.platform.engine.discovery.ClassSelector$IdentifierParser",
3243+
"org.junit.platform.engine.discovery.ClasspathResourceSelector$IdentifierParser",
3244+
"org.junit.platform.engine.discovery.ClasspathRootSelector$IdentifierParser",
3245+
"org.junit.platform.engine.discovery.DirectorySelector$IdentifierParser",
3246+
"org.junit.platform.engine.discovery.FileSelector$IdentifierParser",
3247+
"org.junit.platform.engine.discovery.IterationSelector$IdentifierParser",
3248+
"org.junit.platform.engine.discovery.MethodSelector$IdentifierParser",
3249+
"org.junit.platform.engine.discovery.ModuleSelector$IdentifierParser",
3250+
"org.junit.platform.engine.discovery.NestedClassSelector$IdentifierParser",
3251+
"org.junit.platform.engine.discovery.NestedMethodSelector$IdentifierParser",
3252+
"org.junit.platform.engine.discovery.PackageSelector$IdentifierParser",
3253+
"org.junit.platform.engine.discovery.UniqueIdSelector$IdentifierParser",
3254+
"org.junit.platform.engine.discovery.UriSelector$IdentifierParser"
3255+
]
3256+
},
3257+
"org.junit.platform:junit-platform-launcher": {
3258+
"org.junit.platform.launcher.TestExecutionListener": [
3259+
"org.junit.platform.launcher.listeners.UniqueIdTrackingListener"
3260+
]
3261+
},
3262+
"org.junit.platform:junit-platform-reporting": {
3263+
"org.junit.platform.launcher.TestExecutionListener": [
3264+
"org.junit.platform.reporting.open.xml.OpenTestReportGeneratingListener"
3265+
]
3266+
},
3267+
"org.redisson:redisson": {
3268+
"javax.cache.spi.CachingProvider": [
3269+
"org.redisson.jcache.JCachingProvider"
3270+
]
3271+
},
3272+
"org.slf4j:slf4j-jdk14": {
3273+
"org.slf4j.spi.SLF4JServiceProvider": [
3274+
"org.slf4j.jul.JULServiceProvider"
3275+
]
3276+
}
3277+
},
3278+
"skipped": [],
31083279
"version": "2"
31093280
}

0 commit comments

Comments
 (0)