From 545a8c377b4c9711da130160d517796c3d597014 Mon Sep 17 00:00:00 2001 From: Dmitry Bushev Date: Fri, 9 Aug 2024 09:11:08 +0100 Subject: [PATCH 01/21] DRAFT: native image --- build.sbt | 25 +++- .../src/main/java/org/enso/ydoc/Main.java | 2 +- .../src/main/java/org/enso/ydoc/Sampling.java | 39 ----- .../org/enso/ydoc/jni-config.json | 17 +++ .../enso/ydoc/predefined-classes-config.json | 8 + .../org/enso/ydoc/proxy-config.json | 2 + .../org/enso/ydoc/reflect-config.json | 139 ++++++++++++++++++ .../org/enso/ydoc/resource-config.json | 97 ++++++++++++ .../org/enso/ydoc/serialization-config.json | 8 + project/NativeImage.scala | 6 +- 10 files changed, 297 insertions(+), 46 deletions(-) delete mode 100644 lib/java/ydoc-server/src/main/java/org/enso/ydoc/Sampling.java create mode 100644 lib/java/ydoc-server/src/main/resources/META-INF/native-image/org/enso/ydoc/jni-config.json create mode 100644 lib/java/ydoc-server/src/main/resources/META-INF/native-image/org/enso/ydoc/predefined-classes-config.json create mode 100644 lib/java/ydoc-server/src/main/resources/META-INF/native-image/org/enso/ydoc/proxy-config.json create mode 100644 lib/java/ydoc-server/src/main/resources/META-INF/native-image/org/enso/ydoc/reflect-config.json create mode 100644 lib/java/ydoc-server/src/main/resources/META-INF/native-image/org/enso/ydoc/resource-config.json create mode 100644 lib/java/ydoc-server/src/main/resources/META-INF/native-image/org/enso/ydoc/serialization-config.json diff --git a/build.sbt b/build.sbt index 5158291b3eb0..440758d27a68 100644 --- a/build.sbt +++ b/build.sbt @@ -1287,8 +1287,8 @@ lazy val `ydoc-server` = project ), libraryDependencies ++= Seq( "org.graalvm.truffle" % "truffle-api" % graalMavenPackagesVersion % "provided", - "org.graalvm.polyglot" % "inspect" % graalMavenPackagesVersion % "runtime", - "org.graalvm.polyglot" % "js" % graalMavenPackagesVersion % "runtime", + "org.graalvm.polyglot" % "inspect-community" % graalMavenPackagesVersion % "runtime", + "org.graalvm.polyglot" % "js-community" % graalMavenPackagesVersion % "runtime", "org.slf4j" % "slf4j-api" % slf4jVersion, "io.helidon.webclient" % "helidon-webclient-websocket" % helidonVersion, "io.helidon.webserver" % "helidon-webserver-websocket" % helidonVersion, @@ -1305,6 +1305,7 @@ lazy val `ydoc-server` = project Compile / run / connectInput := true, Compile / run / javaOptions := Seq( "-ea" + //"-agentlib:native-image-agent=config-merge-dir=/home/dbushev/projects/luna/enso/lib/java/ydoc-server/src/main/resources/META-INF/native-image/org/enso/ydoc" ), // We need to assembly the cmd line options here manually, because we need // to add path to this module, and adding that directly to the `modulePath` setting @@ -1336,9 +1337,27 @@ lazy val `ydoc-server` = project ) .taskValue ) + .settings( + NativeImage.smallJdk := None, + NativeImage.additionalCp := Seq.empty, + rebuildNativeImage := NativeImage + .buildNativeImage( + "ydoc", + staticOnLinux = true, + includeRuntime = false, + mainClass = Some("org.enso.ydoc.Main") + ) + .value, + buildNativeImage := NativeImage + .incrementalNativeImageBuild( + rebuildNativeImage, + "ydoc" + ) + .value + ) .dependsOn(`syntax-rust-definition`) .dependsOn(`logging-service-logback`) - .dependsOn(`profiling-utils`) +//.dependsOn(`profiling-utils`) lazy val `persistance` = (project in file("lib/java/persistance")) .settings( diff --git a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/Main.java b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/Main.java index 6481afd25360..e4341b7c63ba 100644 --- a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/Main.java +++ b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/Main.java @@ -16,7 +16,7 @@ public static void main(String[] args) throws Exception { "helidon.serialFilter.pattern", "javax.management.**;java.lang.**;java.rmi.**;javax.security.auth.Subject;!*"); - Sampling.init(); + //System.load("/tmp/libenso_parser.so"); var ydocHost = System.getenv(ENSO_YDOC_HOST); var ydocPort = System.getenv(ENSO_YDOC_PORT); diff --git a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/Sampling.java b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/Sampling.java deleted file mode 100644 index 87fb7b0e34e5..000000000000 --- a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/Sampling.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.enso.ydoc; - -import java.io.File; -import java.io.FileNotFoundException; -import java.io.IOException; -import org.enso.profiling.sampler.MethodsSampler; -import org.enso.profiling.sampler.OutputStreamSampler; - -public final class Sampling { - - private static final String SAMPLING_EXT = ".npss"; - - private Sampling() {} - - public static void init() throws FileNotFoundException { - var samplingPath = System.getProperty("sampling"); - if (samplingPath != null) { - if (!samplingPath.endsWith(SAMPLING_EXT)) { - samplingPath = samplingPath + SAMPLING_EXT; - } - var sampler = OutputStreamSampler.ofFile(new File(samplingPath)); - startSampling(sampler); - } - } - - private static void startSampling(MethodsSampler sampler) { - sampler.start(); - Runtime.getRuntime() - .addShutdownHook( - new Thread( - () -> { - try { - sampler.stop(); - } catch (IOException e) { - throw new RuntimeException(e); - } - })); - } -} diff --git a/lib/java/ydoc-server/src/main/resources/META-INF/native-image/org/enso/ydoc/jni-config.json b/lib/java/ydoc-server/src/main/resources/META-INF/native-image/org/enso/ydoc/jni-config.json new file mode 100644 index 000000000000..637373730e41 --- /dev/null +++ b/lib/java/ydoc-server/src/main/resources/META-INF/native-image/org/enso/ydoc/jni-config.json @@ -0,0 +1,17 @@ +[ +{ + "name":"java.lang.Class", + "methods":[{"name":"getClassLoader","parameterTypes":[] }] +}, +{ + "name":"java.lang.ClassLoader", + "methods":[{"name":"loadClass","parameterTypes":["java.lang.String"] }] +}, +{ + "name":"jdk.internal.loader.ClassLoaders$AppClassLoader" +}, +{ + "name":"sun.management.VMManagementImpl", + "fields":[{"name":"compTimeMonitoringSupport"}, {"name":"currentThreadCpuTimeSupport"}, {"name":"objectMonitorUsageSupport"}, {"name":"otherThreadCpuTimeSupport"}, {"name":"remoteDiagnosticCommandsSupport"}, {"name":"synchronizerUsageSupport"}, {"name":"threadAllocatedMemorySupport"}, {"name":"threadContentionMonitoringSupport"}] +} +] diff --git a/lib/java/ydoc-server/src/main/resources/META-INF/native-image/org/enso/ydoc/predefined-classes-config.json b/lib/java/ydoc-server/src/main/resources/META-INF/native-image/org/enso/ydoc/predefined-classes-config.json new file mode 100644 index 000000000000..0e79b2c5d837 --- /dev/null +++ b/lib/java/ydoc-server/src/main/resources/META-INF/native-image/org/enso/ydoc/predefined-classes-config.json @@ -0,0 +1,8 @@ +[ + { + "type":"agent-extracted", + "classes":[ + ] + } +] + diff --git a/lib/java/ydoc-server/src/main/resources/META-INF/native-image/org/enso/ydoc/proxy-config.json b/lib/java/ydoc-server/src/main/resources/META-INF/native-image/org/enso/ydoc/proxy-config.json new file mode 100644 index 000000000000..0d4f101c7a37 --- /dev/null +++ b/lib/java/ydoc-server/src/main/resources/META-INF/native-image/org/enso/ydoc/proxy-config.json @@ -0,0 +1,2 @@ +[ +] diff --git a/lib/java/ydoc-server/src/main/resources/META-INF/native-image/org/enso/ydoc/reflect-config.json b/lib/java/ydoc-server/src/main/resources/META-INF/native-image/org/enso/ydoc/reflect-config.json new file mode 100644 index 000000000000..54277c603f4e --- /dev/null +++ b/lib/java/ydoc-server/src/main/resources/META-INF/native-image/org/enso/ydoc/reflect-config.json @@ -0,0 +1,139 @@ +[ +{ + "name":"ch.qos.logback.classic.encoder.PatternLayoutEncoder", + "queryAllPublicMethods":true, + "methods":[{"name":"","parameterTypes":[] }] +}, +{ + "name":"ch.qos.logback.classic.pattern.DateConverter", + "methods":[{"name":"","parameterTypes":[] }] +}, +{ + "name":"ch.qos.logback.classic.pattern.LevelConverter", + "methods":[{"name":"","parameterTypes":[] }] +}, +{ + "name":"ch.qos.logback.classic.pattern.LineSeparatorConverter", + "methods":[{"name":"","parameterTypes":[] }] +}, +{ + "name":"ch.qos.logback.classic.pattern.LoggerConverter", + "methods":[{"name":"","parameterTypes":[] }] +}, +{ + "name":"ch.qos.logback.classic.pattern.MessageConverter", + "methods":[{"name":"","parameterTypes":[] }] +}, +{ + "name":"ch.qos.logback.classic.pattern.ThreadConverter", + "methods":[{"name":"","parameterTypes":[] }] +}, +{ + "name":"ch.qos.logback.core.ConsoleAppender", + "queryAllPublicMethods":true, + "methods":[{"name":"","parameterTypes":[] }] +}, +{ + "name":"ch.qos.logback.core.OutputStreamAppender", + "methods":[{"name":"setEncoder","parameterTypes":["ch.qos.logback.core.encoder.Encoder"] }] +}, +{ + "name":"ch.qos.logback.core.encoder.Encoder", + "methods":[{"name":"valueOf","parameterTypes":["java.lang.String"] }] +}, +{ + "name":"ch.qos.logback.core.encoder.LayoutWrappingEncoder", + "methods":[{"name":"setParent","parameterTypes":["ch.qos.logback.core.spi.ContextAware"] }] +}, +{ + "name":"ch.qos.logback.core.pattern.PatternLayoutEncoderBase", + "methods":[{"name":"setPattern","parameterTypes":["java.lang.String"] }] +}, +{ + "name":"ch.qos.logback.core.spi.ContextAware", + "methods":[{"name":"valueOf","parameterTypes":["java.lang.String"] }] +}, +{ + "name":"com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl", + "methods":[{"name":"","parameterTypes":[] }] +}, +{ + "name":"io.helidon.common.LazyValueImpl", + "fields":[{"name":"loaded"}, {"name":"theLock"}] +}, +{ + "name":"java.io.FilePermission" +}, +{ + "name":"java.lang.Class", + "methods":[{"name":"getModule","parameterTypes":[] }] +}, +{ + "name":"java.lang.Module", + "methods":[{"name":"getDescriptor","parameterTypes":[] }] +}, +{ + "name":"java.lang.RuntimePermission" +}, +{ + "name":"java.lang.Thread", + "fields":[{"name":"threadLocalRandomProbe"}] +}, +{ + "name":"java.lang.module.ModuleDescriptor", + "methods":[{"name":"rawVersion","parameterTypes":[] }] +}, +{ + "name":"java.net.NetPermission" +}, +{ + "name":"java.net.SocketPermission" +}, +{ + "name":"java.net.URLPermission", + "methods":[{"name":"","parameterTypes":["java.lang.String","java.lang.String"] }] +}, +{ + "name":"java.security.AllPermission" +}, +{ + "name":"java.security.SecurityPermission" +}, +{ + "name":"java.util.PropertyPermission" +}, +{ + "name":"java.util.concurrent.ForkJoinTask", + "fields":[{"name":"aux"}, {"name":"status"}] +}, +{ + "name":"java.util.concurrent.atomic.AtomicBoolean", + "fields":[{"name":"value"}] +}, +{ + "name":"java.util.concurrent.atomic.AtomicReference", + "fields":[{"name":"value"}] +}, +{ + "name":"java.util.concurrent.atomic.Striped64", + "fields":[{"name":"base"}, {"name":"cellsBusy"}] +}, +{ + "name":"javax.smartcardio.CardPermission" +}, +{ + "name":"jdk.internal.misc.Unsafe" +}, +{ + "name":"org.graalvm.polyglot.io.IOHelper", + "fields":[{"name":"ACCESS"}] +}, +{ + "name":"org.graalvm.polyglot.management.Management", + "fields":[{"name":"ACCESS"}] +}, +{ + "name":"sun.security.provider.SHA", + "methods":[{"name":"","parameterTypes":[] }] +} +] diff --git a/lib/java/ydoc-server/src/main/resources/META-INF/native-image/org/enso/ydoc/resource-config.json b/lib/java/ydoc-server/src/main/resources/META-INF/native-image/org/enso/ydoc/resource-config.json new file mode 100644 index 000000000000..b763adb99765 --- /dev/null +++ b/lib/java/ydoc-server/src/main/resources/META-INF/native-image/org/enso/ydoc/resource-config.json @@ -0,0 +1,97 @@ +{ + "resources":{ + "includes":[{ + "pattern":"\\QMETA-INF/helidon/feature-metadata.properties\\E" + }, { + "pattern":"\\QMETA-INF/helidon/serial-config.properties\\E" + }, { + "pattern":"\\QMETA-INF/services/ch.qos.logback.classic.spi.Configurator\\E" + }, { + "pattern":"\\QMETA-INF/services/com.oracle.truffle.api.TruffleLanguage$Provider\\E" + }, { + "pattern":"\\QMETA-INF/services/com.oracle.truffle.api.impl.TruffleLocator\\E" + }, { + "pattern":"\\QMETA-INF/services/com.oracle.truffle.api.instrumentation.TruffleInstrument$Provider\\E" + }, { + "pattern":"\\QMETA-INF/services/com.oracle.truffle.api.instrumentation.provider.TruffleInstrumentProvider\\E" + }, { + "pattern":"\\QMETA-INF/services/com.oracle.truffle.api.library.DefaultExportProvider\\E" + }, { + "pattern":"\\QMETA-INF/services/com.oracle.truffle.api.library.provider.DefaultExportProvider\\E" + }, { + "pattern":"\\QMETA-INF/services/com.oracle.truffle.api.object.LayoutFactory\\E" + }, { + "pattern":"\\QMETA-INF/services/com.oracle.truffle.api.provider.InternalResourceProvider\\E" + }, { + "pattern":"\\QMETA-INF/services/com.oracle.truffle.api.provider.TruffleLanguageProvider\\E" + }, { + "pattern":"\\QMETA-INF/services/com.oracle.truffle.runtime.EngineCacheSupport\\E" + }, { + "pattern":"\\QMETA-INF/services/com.oracle.truffle.runtime.FloodControlHandler\\E" + }, { + "pattern":"\\QMETA-INF/services/com.oracle.truffle.runtime.TruffleTypes\\E" + }, { + "pattern":"\\QMETA-INF/services/io.helidon.common.mapper.spi.MapperProvider\\E" + }, { + "pattern":"\\QMETA-INF/services/io.helidon.common.tls.spi.TlsManagerProvider\\E" + }, { + "pattern":"\\QMETA-INF/services/io.helidon.http.encoding.spi.ContentEncodingProvider\\E" + }, { + "pattern":"\\QMETA-INF/services/io.helidon.http.media.spi.MediaSupportProvider\\E" + }, { + "pattern":"\\QMETA-INF/services/io.helidon.logging.common.spi.LoggingProvider\\E" + }, { + "pattern":"\\QMETA-INF/services/io.helidon.webserver.http1.spi.Http1UpgradeProvider\\E" + }, { + "pattern":"\\QMETA-INF/services/io.helidon.webserver.spi.ProtocolConfigProvider\\E" + }, { + "pattern":"\\QMETA-INF/services/io.helidon.webserver.spi.ServerConnectionSelectorProvider\\E" + }, { + "pattern":"\\QMETA-INF/services/io.helidon.webserver.spi.ServerFeatureProvider\\E" + }, { + "pattern":"\\QMETA-INF/services/java.lang.System$LoggerFinder\\E" + }, { + "pattern":"\\QMETA-INF/services/java.net.spi.InetAddressResolverProvider\\E" + }, { + "pattern":"\\QMETA-INF/services/java.time.zone.ZoneRulesProvider\\E" + }, { + "pattern":"\\QMETA-INF/services/javax.xml.parsers.SAXParserFactory\\E" + }, { + "pattern":"\\QMETA-INF/services/jdk.vm.ci.services.JVMCIServiceLocator\\E" + }, { + "pattern":"\\QMETA-INF/services/org.slf4j.spi.SLF4JServiceProvider\\E" + }, { + "pattern":"\\Qlogback-test.xml\\E" + }, { + "pattern":"\\Qlogback.xml\\E" + }, { + "pattern":"jdk.jfr:\\Qjdk/jfr/internal/types/metadata.bin\\E" + }, { + "pattern":"org.enso.ydoc:\\Qorg/enso/ydoc/polyfill/parser.js\\E" + }, { + "pattern":"org.enso.ydoc:\\Qorg/enso/ydoc/polyfill/web/abort-controller.js\\E" + }, { + "pattern":"org.enso.ydoc:\\Qorg/enso/ydoc/polyfill/web/crypto.js\\E" + }, { + "pattern":"org.enso.ydoc:\\Qorg/enso/ydoc/polyfill/web/event-emitter.js\\E" + }, { + "pattern":"org.enso.ydoc:\\Qorg/enso/ydoc/polyfill/web/event-target.js\\E" + }, { + "pattern":"org.enso.ydoc:\\Qorg/enso/ydoc/polyfill/web/performance.js\\E" + }, { + "pattern":"org.enso.ydoc:\\Qorg/enso/ydoc/polyfill/web/timers.js\\E" + }, { + "pattern":"org.enso.ydoc:\\Qorg/enso/ydoc/polyfill/web/util.js\\E" + }, { + "pattern":"org.enso.ydoc:\\Qorg/enso/ydoc/polyfill/web/websocket.js\\E" + }, { + "pattern":"org.enso.ydoc:\\Qorg/enso/ydoc/ydocServer.js\\E" + }, { + "pattern":"org.graalvm.polyglot:\\QMETA-INF/graalvm/org.graalvm.polyglot/version\\E" + }, { + "pattern":"org.graalvm.truffle.runtime:\\QMETA-INF/resources/engine/libtruffleattach/linux/amd64/sha256\\E" + }, { + "pattern":"org.graalvm.truffle:\\QMETA-INF/graalvm/org.graalvm.truffle/version\\E" + }]}, + "bundles":[] +} diff --git a/lib/java/ydoc-server/src/main/resources/META-INF/native-image/org/enso/ydoc/serialization-config.json b/lib/java/ydoc-server/src/main/resources/META-INF/native-image/org/enso/ydoc/serialization-config.json new file mode 100644 index 000000000000..f3d7e06e3392 --- /dev/null +++ b/lib/java/ydoc-server/src/main/resources/META-INF/native-image/org/enso/ydoc/serialization-config.json @@ -0,0 +1,8 @@ +{ + "types":[ + ], + "lambdaCapturingTypes":[ + ], + "proxies":[ + ] +} diff --git a/project/NativeImage.scala b/project/NativeImage.scala index 367c01e8448e..4cb046e66b72 100644 --- a/project/NativeImage.scala +++ b/project/NativeImage.scala @@ -122,8 +122,6 @@ object NativeImage { log.info("Native image JAVA_HOME: " + javaHome) val subProjectRoot = baseDirectory.value - val pathToJAR = - (assembly / assemblyOutputPath).value.toPath.toAbsolutePath.normalize if (!nativeImagePathResolver(javaHome).toFile.exists()) { log.error( @@ -231,13 +229,15 @@ object NativeImage { buildMemoryLimitOptions ++ runtimeMemoryOptions ++ additionalOptions ++ - Seq("-o", targetLoc.toString()) + Seq("-o", targetLoc.toString) args = mainClass match { case Some(main) => args ++ Seq(main) case None => + val pathToJAR = + (assembly / assemblyOutputPath).value.toPath.toAbsolutePath.normalize args ++ Seq("-jar", pathToJAR.toString) } From 341dbba1944797f43a4d731d613d618d083609a8 Mon Sep 17 00:00:00 2001 From: Jaroslav Tulach Date: Fri, 9 Aug 2024 09:10:14 +0000 Subject: [PATCH 02/21] Cannot use musl on Linux --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 440758d27a68..59d07ec12524 100644 --- a/build.sbt +++ b/build.sbt @@ -1343,7 +1343,7 @@ lazy val `ydoc-server` = project rebuildNativeImage := NativeImage .buildNativeImage( "ydoc", - staticOnLinux = true, + staticOnLinux = false, includeRuntime = false, mainClass = Some("org.enso.ydoc.Main") ) From 5f38c3410d6eea5d20f6adee10fff22020c833cf Mon Sep 17 00:00:00 2001 From: Dmitry Bushev Date: Fri, 9 Aug 2024 10:25:13 +0100 Subject: [PATCH 03/21] DRAFT: native image config update --- .../META-INF/native-image/org/enso/ydoc/resource-config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/java/ydoc-server/src/main/resources/META-INF/native-image/org/enso/ydoc/resource-config.json b/lib/java/ydoc-server/src/main/resources/META-INF/native-image/org/enso/ydoc/resource-config.json index b763adb99765..a55c05c333a2 100644 --- a/lib/java/ydoc-server/src/main/resources/META-INF/native-image/org/enso/ydoc/resource-config.json +++ b/lib/java/ydoc-server/src/main/resources/META-INF/native-image/org/enso/ydoc/resource-config.json @@ -85,7 +85,7 @@ }, { "pattern":"org.enso.ydoc:\\Qorg/enso/ydoc/polyfill/web/websocket.js\\E" }, { - "pattern":"org.enso.ydoc:\\Qorg/enso/ydoc/ydocServer.js\\E" + "pattern":"org.enso.ydoc:\\Qorg/enso/ydoc/ydoc.cjs\\E" }, { "pattern":"org.graalvm.polyglot:\\QMETA-INF/graalvm/org.graalvm.polyglot/version\\E" }, { From 3722b8370d1984d823ec162f942d99241ae560dc Mon Sep 17 00:00:00 2001 From: Dmitry Bushev Date: Fri, 9 Aug 2024 14:47:56 +0100 Subject: [PATCH 04/21] fix: js resources loading --- .../src/main/java/org/enso/ydoc/Main.java | 2 -- .../src/main/java/org/enso/ydoc/Ydoc.java | 2 +- .../org/enso/ydoc/polyfill/PolyfillBase.java | 20 ------------------- .../ydoc/polyfill/web/AbortController.java | 14 +++++++++---- .../org/enso/ydoc/polyfill/web/Crypto.java | 13 ++++++++---- .../enso/ydoc/polyfill/web/EventEmitter.java | 14 +++++++++---- .../enso/ydoc/polyfill/web/EventTarget.java | 14 +++++++++---- .../enso/ydoc/polyfill/web/Performance.java | 14 +++++++++---- .../org/enso/ydoc/polyfill/web/Timers.java | 14 ++++++++++--- .../java/org/enso/ydoc/polyfill/web/Util.java | 13 ++++++++---- .../org/enso/ydoc/polyfill/web/WebSocket.java | 14 ++++++++++--- .../src/main/resources/logback.xml | 2 +- 12 files changed, 82 insertions(+), 54 deletions(-) delete mode 100644 lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/PolyfillBase.java diff --git a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/Main.java b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/Main.java index e4341b7c63ba..adf36cb7e905 100644 --- a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/Main.java +++ b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/Main.java @@ -16,8 +16,6 @@ public static void main(String[] args) throws Exception { "helidon.serialFilter.pattern", "javax.management.**;java.lang.**;java.rmi.**;javax.security.auth.Subject;!*"); - //System.load("/tmp/libenso_parser.so"); - var ydocHost = System.getenv(ENSO_YDOC_HOST); var ydocPort = System.getenv(ENSO_YDOC_PORT); diff --git a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/Ydoc.java b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/Ydoc.java index 088a9151e1ec..69a9e1947ab6 100644 --- a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/Ydoc.java +++ b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/Ydoc.java @@ -92,7 +92,7 @@ public Ydoc build() { } if (contextBuilder == null) { - contextBuilder = WebEnvironment.createContext().allowIO(IOAccess.ALL); + contextBuilder = WebEnvironment.createContext().allowIO(IOAccess.ALL).allowAllAccess(true); } if (hostname == null) { diff --git a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/PolyfillBase.java b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/PolyfillBase.java deleted file mode 100644 index 0ea18643d5ca..000000000000 --- a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/PolyfillBase.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.enso.ydoc.polyfill; - -import org.enso.ydoc.Polyfill; -import org.graalvm.polyglot.Context; -import org.graalvm.polyglot.Source; - -public abstract class PolyfillBase implements Polyfill { - private final String resourceName; - - protected PolyfillBase(String resourceName) { - this.resourceName = resourceName; - } - - @Override - public final void initialize(Context ctx) { - Source jsSource = Source.newBuilder("js", getClass().getResource(resourceName)).buildLiteral(); - - ctx.eval(jsSource).execute(this); - } -} diff --git a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/AbortController.java b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/AbortController.java index 5c3d5ceed38a..6fd1fd1dd7d2 100644 --- a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/AbortController.java +++ b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/AbortController.java @@ -1,7 +1,9 @@ package org.enso.ydoc.polyfill.web; +import org.enso.ydoc.Polyfill; import org.enso.ydoc.polyfill.Arguments; -import org.enso.ydoc.polyfill.PolyfillBase; +import org.graalvm.polyglot.Context; +import org.graalvm.polyglot.Source; import org.graalvm.polyglot.Value; import org.graalvm.polyglot.proxy.ProxyExecutable; import org.slf4j.Logger; @@ -12,13 +14,17 @@ * href="https://nodejs.org/api/globals.html#class-abortcontroller">AbortController Node.js * interface. */ -final class AbortController extends PolyfillBase implements ProxyExecutable { +final class AbortController implements Polyfill, ProxyExecutable { private static final Logger log = LoggerFactory.getLogger(AbortController.class); private static final String ABORT_CONTROLLER_JS = "abort-controller.js"; - AbortController() { - super(ABORT_CONTROLLER_JS); + @Override + public void initialize(Context ctx) { + Source jsSource = + Source.newBuilder("js", getClass().getResource(ABORT_CONTROLLER_JS)).buildLiteral(); + + ctx.eval(jsSource).execute(this); } @Override diff --git a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Crypto.java b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Crypto.java index 4c3cc29716a7..6edec6745388 100644 --- a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Crypto.java +++ b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Crypto.java @@ -1,15 +1,17 @@ package org.enso.ydoc.polyfill.web; import java.util.UUID; +import org.enso.ydoc.Polyfill; import org.enso.ydoc.polyfill.Arguments; -import org.enso.ydoc.polyfill.PolyfillBase; +import org.graalvm.polyglot.Context; +import org.graalvm.polyglot.Source; import org.graalvm.polyglot.Value; import org.graalvm.polyglot.proxy.ProxyExecutable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** Implements the Crypto Node.js interface. */ -final class Crypto extends PolyfillBase implements ProxyExecutable { +final class Crypto implements Polyfill, ProxyExecutable { private static final Logger log = LoggerFactory.getLogger(Crypto.class); @@ -17,8 +19,11 @@ final class Crypto extends PolyfillBase implements ProxyExecutable { private static final String CRYPTO_JS = "crypto.js"; - Crypto() { - super(CRYPTO_JS); + @Override + public void initialize(Context ctx) { + Source jsSource = Source.newBuilder("js", getClass().getResource(CRYPTO_JS)).buildLiteral(); + + ctx.eval(jsSource).execute(this); } @Override diff --git a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/EventEmitter.java b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/EventEmitter.java index e3e46427ea57..8812f4b3fc39 100644 --- a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/EventEmitter.java +++ b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/EventEmitter.java @@ -4,8 +4,10 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; +import org.enso.ydoc.Polyfill; import org.enso.ydoc.polyfill.Arguments; -import org.enso.ydoc.polyfill.PolyfillBase; +import org.graalvm.polyglot.Context; +import org.graalvm.polyglot.Source; import org.graalvm.polyglot.Value; import org.graalvm.polyglot.proxy.ProxyExecutable; import org.slf4j.Logger; @@ -15,7 +17,7 @@ * Implements the EventEmitter * Node.js interface. */ -final class EventEmitter extends PolyfillBase implements ProxyExecutable { +final class EventEmitter implements Polyfill, ProxyExecutable { private static final Logger log = LoggerFactory.getLogger(EventEmitter.class); @@ -27,8 +29,12 @@ final class EventEmitter extends PolyfillBase implements ProxyExecutable { private static final String EVENT_EMITTER_JS = "event-emitter.js"; - EventEmitter() { - super(EVENT_EMITTER_JS); + @Override + public void initialize(Context ctx) { + Source jsSource = + Source.newBuilder("js", getClass().getResource(EVENT_EMITTER_JS)).buildLiteral(); + + ctx.eval(jsSource).execute(this); } @Override diff --git a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/EventTarget.java b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/EventTarget.java index c5ee85375390..3d6f9aa3079d 100644 --- a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/EventTarget.java +++ b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/EventTarget.java @@ -3,8 +3,10 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; +import org.enso.ydoc.Polyfill; import org.enso.ydoc.polyfill.Arguments; -import org.enso.ydoc.polyfill.PolyfillBase; +import org.graalvm.polyglot.Context; +import org.graalvm.polyglot.Source; import org.graalvm.polyglot.Value; import org.graalvm.polyglot.proxy.ProxyExecutable; import org.slf4j.Logger; @@ -14,7 +16,7 @@ * Implements the EventTarget * Node.js interface. */ -final class EventTarget extends PolyfillBase implements ProxyExecutable { +final class EventTarget implements Polyfill, ProxyExecutable { private static final Logger log = LoggerFactory.getLogger(EventTarget.class); @@ -26,8 +28,12 @@ final class EventTarget extends PolyfillBase implements ProxyExecutable { private static final String EVENT_TARGET_JS = "event-target.js"; - EventTarget() { - super(EVENT_TARGET_JS); + @Override + public void initialize(Context ctx) { + Source jsSource = + Source.newBuilder("js", getClass().getResource(EVENT_TARGET_JS)).buildLiteral(); + + ctx.eval(jsSource).execute(this); } @Override diff --git a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Performance.java b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Performance.java index 0b60455fb029..611ff12467fa 100644 --- a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Performance.java +++ b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Performance.java @@ -1,7 +1,9 @@ package org.enso.ydoc.polyfill.web; +import org.enso.ydoc.Polyfill; import org.enso.ydoc.polyfill.Arguments; -import org.enso.ydoc.polyfill.PolyfillBase; +import org.graalvm.polyglot.Context; +import org.graalvm.polyglot.Source; import org.graalvm.polyglot.Value; import org.graalvm.polyglot.proxy.ProxyExecutable; import org.slf4j.Logger; @@ -11,7 +13,7 @@ * Implements the Performance measurement * Node.js API. */ -final class Performance extends PolyfillBase implements ProxyExecutable { +final class Performance implements Polyfill, ProxyExecutable { private static final Logger log = LoggerFactory.getLogger(Performance.class); @@ -19,8 +21,12 @@ final class Performance extends PolyfillBase implements ProxyExecutable { private static final String PERFORMANCE_JS = "performance.js"; - Performance() { - super(PERFORMANCE_JS); + @Override + public void initialize(Context ctx) { + Source jsSource = + Source.newBuilder("js", getClass().getResource(PERFORMANCE_JS)).buildLiteral(); + + ctx.eval(jsSource).execute(this); } @Override diff --git a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Timers.java b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Timers.java index 78fd33e8e8ae..37dca3d6ae79 100644 --- a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Timers.java +++ b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Timers.java @@ -3,15 +3,17 @@ import java.util.concurrent.Future; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; +import org.enso.ydoc.Polyfill; import org.enso.ydoc.polyfill.Arguments; -import org.enso.ydoc.polyfill.PolyfillBase; +import org.graalvm.polyglot.Context; +import org.graalvm.polyglot.Source; import org.graalvm.polyglot.Value; import org.graalvm.polyglot.proxy.ProxyExecutable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** Implements the Timers Node.js API. */ -final class Timers extends PolyfillBase implements ProxyExecutable { +final class Timers implements Polyfill, ProxyExecutable { private static final Logger log = LoggerFactory.getLogger(Timers.class); @@ -29,10 +31,16 @@ final class Timers extends PolyfillBase implements ProxyExecutable { private final ScheduledExecutorService executor; Timers(ScheduledExecutorService executor) { - super(TIMERS_JS); this.executor = executor; } + @Override + public void initialize(Context ctx) { + Source jsSource = Source.newBuilder("js", getClass().getResource(TIMERS_JS)).buildLiteral(); + + ctx.eval(jsSource).execute(this); + } + private Future setTimeout(Value func, long delay, Object[] args) { return executor.schedule(() -> func.executeVoid(args), delay, TIME_UNIT); } diff --git a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Util.java b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Util.java index 6cd771f47494..dc8685116a36 100644 --- a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Util.java +++ b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Util.java @@ -3,8 +3,10 @@ import java.nio.ByteBuffer; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; +import org.enso.ydoc.Polyfill; import org.enso.ydoc.polyfill.Arguments; -import org.enso.ydoc.polyfill.PolyfillBase; +import org.graalvm.polyglot.Context; +import org.graalvm.polyglot.Source; import org.graalvm.polyglot.Value; import org.graalvm.polyglot.io.ByteSequence; import org.graalvm.polyglot.proxy.ProxyExecutable; @@ -12,7 +14,7 @@ import org.slf4j.LoggerFactory; /** Implements the Util Node.js API. */ -final class Util extends PolyfillBase implements ProxyExecutable { +final class Util implements Polyfill, ProxyExecutable { private static final Logger log = LoggerFactory.getLogger(Util.class); @@ -21,8 +23,11 @@ final class Util extends PolyfillBase implements ProxyExecutable { private static final String UTIL_JS = "util.js"; - Util() { - super(UTIL_JS); + @Override + public void initialize(Context ctx) { + Source jsSource = Source.newBuilder("js", getClass().getResource(UTIL_JS)).buildLiteral(); + + ctx.eval(jsSource).execute(this); } @Override diff --git a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/WebSocket.java b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/WebSocket.java index ad423c31f91c..f2eb4ef5e498 100644 --- a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/WebSocket.java +++ b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/WebSocket.java @@ -15,8 +15,10 @@ import java.util.Optional; import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; +import org.enso.ydoc.Polyfill; import org.enso.ydoc.polyfill.Arguments; -import org.enso.ydoc.polyfill.PolyfillBase; +import org.graalvm.polyglot.Context; +import org.graalvm.polyglot.Source; import org.graalvm.polyglot.Value; import org.graalvm.polyglot.io.ByteSequence; import org.graalvm.polyglot.proxy.ProxyExecutable; @@ -27,7 +29,7 @@ * Implements the WebSocket and WebSocketServer interfaces of the ws NPM package. */ -final class WebSocket extends PolyfillBase implements ProxyExecutable { +final class WebSocket implements Polyfill, ProxyExecutable { private static final Logger log = LoggerFactory.getLogger(WebSocket.class); @@ -47,10 +49,16 @@ final class WebSocket extends PolyfillBase implements ProxyExecutable { private final ExecutorService executor; WebSocket(ExecutorService executor) { - super(WEBSOCKET_JS); this.executor = executor; } + @Override + public void initialize(Context ctx) { + Source jsSource = Source.newBuilder("js", getClass().getResource(WEBSOCKET_JS)).buildLiteral(); + + ctx.eval(jsSource).execute(this); + } + @Override public Object execute(Value... arguments) { var command = arguments[0].asString(); diff --git a/lib/java/ydoc-server/src/main/resources/logback.xml b/lib/java/ydoc-server/src/main/resources/logback.xml index 3ce331ce1a62..29389ba9cce1 100644 --- a/lib/java/ydoc-server/src/main/resources/logback.xml +++ b/lib/java/ydoc-server/src/main/resources/logback.xml @@ -11,7 +11,7 @@ - + From daea3bebc25d4ff4ebff784d0abd9332a7e4d1b2 Mon Sep 17 00:00:00 2001 From: Dmitry Bushev Date: Mon, 12 Aug 2024 12:36:02 +0100 Subject: [PATCH 05/21] add: test helidon native image build --- build.sbt | 68 +++++++++++++++++++ .../src/main/java/module-info.java | 6 ++ .../src/main/java/org/enso/ht/Main.java | 18 +++++ 3 files changed, 92 insertions(+) create mode 100644 lib/java/helidon-test/src/main/java/module-info.java create mode 100644 lib/java/helidon-test/src/main/java/org/enso/ht/Main.java diff --git a/build.sbt b/build.sbt index 59d07ec12524..dd3991bb03fd 100644 --- a/build.sbt +++ b/build.sbt @@ -1255,6 +1255,74 @@ lazy val searcher = project .dependsOn(testkit % Test) .dependsOn(`polyglot-api`) +lazy val `helidon-test` = project + .in(file("lib/java/helidon-test")) + .enablePlugins(JPMSPlugin) + .settings( + javaModuleName := "org.enso.ht", + Compile / exportJars := true, + crossPaths := false, + autoScalaLibrary := false, + // GraalVM and helidon modules (3rd party modules) + modulePath := { + JPMSUtils.filterModulesFromUpdate( + update.value, + helidon, + streams.value.log, + shouldContainAll = true + ) + }, + libraryDependencies ++= Seq( + "io.helidon.webclient" % "helidon-webclient-websocket" % helidonVersion, + "io.helidon.webserver" % "helidon-webserver-websocket" % helidonVersion + ) + ) + // `Compile/run` settings are necessary for the `run` task to work. + .settings( + Compile / run / fork := true, + Compile / run / connectInput := true, + Compile / run / javaOptions := Seq( + "-ea" + //"-agentlib:native-image-agent=config-merge-dir=/home/dbushev/projects/luna/enso/lib/java/ydoc-server/src/main/resources/META-INF/native-image/org/enso/ydoc" + ), + // We need to assembly the cmd line options here manually, because we need + // to add path to this module, and adding that directly to the `modulePath` setting + // would result in an sbt caught in an infinite recursion. + // + Compile / run / javaOptions ++= { + val mp = modulePath.value + val jar = (Compile / exportedProductJars).value.head + val modName = javaModuleName.value + val allMp = mp ++ Seq(jar.data.absolutePath) + val mainKlazz = (Compile / mainClass).value.get + val args = Seq( + "--module-path", + allMp.mkString(File.pathSeparator), + "--module", + modName + "/" + mainKlazz + ) + args + } + ) + .settings( + NativeImage.smallJdk := None, + NativeImage.additionalCp := Seq.empty, + rebuildNativeImage := NativeImage + .buildNativeImage( + "ht", + staticOnLinux = false, + includeRuntime = false, + mainClass = Some("org.enso.ht.Main") + ) + .value, + buildNativeImage := NativeImage + .incrementalNativeImageBuild( + rebuildNativeImage, + "ht" + ) + .value + ) + lazy val `ydoc-server` = project .in(file("lib/java/ydoc-server")) .enablePlugins(JPMSPlugin) diff --git a/lib/java/helidon-test/src/main/java/module-info.java b/lib/java/helidon-test/src/main/java/module-info.java new file mode 100644 index 000000000000..a4cacf010814 --- /dev/null +++ b/lib/java/helidon-test/src/main/java/module-info.java @@ -0,0 +1,6 @@ +module org.enso.ht { + requires io.helidon.webclient; + requires io.helidon.webclient.websocket; + requires io.helidon.webserver; + requires io.helidon.webserver.websocket; +} diff --git a/lib/java/helidon-test/src/main/java/org/enso/ht/Main.java b/lib/java/helidon-test/src/main/java/org/enso/ht/Main.java new file mode 100644 index 000000000000..0b949969d1ec --- /dev/null +++ b/lib/java/helidon-test/src/main/java/org/enso/ht/Main.java @@ -0,0 +1,18 @@ +package org.enso.ht; + +import io.helidon.webserver.WebServer; + +public class Main { + + private Main() {} + + public static void main(String[] args) throws Exception { + System.setProperty( + "helidon.serialFilter.pattern", + "javax.management.**;java.lang.**;java.rmi.**;javax.security.auth.Subject;!*"); + + var server = WebServer.builder().host("localhost").port(1235).build().start(); + + System.out.println("WebServer started."); + } +} From 50b9ba60fa42308054390d1eecefc1b6a6e3cc39 Mon Sep 17 00:00:00 2001 From: Dmitry Bushev Date: Mon, 12 Aug 2024 16:23:00 +0100 Subject: [PATCH 06/21] add: helidon native image+js --- build.sbt | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index dd3991bb03fd..90b592c1f622 100644 --- a/build.sbt +++ b/build.sbt @@ -1267,12 +1267,14 @@ lazy val `helidon-test` = project modulePath := { JPMSUtils.filterModulesFromUpdate( update.value, - helidon, + GraalVM.modules ++ GraalVM.jsPkgs ++ helidon, streams.value.log, shouldContainAll = true ) }, libraryDependencies ++= Seq( + "org.graalvm.truffle" % "truffle-api" % graalMavenPackagesVersion % "provided", + "org.graalvm.polyglot" % "js-community" % graalMavenPackagesVersion % "runtime", "io.helidon.webclient" % "helidon-webclient-websocket" % helidonVersion, "io.helidon.webserver" % "helidon-webserver-websocket" % helidonVersion ) @@ -1310,9 +1312,10 @@ lazy val `helidon-test` = project rebuildNativeImage := NativeImage .buildNativeImage( "ht", - staticOnLinux = false, - includeRuntime = false, - mainClass = Some("org.enso.ht.Main") + staticOnLinux = false, + includeRuntime = false, + mainClass = Some("org.enso.ht.Main"), + additionalOptions = Seq("--enable-preview") ) .value, buildNativeImage := NativeImage From 16a10c1fcb2f0203a0eb5616f36082935ca2c682 Mon Sep 17 00:00:00 2001 From: Jaroslav Tulach Date: Thu, 15 Aug 2024 08:53:36 +0000 Subject: [PATCH 07/21] Useful NI debugging options for ydoc-server --- build.sbt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 90b592c1f622..5d5fa8d76907 100644 --- a/build.sbt +++ b/build.sbt @@ -1416,7 +1416,13 @@ lazy val `ydoc-server` = project "ydoc", staticOnLinux = false, includeRuntime = false, - mainClass = Some("org.enso.ydoc.Main") + mainClass = Some("org.enso.ydoc.Main"), + additionalOptions = Seq( + // useful perf & debug switches: + // "-g", + // "-H:+SourceLevelDebug", + // "-H:-DeleteLocalSymbols", + ) ) .value, buildNativeImage := NativeImage From ede27941ec2dcb700e392a5df0ad7b25215353e0 Mon Sep 17 00:00:00 2001 From: Jaroslav Tulach Date: Thu, 15 Aug 2024 08:54:02 +0000 Subject: [PATCH 08/21] Debug ydoc server in VSCode --- .vscode/launch.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 8c6d1f8bede4..e17624d39b78 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -32,8 +32,8 @@ "type": "nativeimage", "request": "launch", "name": "Launch Native Image", - "nativeImagePath": "${workspaceFolder}/runner", - "args": "--run ${file}" + "nativeImagePath": "${workspaceFolder}/ydoc", + // "args": "" } ] } \ No newline at end of file From aabf41e51cf1cfd8ae27901572d85b8de8eac25f Mon Sep 17 00:00:00 2001 From: Jaroslav Tulach Date: Thu, 15 Aug 2024 08:54:51 +0000 Subject: [PATCH 09/21] Print stack trace of WebServer initialization exception --- .../main/java/org/enso/ydoc/polyfill/web/WebSocket.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/WebSocket.java b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/WebSocket.java index f2eb4ef5e498..71920e2c6c60 100644 --- a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/WebSocket.java +++ b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/WebSocket.java @@ -150,7 +150,12 @@ yield new WebSocketConnection( return connection; }); - yield WebServer.builder().host(host).port(port).addRouting(routing).build(); + try { + yield WebServer.builder().host(host).port(port).addRouting(routing).build(); + } catch (Exception ex) { + ex.printStackTrace(); + throw new IllegalStateException(ex); + } } case WEB_SOCKET_SERVER_START -> { From c032d9db5c0e083a7c1e0f9cfd68e8312c8e96d3 Mon Sep 17 00:00:00 2001 From: Jaroslav Tulach Date: Fri, 20 Sep 2024 07:23:27 +0200 Subject: [PATCH 10/21] Use Thread.ofPlatform() to workaround native image artificial limitations on using ofVirtual() --- build.sbt | 5 +-- .../src/main/java/module-info.java | 1 + .../ydoc/polyfill/web/Target_Executors.java | 36 +++++++++++++++++++ 3 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Target_Executors.java diff --git a/build.sbt b/build.sbt index 5d5fa8d76907..4b4172b5df17 100644 --- a/build.sbt +++ b/build.sbt @@ -1331,7 +1331,7 @@ lazy val `ydoc-server` = project .enablePlugins(JPMSPlugin) .configs(Test) .settings( - frgaalJavaCompilerSetting, + customFrgaalJavaCompilerSettings("21"), javaModuleName := "org.enso.ydoc", Compile / exportJars := true, crossPaths := false, @@ -1365,7 +1365,8 @@ lazy val `ydoc-server` = project "io.helidon.webserver" % "helidon-webserver-websocket" % helidonVersion, "junit" % "junit" % junitVersion % Test, "com.github.sbt" % "junit-interface" % junitIfVersion % Test, - "com.fasterxml.jackson.core" % "jackson-databind" % jacksonVersion % Test + "com.fasterxml.jackson.core" % "jackson-databind" % jacksonVersion % Test, + "org.graalvm.sdk" % "nativeimage" % graalMavenPackagesVersion % "provided" ) ) // `Compile/run` settings are necessary for the `run` task to work. diff --git a/lib/java/ydoc-server/src/main/java/module-info.java b/lib/java/ydoc-server/src/main/java/module-info.java index c46380283d65..58cfda23ce8b 100644 --- a/lib/java/ydoc-server/src/main/java/module-info.java +++ b/lib/java/ydoc-server/src/main/java/module-info.java @@ -7,6 +7,7 @@ requires org.enso.syntax; requires org.graalvm.polyglot; requires org.slf4j; + requires static org.graalvm.nativeimage; opens org.enso.ydoc.polyfill.web; diff --git a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Target_Executors.java b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Target_Executors.java new file mode 100644 index 000000000000..d6d33257e9f2 --- /dev/null +++ b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Target_Executors.java @@ -0,0 +1,36 @@ +package org.enso.ydoc.polyfill.web; + +import com.oracle.svm.core.annotate.Alias; +import com.oracle.svm.core.annotate.Substitute; +import com.oracle.svm.core.annotate.TargetClass; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.ThreadFactory; + +@TargetClass(className = "io.helidon.webserver.ServerListener") +final class Target_ServerListener { + @Substitute + private static ThreadFactory virtualThreadFactory() { + return Thread.ofPlatform().factory(); + } +} + +@TargetClass(className = "io.helidon.webserver.ThreadPerTaskExecutor") +final class HelidonExecutor { + @Alias + HelidonExecutor(ThreadFactory factory) {} + + @Substitute + public static HelidonExecutor create(ThreadFactory ignore) { + return new HelidonExecutor(Thread.ofPlatform().factory()); + } +} + +@TargetClass(Executors.class) +final class Target_Executors { + @Substitute + public static ExecutorService newVirtualThreadPerTaskExecutor() { + ThreadFactory factory = Thread.ofPlatform().name("Emulating loom", 0).factory(); + return Executors.newThreadPerTaskExecutor(factory); + } +} From 7f7738b8a712d88441c4b4668ddf8a946e7298f0 Mon Sep 17 00:00:00 2001 From: Jaroslav Tulach Date: Tue, 24 Sep 2024 06:38:54 +0200 Subject: [PATCH 11/21] Adjusting to future Helidon changes accepted in https://github.com/helidon-io/helidon/pull/9271 --- .../ydoc/polyfill/web/Target_Executors.java | 36 ------------------- .../polyfill/web/Target_ExecutorsFactory.java | 20 +++++++++++ 2 files changed, 20 insertions(+), 36 deletions(-) delete mode 100644 lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Target_Executors.java create mode 100644 lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Target_ExecutorsFactory.java diff --git a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Target_Executors.java b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Target_Executors.java deleted file mode 100644 index d6d33257e9f2..000000000000 --- a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Target_Executors.java +++ /dev/null @@ -1,36 +0,0 @@ -package org.enso.ydoc.polyfill.web; - -import com.oracle.svm.core.annotate.Alias; -import com.oracle.svm.core.annotate.Substitute; -import com.oracle.svm.core.annotate.TargetClass; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.ThreadFactory; - -@TargetClass(className = "io.helidon.webserver.ServerListener") -final class Target_ServerListener { - @Substitute - private static ThreadFactory virtualThreadFactory() { - return Thread.ofPlatform().factory(); - } -} - -@TargetClass(className = "io.helidon.webserver.ThreadPerTaskExecutor") -final class HelidonExecutor { - @Alias - HelidonExecutor(ThreadFactory factory) {} - - @Substitute - public static HelidonExecutor create(ThreadFactory ignore) { - return new HelidonExecutor(Thread.ofPlatform().factory()); - } -} - -@TargetClass(Executors.class) -final class Target_Executors { - @Substitute - public static ExecutorService newVirtualThreadPerTaskExecutor() { - ThreadFactory factory = Thread.ofPlatform().name("Emulating loom", 0).factory(); - return Executors.newThreadPerTaskExecutor(factory); - } -} diff --git a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Target_ExecutorsFactory.java b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Target_ExecutorsFactory.java new file mode 100644 index 000000000000..748e618091d4 --- /dev/null +++ b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Target_ExecutorsFactory.java @@ -0,0 +1,20 @@ +package org.enso.ydoc.polyfill.web; + +import com.oracle.svm.core.annotate.Substitute; +import com.oracle.svm.core.annotate.TargetClass; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.ThreadFactory; + +@TargetClass(className = "io.helidon.webserver.ExecutorsFactory") +final class Target_ExecutorsFactory { + @Substitute + private static ThreadFactory virtualThreadFactory() { + return Thread.ofPlatform().name("Emulating loom", 0).factory(); + } + + @Substitute + public static ExecutorService newLoomServerVirtualThreadPerTaskExecutor() { + return Executors.newThreadPerTaskExecutor(virtualThreadFactory()); + } +} From 546ac9c6edd67f8a343f98bbdb8ae569854f8a63 Mon Sep 17 00:00:00 2001 From: Jaroslav Tulach Date: Tue, 24 Sep 2024 06:47:22 +0200 Subject: [PATCH 12/21] Making the ExecutorsFactory substitutions conditional --- .../polyfill/web/Target_ExecutorsFactory.java | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Target_ExecutorsFactory.java b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Target_ExecutorsFactory.java index 748e618091d4..43a8c9b5e3ab 100644 --- a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Target_ExecutorsFactory.java +++ b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Target_ExecutorsFactory.java @@ -5,9 +5,14 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.ThreadFactory; +import java.util.function.Predicate; -@TargetClass(className = "io.helidon.webserver.ExecutorsFactory") +@TargetClass( + className = Target_ExecutorsFactory.CLASS_NAME, + onlyWith = Target_ExecutorsFactory.Available.class) final class Target_ExecutorsFactory { + static final String CLASS_NAME = "io.helidon.webserver.ExecutorsFactory"; + @Substitute private static ThreadFactory virtualThreadFactory() { return Thread.ofPlatform().name("Emulating loom", 0).factory(); @@ -17,4 +22,16 @@ private static ThreadFactory virtualThreadFactory() { public static ExecutorService newLoomServerVirtualThreadPerTaskExecutor() { return Executors.newThreadPerTaskExecutor(virtualThreadFactory()); } + + static final class Available implements Predicate { + @Override + public boolean test(Object t) { + try { + Class.forName(CLASS_NAME); + return true; + } catch (ClassNotFoundException e) { + return false; + } + } + } } From f87d467b4449fd6a4c44a1244ff8bd24eb75ee2b Mon Sep 17 00:00:00 2001 From: Jaroslav Tulach Date: Tue, 24 Sep 2024 06:56:43 +0200 Subject: [PATCH 13/21] Avoid non-substitution fields in Target_ExecutorsFactory --- .../org/enso/ydoc/polyfill/web/Target_ExecutorsFactory.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Target_ExecutorsFactory.java b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Target_ExecutorsFactory.java index 43a8c9b5e3ab..297ee49e8b49 100644 --- a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Target_ExecutorsFactory.java +++ b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Target_ExecutorsFactory.java @@ -8,11 +8,9 @@ import java.util.function.Predicate; @TargetClass( - className = Target_ExecutorsFactory.CLASS_NAME, + className = "io.helidon.webserver.ExecutorsFactory", onlyWith = Target_ExecutorsFactory.Available.class) final class Target_ExecutorsFactory { - static final String CLASS_NAME = "io.helidon.webserver.ExecutorsFactory"; - @Substitute private static ThreadFactory virtualThreadFactory() { return Thread.ofPlatform().name("Emulating loom", 0).factory(); @@ -27,7 +25,7 @@ static final class Available implements Predicate { @Override public boolean test(Object t) { try { - Class.forName(CLASS_NAME); + Class.forName("io.helidon.webserver.ExecutorsFactory"); return true; } catch (ClassNotFoundException e) { return false; From ee82801c2e418ce37b18ccff276c1d8d5b3009fc Mon Sep 17 00:00:00 2001 From: Jaroslav Tulach Date: Mon, 7 Oct 2024 08:38:42 +0200 Subject: [PATCH 14/21] Updating to Helidon 4.1.2 fixes ydoc-server/buildNativeImage --- build.sbt | 2 +- .../ydoc-server/src/main/java/module-info.java | 1 - .../polyfill/web/Target_ExecutorsFactory.java | 17 +---------------- 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/build.sbt b/build.sbt index 4b4172b5df17..1bed0c071840 100644 --- a/build.sbt +++ b/build.sbt @@ -457,7 +457,7 @@ val commons = Seq( // === Helidon ================================================================ val jakartaVersion = "2.0.1" -val helidonVersion = "4.0.8" +val helidonVersion = "4.1.2" val helidon = Seq( "io.helidon" % "helidon" % helidonVersion, "io.helidon.builder" % "helidon-builder-api" % helidonVersion, diff --git a/lib/java/ydoc-server/src/main/java/module-info.java b/lib/java/ydoc-server/src/main/java/module-info.java index 58cfda23ce8b..238adbca83d9 100644 --- a/lib/java/ydoc-server/src/main/java/module-info.java +++ b/lib/java/ydoc-server/src/main/java/module-info.java @@ -3,7 +3,6 @@ requires io.helidon.webclient.websocket; requires io.helidon.webserver; requires io.helidon.webserver.websocket; - requires org.enso.profiling; requires org.enso.syntax; requires org.graalvm.polyglot; requires org.slf4j; diff --git a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Target_ExecutorsFactory.java b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Target_ExecutorsFactory.java index 297ee49e8b49..748e618091d4 100644 --- a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Target_ExecutorsFactory.java +++ b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Target_ExecutorsFactory.java @@ -5,11 +5,8 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.ThreadFactory; -import java.util.function.Predicate; -@TargetClass( - className = "io.helidon.webserver.ExecutorsFactory", - onlyWith = Target_ExecutorsFactory.Available.class) +@TargetClass(className = "io.helidon.webserver.ExecutorsFactory") final class Target_ExecutorsFactory { @Substitute private static ThreadFactory virtualThreadFactory() { @@ -20,16 +17,4 @@ private static ThreadFactory virtualThreadFactory() { public static ExecutorService newLoomServerVirtualThreadPerTaskExecutor() { return Executors.newThreadPerTaskExecutor(virtualThreadFactory()); } - - static final class Available implements Predicate { - @Override - public boolean test(Object t) { - try { - Class.forName("io.helidon.webserver.ExecutorsFactory"); - return true; - } catch (ClassNotFoundException e) { - return false; - } - } - } } From ac023d7aa0a81363310e960fb38a31e36dc792d0 Mon Sep 17 00:00:00 2001 From: Jaroslav Tulach Date: Mon, 7 Oct 2024 10:24:05 +0200 Subject: [PATCH 15/21] Legal review for Helidon 4.1.2 --- distribution/engine/THIRD-PARTY/NOTICE | 64 +++++++++---------- .../NOTICES | 0 .../NOTICES | 2 + .../NOTICES | 0 .../NOTICES | 17 ++++- .../NOTICES | 0 .../NOTICES | 0 .../NOTICES | 4 ++ .../NOTICES | 2 - .../NOTICES | 0 .../NOTICES | 0 .../NOTICES | 0 .../NOTICES | 0 .../NOTICES | 0 .../NOTICES | 0 .../NOTICES | 0 .../NOTICES | 0 .../NOTICES | 0 .../NOTICES | 2 - .../NOTICES | 4 ++ .../NOTICES | 0 .../NOTICES | 0 .../NOTICES | 0 .../NOTICES | 0 .../NOTICES | 0 .../NOTICES | 2 + .../NOTICES | 0 .../NOTICES | 0 .../NOTICES | 0 .../NOTICES | 2 + .../NOTICES | 0 .../NOTICES | 11 ++++ .../NOTICES | 0 .../project-manager/THIRD-PARTY/NOTICE | 64 +++++++++---------- .../NOTICES | 0 .../NOTICES | 2 + .../NOTICES | 0 .../NOTICES | 2 - .../NOTICES | 0 .../NOTICES | 0 .../NOTICES | 4 ++ .../NOTICES | 2 - .../NOTICES | 0 .../NOTICES | 0 .../NOTICES | 0 .../NOTICES | 0 .../NOTICES | 0 .../NOTICES | 0 .../NOTICES | 0 .../NOTICES | 0 .../NOTICES | 7 -- .../NOTICES | 0 .../NOTICES | 2 - .../NOTICES | 4 ++ .../NOTICES | 0 .../NOTICES | 0 .../NOTICES | 0 .../NOTICES | 0 .../NOTICES | 0 .../NOTICES | 2 + .../NOTICES | 0 .../NOTICES | 0 .../NOTICES | 0 .../NOTICES | 0 .../NOTICES | 0 .../NOTICES | 9 +++ .../NOTICES | 7 -- .../NOTICES | 0 .../copyright-keep | 0 .../copyright-keep | 1 + .../copyright-keep | 6 +- .../copyright-keep | 1 - .../copyright-keep | 6 +- .../copyright-keep | 0 .../copyright-ignore | 0 .../copyright-keep | 4 +- .../copyright-keep | 11 ++-- .../copyright-ignore | 0 .../copyright-keep | 0 .../copyright-keep | 0 .../copyright-keep | 0 .../copyright-keep | 4 +- .../copyright-keep | 4 +- .../copyright-ignore | 0 .../copyright-keep | 8 +-- .../copyright-keep | 0 .../copyright-ignore | 0 .../copyright-keep | 8 +-- .../copyright-keep | 8 +-- .../copyright-ignore | 0 .../copyright-keep | 9 ++- .../copyright-keep | 20 ------ .../copyright-ignore | 0 .../copyright-keep | 2 + .../copyright-keep | 0 .../copyright-ignore | 0 .../copyright-keep | 0 .../copyright-keep | 0 .../copyright-ignore | 0 .../copyright-keep | 0 .../copyright-ignore | 0 .../copyright-keep | 0 .../copyright-keep | 5 -- .../copyright-keep | 1 + .../copyright-keep | 0 .../copyright-ignore | 0 .../copyright-keep | 10 +-- .../copyright-ignore | 0 .../copyright-keep | 8 +-- .../copyright-keep | 7 +- .../copyright-ignore | 0 .../copyright-keep | 0 .../copyright-keep | 6 ++ .../copyright-keep | 4 -- .../copyright-keep | 0 tools/legal-review/engine/report-state | 4 +- .../copyright-keep | 10 +++ .../copyright-keep | 5 -- .../copyright-keep | 11 ++++ .../copyright-keep | 6 +- .../copyright-keep | 33 +++++----- .../copyright-keep | 6 +- .../copyright-keep | 14 ++-- .../copyright-ignore | 0 .../copyright-keep | 22 ++++--- .../copyright-keep | 11 ++-- .../copyright-ignore | 0 .../copyright-keep | 14 ++-- .../copyright-keep | 12 ++-- .../copyright-keep | 14 ++-- .../copyright-keep | 4 +- .../copyright-keep | 4 +- .../copyright-ignore | 0 .../copyright-keep | 8 +-- .../copyright-keep | 2 +- .../copyright-keep | 5 -- .../copyright-ignore | 0 .../copyright-keep | 8 +-- .../copyright-keep | 4 -- .../copyright-keep | 5 ++ .../copyright-ignore | 0 .../copyright-keep | 9 ++- .../copyright-ignore | 2 - .../copyright-ignore | 0 .../copyright-keep | 42 ++++++++++++ .../io.helidon.helidon-4.0.8/copyright-keep | 4 -- .../io.helidon.helidon-4.1.2/copyright-keep | 8 +++ .../copyright-keep | 5 -- .../copyright-ignore | 1 + .../copyright-keep | 10 +++ .../copyright-keep | 9 +++ .../copyright-keep | 5 -- .../copyright-ignore | 1 + .../copyright-keep | 10 +++ .../copyright-ignore | 1 - .../copyright-keep | 3 - .../copyright-ignore | 0 .../copyright-keep | 6 ++ .../copyright-keep | 11 ++++ .../copyright-keep | 2 - .../copyright-keep | 4 ++ .../copyright-ignore | 0 .../copyright-keep | 10 +-- .../copyright-keep | 5 -- .../copyright-ignore | 0 .../copyright-keep | 5 ++ .../copyright-ignore | 0 .../copyright-keep | 6 +- .../copyright-ignore | 1 + .../copyright-keep | 6 ++ .../copyright-keep | 5 -- .../copyright-ignore | 0 .../copyright-keep | 5 ++ .../copyright-keep | 4 -- .../copyright-keep | 8 +++ .../legal-review/project-manager/report-state | 4 +- 176 files changed, 430 insertions(+), 312 deletions(-) rename distribution/engine/THIRD-PARTY/{io.helidon.builder.helidon-builder-api-4.0.8 => io.helidon.builder.helidon-builder-api-4.1.2}/NOTICES (100%) rename distribution/engine/THIRD-PARTY/{io.helidon.common.features.helidon-common-features-4.0.8 => io.helidon.common.features.helidon-common-features-4.1.2}/NOTICES (84%) rename distribution/engine/THIRD-PARTY/{io.helidon.common.features.helidon-common-features-api-4.0.8 => io.helidon.common.features.helidon-common-features-api-4.1.2}/NOTICES (100%) rename tools/legal-review/project-manager/io.helidon.common.helidon-common-4.0.8/copyright-keep => distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-4.1.2/NOTICES (93%) rename distribution/engine/THIRD-PARTY/{io.helidon.common.helidon-common-buffers-4.0.8 => io.helidon.common.helidon-common-buffers-4.1.2}/NOTICES (100%) rename distribution/engine/THIRD-PARTY/{io.helidon.common.helidon-common-config-4.0.8 => io.helidon.common.helidon-common-config-4.1.2}/NOTICES (100%) rename distribution/{project-manager/THIRD-PARTY/io.helidon.common.helidon-common-configurable-4.0.8 => engine/THIRD-PARTY/io.helidon.common.helidon-common-configurable-4.1.2}/NOTICES (84%) rename distribution/{project-manager/THIRD-PARTY/io.helidon.common.helidon-common-context-4.0.8 => engine/THIRD-PARTY/io.helidon.common.helidon-common-context-4.1.2}/NOTICES (85%) rename distribution/engine/THIRD-PARTY/{io.helidon.common.helidon-common-key-util-4.0.8 => io.helidon.common.helidon-common-key-util-4.1.2}/NOTICES (100%) rename distribution/engine/THIRD-PARTY/{io.helidon.common.helidon-common-mapper-4.0.8 => io.helidon.common.helidon-common-mapper-4.1.2}/NOTICES (100%) rename distribution/engine/THIRD-PARTY/{io.helidon.common.helidon-common-media-type-4.0.8 => io.helidon.common.helidon-common-media-type-4.1.2}/NOTICES (100%) rename distribution/engine/THIRD-PARTY/{io.helidon.common.helidon-common-parameters-4.0.8 => io.helidon.common.helidon-common-parameters-4.1.2}/NOTICES (100%) rename distribution/engine/THIRD-PARTY/{io.helidon.common.helidon-common-security-4.0.8 => io.helidon.common.helidon-common-security-4.1.2}/NOTICES (100%) rename distribution/engine/THIRD-PARTY/{io.helidon.common.helidon-common-socket-4.0.8 => io.helidon.common.helidon-common-socket-4.1.2}/NOTICES (100%) rename distribution/engine/THIRD-PARTY/{io.helidon.common.helidon-common-task-4.0.8 => io.helidon.common.helidon-common-task-4.1.2}/NOTICES (100%) rename distribution/engine/THIRD-PARTY/{io.helidon.common.helidon-common-tls-4.0.8 => io.helidon.common.helidon-common-tls-4.1.2}/NOTICES (100%) rename distribution/engine/THIRD-PARTY/{io.helidon.http.encoding.helidon-http-encoding-4.0.8 => io.helidon.common.helidon-common-types-4.1.2}/NOTICES (100%) rename distribution/{project-manager/THIRD-PARTY/io.helidon.common.helidon-common-uri-4.0.8 => engine/THIRD-PARTY/io.helidon.common.helidon-common-uri-4.1.2}/NOTICES (84%) rename distribution/engine/THIRD-PARTY/{io.helidon.config.helidon-config-4.0.8 => io.helidon.config.helidon-config-4.1.2}/NOTICES (90%) rename distribution/engine/THIRD-PARTY/{io.helidon.helidon-4.0.8 => io.helidon.helidon-4.1.2}/NOTICES (100%) rename distribution/engine/THIRD-PARTY/{io.helidon.http.media.helidon-http-media-4.0.8 => io.helidon.http.encoding.helidon-http-encoding-4.1.2}/NOTICES (100%) rename distribution/engine/THIRD-PARTY/{io.helidon.http.helidon-http-4.0.8 => io.helidon.http.helidon-http-4.1.2}/NOTICES (100%) rename distribution/engine/THIRD-PARTY/{io.helidon.webclient.helidon-webclient-http1-4.0.8 => io.helidon.http.media.helidon-http-media-4.1.2}/NOTICES (100%) rename distribution/engine/THIRD-PARTY/{io.helidon.inject.helidon-inject-api-4.0.8 => io.helidon.inject.helidon-inject-api-4.1.2}/NOTICES (100%) rename distribution/engine/THIRD-PARTY/{io.helidon.logging.helidon-logging-common-4.0.8 => io.helidon.logging.helidon-logging-common-4.1.2}/NOTICES (84%) rename distribution/engine/THIRD-PARTY/{io.helidon.webclient.helidon-webclient-4.0.8 => io.helidon.webclient.helidon-webclient-4.1.2}/NOTICES (100%) rename distribution/engine/THIRD-PARTY/{io.helidon.webclient.helidon-webclient-api-4.0.8 => io.helidon.webclient.helidon-webclient-api-4.1.2}/NOTICES (100%) rename distribution/engine/THIRD-PARTY/{io.helidon.webserver.helidon-webserver-websocket-4.0.8 => io.helidon.webclient.helidon-webclient-http1-4.1.2}/NOTICES (100%) rename distribution/{project-manager/THIRD-PARTY/io.helidon.webclient.helidon-webclient-websocket-4.0.8 => engine/THIRD-PARTY/io.helidon.webclient.helidon-webclient-websocket-4.1.2}/NOTICES (77%) rename distribution/engine/THIRD-PARTY/{io.helidon.webserver.helidon-webserver-4.0.8 => io.helidon.webserver.helidon-webserver-4.1.2}/NOTICES (100%) create mode 100644 distribution/engine/THIRD-PARTY/io.helidon.webserver.helidon-webserver-websocket-4.1.2/NOTICES rename distribution/engine/THIRD-PARTY/{io.helidon.common.helidon-common-types-4.0.8 => io.helidon.websocket.helidon-websocket-4.1.2}/NOTICES (100%) rename distribution/project-manager/THIRD-PARTY/{io.helidon.builder.helidon-builder-api-4.0.8 => io.helidon.builder.helidon-builder-api-4.1.2}/NOTICES (100%) rename distribution/project-manager/THIRD-PARTY/{io.helidon.common.features.helidon-common-features-4.0.8 => io.helidon.common.features.helidon-common-features-4.1.2}/NOTICES (84%) rename distribution/project-manager/THIRD-PARTY/{io.helidon.common.features.helidon-common-features-api-4.0.8 => io.helidon.common.features.helidon-common-features-api-4.1.2}/NOTICES (100%) rename distribution/{engine/THIRD-PARTY/io.helidon.common.helidon-common-4.0.8 => project-manager/THIRD-PARTY/io.helidon.common.helidon-common-4.1.2}/NOTICES (93%) rename distribution/project-manager/THIRD-PARTY/{io.helidon.common.helidon-common-buffers-4.0.8 => io.helidon.common.helidon-common-buffers-4.1.2}/NOTICES (100%) rename distribution/project-manager/THIRD-PARTY/{io.helidon.common.helidon-common-config-4.0.8 => io.helidon.common.helidon-common-config-4.1.2}/NOTICES (100%) rename distribution/{engine/THIRD-PARTY/io.helidon.common.helidon-common-configurable-4.0.8 => project-manager/THIRD-PARTY/io.helidon.common.helidon-common-configurable-4.1.2}/NOTICES (84%) rename distribution/{engine/THIRD-PARTY/io.helidon.common.helidon-common-context-4.0.8 => project-manager/THIRD-PARTY/io.helidon.common.helidon-common-context-4.1.2}/NOTICES (85%) rename distribution/project-manager/THIRD-PARTY/{io.helidon.common.helidon-common-key-util-4.0.8 => io.helidon.common.helidon-common-key-util-4.1.2}/NOTICES (100%) rename distribution/project-manager/THIRD-PARTY/{io.helidon.common.helidon-common-mapper-4.0.8 => io.helidon.common.helidon-common-mapper-4.1.2}/NOTICES (100%) rename distribution/project-manager/THIRD-PARTY/{io.helidon.common.helidon-common-media-type-4.0.8 => io.helidon.common.helidon-common-media-type-4.1.2}/NOTICES (100%) rename distribution/project-manager/THIRD-PARTY/{io.helidon.common.helidon-common-parameters-4.0.8 => io.helidon.common.helidon-common-parameters-4.1.2}/NOTICES (100%) rename distribution/project-manager/THIRD-PARTY/{io.helidon.common.helidon-common-security-4.0.8 => io.helidon.common.helidon-common-security-4.1.2}/NOTICES (100%) rename distribution/project-manager/THIRD-PARTY/{io.helidon.common.helidon-common-socket-4.0.8 => io.helidon.common.helidon-common-socket-4.1.2}/NOTICES (100%) rename distribution/project-manager/THIRD-PARTY/{io.helidon.common.helidon-common-task-4.0.8 => io.helidon.common.helidon-common-task-4.1.2}/NOTICES (100%) rename distribution/project-manager/THIRD-PARTY/{io.helidon.common.helidon-common-tls-4.0.8 => io.helidon.common.helidon-common-tls-4.1.2}/NOTICES (100%) delete mode 100644 distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-types-4.0.8/NOTICES rename distribution/project-manager/THIRD-PARTY/{io.helidon.http.encoding.helidon-http-encoding-4.0.8 => io.helidon.common.helidon-common-types-4.1.2}/NOTICES (100%) rename distribution/{engine/THIRD-PARTY/io.helidon.common.helidon-common-uri-4.0.8 => project-manager/THIRD-PARTY/io.helidon.common.helidon-common-uri-4.1.2}/NOTICES (84%) rename distribution/project-manager/THIRD-PARTY/{io.helidon.config.helidon-config-4.0.8 => io.helidon.config.helidon-config-4.1.2}/NOTICES (90%) rename distribution/project-manager/THIRD-PARTY/{io.helidon.helidon-4.0.8 => io.helidon.helidon-4.1.2}/NOTICES (100%) rename distribution/project-manager/THIRD-PARTY/{io.helidon.http.media.helidon-http-media-4.0.8 => io.helidon.http.encoding.helidon-http-encoding-4.1.2}/NOTICES (100%) rename distribution/project-manager/THIRD-PARTY/{io.helidon.http.helidon-http-4.0.8 => io.helidon.http.helidon-http-4.1.2}/NOTICES (100%) rename distribution/project-manager/THIRD-PARTY/{io.helidon.webclient.helidon-webclient-http1-4.0.8 => io.helidon.http.media.helidon-http-media-4.1.2}/NOTICES (100%) rename distribution/project-manager/THIRD-PARTY/{io.helidon.inject.helidon-inject-api-4.0.8 => io.helidon.inject.helidon-inject-api-4.1.2}/NOTICES (100%) rename distribution/project-manager/THIRD-PARTY/{io.helidon.logging.helidon-logging-common-4.0.8 => io.helidon.logging.helidon-logging-common-4.1.2}/NOTICES (84%) rename distribution/project-manager/THIRD-PARTY/{io.helidon.webclient.helidon-webclient-4.0.8 => io.helidon.webclient.helidon-webclient-4.1.2}/NOTICES (100%) rename distribution/project-manager/THIRD-PARTY/{io.helidon.webclient.helidon-webclient-api-4.0.8 => io.helidon.webclient.helidon-webclient-api-4.1.2}/NOTICES (100%) rename distribution/project-manager/THIRD-PARTY/{io.helidon.webserver.helidon-webserver-websocket-4.0.8 => io.helidon.webclient.helidon-webclient-http1-4.1.2}/NOTICES (100%) rename distribution/{engine/THIRD-PARTY/io.helidon.webclient.helidon-webclient-websocket-4.0.8 => project-manager/THIRD-PARTY/io.helidon.webclient.helidon-webclient-websocket-4.1.2}/NOTICES (100%) rename distribution/project-manager/THIRD-PARTY/{io.helidon.webserver.helidon-webserver-4.0.8 => io.helidon.webserver.helidon-webserver-4.1.2}/NOTICES (100%) create mode 100644 distribution/project-manager/THIRD-PARTY/io.helidon.webserver.helidon-webserver-websocket-4.1.2/NOTICES delete mode 100644 distribution/project-manager/THIRD-PARTY/io.helidon.websocket.helidon-websocket-4.0.8/NOTICES rename distribution/{engine/THIRD-PARTY/io.helidon.websocket.helidon-websocket-4.0.8 => project-manager/THIRD-PARTY/io.helidon.websocket.helidon-websocket-4.1.2}/NOTICES (100%) rename tools/legal-review/engine/{io.helidon.builder.helidon-builder-api-4.0.8 => io.helidon.builder.helidon-builder-api-4.1.2}/copyright-keep (100%) rename tools/legal-review/engine/{io.helidon.common.features.helidon-common-features-4.0.8 => io.helidon.common.features.helidon-common-features-4.1.2}/copyright-keep (84%) rename tools/legal-review/{project-manager/io.helidon.common.features.helidon-common-features-api-4.0.8 => engine/io.helidon.common.features.helidon-common-features-api-4.1.2}/copyright-keep (100%) rename tools/legal-review/engine/{io.helidon.common.helidon-common-4.0.8 => io.helidon.common.helidon-common-4.1.2}/copyright-keep (93%) rename tools/legal-review/engine/{io.helidon.common.helidon-common-buffers-4.0.8 => io.helidon.common.helidon-common-buffers-4.1.2}/copyright-keep (100%) rename tools/legal-review/engine/{io.helidon.common.helidon-common-config-4.0.8 => io.helidon.common.helidon-common-config-4.1.2}/copyright-keep (100%) rename tools/legal-review/engine/{io.helidon.common.helidon-common-configurable-4.0.8 => io.helidon.common.helidon-common-configurable-4.1.2}/copyright-ignore (100%) rename tools/legal-review/{project-manager/io.helidon.common.helidon-common-configurable-4.0.8 => engine/io.helidon.common.helidon-common-configurable-4.1.2}/copyright-keep (84%) rename tools/legal-review/{project-manager/io.helidon.common.helidon-common-context-4.0.8 => engine/io.helidon.common.helidon-common-context-4.1.2}/copyright-keep (85%) rename tools/legal-review/engine/{io.helidon.common.helidon-common-key-util-4.0.8 => io.helidon.common.helidon-common-key-util-4.1.2}/copyright-ignore (100%) rename tools/legal-review/engine/{io.helidon.common.helidon-common-key-util-4.0.8 => io.helidon.common.helidon-common-key-util-4.1.2}/copyright-keep (100%) rename tools/legal-review/engine/{io.helidon.common.helidon-common-mapper-4.0.8 => io.helidon.common.helidon-common-mapper-4.1.2}/copyright-keep (100%) rename tools/legal-review/engine/{io.helidon.common.helidon-common-media-type-4.0.8 => io.helidon.common.helidon-common-media-type-4.1.2}/copyright-keep (100%) rename tools/legal-review/{project-manager/io.helidon.common.helidon-common-parameters-4.0.8 => engine/io.helidon.common.helidon-common-parameters-4.1.2}/copyright-keep (100%) rename tools/legal-review/engine/{io.helidon.common.helidon-common-security-4.0.8 => io.helidon.common.helidon-common-security-4.1.2}/copyright-keep (100%) rename tools/legal-review/engine/{io.helidon.common.helidon-common-socket-4.0.8 => io.helidon.common.helidon-common-socket-4.1.2}/copyright-ignore (100%) rename tools/legal-review/{project-manager/io.helidon.common.helidon-common-socket-4.0.8 => engine/io.helidon.common.helidon-common-socket-4.1.2}/copyright-keep (100%) rename tools/legal-review/engine/{io.helidon.common.helidon-common-task-4.0.8 => io.helidon.common.helidon-common-task-4.1.2}/copyright-keep (100%) rename tools/legal-review/engine/{io.helidon.common.helidon-common-tls-4.0.8 => io.helidon.common.helidon-common-tls-4.1.2}/copyright-ignore (100%) rename tools/legal-review/engine/{io.helidon.webclient.helidon-webclient-http1-4.0.8 => io.helidon.common.helidon-common-tls-4.1.2}/copyright-keep (100%) rename tools/legal-review/engine/{io.helidon.webserver.helidon-webserver-websocket-4.0.8 => io.helidon.common.helidon-common-types-4.1.2}/copyright-keep (100%) rename tools/legal-review/engine/{io.helidon.common.helidon-common-uri-4.0.8 => io.helidon.common.helidon-common-uri-4.1.2}/copyright-ignore (100%) rename tools/legal-review/{project-manager/io.helidon.common.helidon-common-uri-4.0.8 => engine/io.helidon.common.helidon-common-uri-4.1.2}/copyright-keep (84%) delete mode 100644 tools/legal-review/engine/io.helidon.config.helidon-config-4.0.8/copyright-keep rename tools/legal-review/engine/{io.helidon.http.encoding.helidon-http-encoding-4.0.8 => io.helidon.config.helidon-config-4.1.2}/copyright-ignore (100%) rename tools/legal-review/{project-manager/io.helidon.config.helidon-config-4.0.8 => engine/io.helidon.config.helidon-config-4.1.2}/copyright-keep (90%) rename tools/legal-review/engine/{io.helidon.helidon-4.0.8 => io.helidon.helidon-4.1.2}/copyright-keep (100%) rename tools/legal-review/engine/{io.helidon.http.media.helidon-http-media-4.0.8 => io.helidon.http.encoding.helidon-http-encoding-4.1.2}/copyright-ignore (100%) rename tools/legal-review/engine/{io.helidon.common.helidon-common-tls-4.0.8 => io.helidon.http.encoding.helidon-http-encoding-4.1.2}/copyright-keep (100%) rename tools/legal-review/engine/{io.helidon.http.helidon-http-4.0.8 => io.helidon.http.helidon-http-4.1.2}/copyright-keep (100%) rename tools/legal-review/engine/{io.helidon.webclient.helidon-webclient-api-4.0.8 => io.helidon.http.media.helidon-http-media-4.1.2}/copyright-ignore (100%) rename tools/legal-review/engine/{io.helidon.http.encoding.helidon-http-encoding-4.0.8 => io.helidon.http.media.helidon-http-media-4.1.2}/copyright-keep (100%) rename tools/legal-review/engine/{io.helidon.inject.helidon-inject-api-4.0.8 => io.helidon.inject.helidon-inject-api-4.1.2}/copyright-ignore (100%) rename tools/legal-review/engine/{io.helidon.inject.helidon-inject-api-4.0.8 => io.helidon.inject.helidon-inject-api-4.1.2}/copyright-keep (100%) delete mode 100644 tools/legal-review/engine/io.helidon.logging.helidon-logging-common-4.0.8/copyright-keep rename tools/legal-review/{project-manager/io.helidon.logging.helidon-logging-common-4.0.8 => engine/io.helidon.logging.helidon-logging-common-4.1.2}/copyright-keep (84%) rename tools/legal-review/engine/{io.helidon.webclient.helidon-webclient-4.0.8 => io.helidon.webclient.helidon-webclient-4.1.2}/copyright-keep (100%) rename tools/legal-review/engine/{io.helidon.webclient.helidon-webclient-http1-4.0.8 => io.helidon.webclient.helidon-webclient-api-4.1.2}/copyright-ignore (100%) rename tools/legal-review/engine/{io.helidon.webclient.helidon-webclient-api-4.0.8 => io.helidon.webclient.helidon-webclient-api-4.1.2}/copyright-keep (100%) rename tools/legal-review/engine/{io.helidon.webclient.helidon-webclient-websocket-4.0.8 => io.helidon.webclient.helidon-webclient-http1-4.1.2}/copyright-ignore (100%) rename tools/legal-review/{project-manager/io.helidon.builder.helidon-builder-api-4.0.8 => engine/io.helidon.webclient.helidon-webclient-http1-4.1.2}/copyright-keep (100%) rename tools/legal-review/engine/{io.helidon.webclient.helidon-webclient-websocket-4.0.8 => io.helidon.webclient.helidon-webclient-websocket-4.1.2}/copyright-keep (77%) rename tools/legal-review/engine/{io.helidon.webserver.helidon-webserver-4.0.8 => io.helidon.webserver.helidon-webserver-4.1.2}/copyright-ignore (100%) rename tools/legal-review/engine/{io.helidon.webserver.helidon-webserver-4.0.8 => io.helidon.webserver.helidon-webserver-4.1.2}/copyright-keep (100%) create mode 100644 tools/legal-review/engine/io.helidon.webserver.helidon-webserver-websocket-4.1.2/copyright-keep delete mode 100644 tools/legal-review/engine/io.helidon.websocket.helidon-websocket-4.0.8/copyright-keep rename tools/legal-review/engine/{io.helidon.common.helidon-common-types-4.0.8 => io.helidon.websocket.helidon-websocket-4.1.2}/copyright-keep (100%) create mode 100644 tools/legal-review/project-manager/io.helidon.builder.helidon-builder-api-4.1.2/copyright-keep delete mode 100644 tools/legal-review/project-manager/io.helidon.common.features.helidon-common-features-4.0.8/copyright-keep create mode 100644 tools/legal-review/project-manager/io.helidon.common.features.helidon-common-features-4.1.2/copyright-keep rename tools/legal-review/{engine/io.helidon.common.features.helidon-common-features-api-4.0.8 => project-manager/io.helidon.common.features.helidon-common-features-api-4.1.2}/copyright-keep (100%) rename distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-4.0.8/NOTICES => tools/legal-review/project-manager/io.helidon.common.helidon-common-4.1.2/copyright-keep (50%) rename tools/legal-review/project-manager/{io.helidon.common.helidon-common-buffers-4.0.8 => io.helidon.common.helidon-common-buffers-4.1.2}/copyright-keep (100%) rename tools/legal-review/project-manager/{io.helidon.common.helidon-common-config-4.0.8 => io.helidon.common.helidon-common-config-4.1.2}/copyright-keep (100%) rename tools/legal-review/{engine/io.helidon.webserver.helidon-webserver-websocket-4.0.8 => project-manager/io.helidon.common.helidon-common-configurable-4.1.2}/copyright-ignore (100%) rename tools/legal-review/{engine/io.helidon.common.helidon-common-configurable-4.0.8 => project-manager/io.helidon.common.helidon-common-configurable-4.1.2}/copyright-keep (84%) rename tools/legal-review/{engine/io.helidon.common.helidon-common-context-4.0.8 => project-manager/io.helidon.common.helidon-common-context-4.1.2}/copyright-keep (85%) rename tools/legal-review/project-manager/{io.helidon.common.helidon-common-configurable-4.0.8 => io.helidon.common.helidon-common-key-util-4.1.2}/copyright-ignore (100%) rename tools/legal-review/project-manager/{io.helidon.common.helidon-common-key-util-4.0.8 => io.helidon.common.helidon-common-key-util-4.1.2}/copyright-keep (100%) rename tools/legal-review/project-manager/{io.helidon.common.helidon-common-mapper-4.0.8 => io.helidon.common.helidon-common-mapper-4.1.2}/copyright-keep (100%) rename tools/legal-review/project-manager/{io.helidon.common.helidon-common-media-type-4.0.8 => io.helidon.common.helidon-common-media-type-4.1.2}/copyright-keep (100%) rename tools/legal-review/{engine/io.helidon.common.helidon-common-parameters-4.0.8 => project-manager/io.helidon.common.helidon-common-parameters-4.1.2}/copyright-keep (100%) rename tools/legal-review/project-manager/{io.helidon.common.helidon-common-security-4.0.8 => io.helidon.common.helidon-common-security-4.1.2}/copyright-keep (100%) rename tools/legal-review/project-manager/{io.helidon.common.helidon-common-key-util-4.0.8 => io.helidon.common.helidon-common-socket-4.1.2}/copyright-ignore (100%) rename tools/legal-review/{engine/io.helidon.common.helidon-common-socket-4.0.8 => project-manager/io.helidon.common.helidon-common-socket-4.1.2}/copyright-keep (100%) rename tools/legal-review/project-manager/{io.helidon.common.helidon-common-task-4.0.8 => io.helidon.common.helidon-common-task-4.1.2}/copyright-keep (100%) delete mode 100644 tools/legal-review/project-manager/io.helidon.common.helidon-common-tls-4.0.8/copyright-keep rename tools/legal-review/project-manager/{io.helidon.common.helidon-common-socket-4.0.8 => io.helidon.common.helidon-common-tls-4.1.2}/copyright-ignore (100%) rename tools/legal-review/{engine/io.helidon.http.media.helidon-http-media-4.0.8 => project-manager/io.helidon.common.helidon-common-tls-4.1.2}/copyright-keep (100%) delete mode 100644 tools/legal-review/project-manager/io.helidon.common.helidon-common-types-4.0.8/copyright-keep create mode 100644 tools/legal-review/project-manager/io.helidon.common.helidon-common-types-4.1.2/copyright-keep rename tools/legal-review/project-manager/{io.helidon.common.helidon-common-tls-4.0.8 => io.helidon.common.helidon-common-uri-4.1.2}/copyright-ignore (100%) rename tools/legal-review/{engine/io.helidon.common.helidon-common-uri-4.0.8 => project-manager/io.helidon.common.helidon-common-uri-4.1.2}/copyright-keep (84%) delete mode 100644 tools/legal-review/project-manager/io.helidon.config.helidon-config-4.0.8/copyright-ignore rename tools/legal-review/project-manager/{io.helidon.common.helidon-common-uri-4.0.8 => io.helidon.config.helidon-config-4.1.2}/copyright-ignore (100%) create mode 100644 tools/legal-review/project-manager/io.helidon.config.helidon-config-4.1.2/copyright-keep delete mode 100644 tools/legal-review/project-manager/io.helidon.helidon-4.0.8/copyright-keep create mode 100644 tools/legal-review/project-manager/io.helidon.helidon-4.1.2/copyright-keep delete mode 100644 tools/legal-review/project-manager/io.helidon.http.encoding.helidon-http-encoding-4.0.8/copyright-keep rename tools/legal-review/project-manager/{io.helidon.webserver.helidon-webserver-websocket-4.0.8 => io.helidon.http.encoding.helidon-http-encoding-4.1.2}/copyright-ignore (50%) create mode 100644 tools/legal-review/project-manager/io.helidon.http.encoding.helidon-http-encoding-4.1.2/copyright-keep rename tools/legal-review/project-manager/{io.helidon.http.helidon-http-4.0.8 => io.helidon.http.helidon-http-4.1.2}/copyright-keep (50%) delete mode 100644 tools/legal-review/project-manager/io.helidon.http.media.helidon-http-media-4.0.8/copyright-keep rename tools/legal-review/project-manager/{io.helidon.webclient.helidon-webclient-websocket-4.0.8 => io.helidon.http.media.helidon-http-media-4.1.2}/copyright-ignore (50%) create mode 100644 tools/legal-review/project-manager/io.helidon.http.media.helidon-http-media-4.1.2/copyright-keep delete mode 100644 tools/legal-review/project-manager/io.helidon.inject.helidon-inject-api-4.0.8/copyright-ignore delete mode 100644 tools/legal-review/project-manager/io.helidon.inject.helidon-inject-api-4.0.8/copyright-keep rename tools/legal-review/{engine/io.helidon.config.helidon-config-4.0.8 => project-manager/io.helidon.inject.helidon-inject-api-4.1.2}/copyright-ignore (100%) create mode 100644 tools/legal-review/project-manager/io.helidon.inject.helidon-inject-api-4.1.2/copyright-keep create mode 100644 tools/legal-review/project-manager/io.helidon.logging.helidon-logging-common-4.1.2/copyright-keep delete mode 100644 tools/legal-review/project-manager/io.helidon.webclient.helidon-webclient-4.0.8/copyright-keep create mode 100644 tools/legal-review/project-manager/io.helidon.webclient.helidon-webclient-4.1.2/copyright-keep rename tools/legal-review/project-manager/{io.helidon.http.encoding.helidon-http-encoding-4.0.8 => io.helidon.webclient.helidon-webclient-api-4.1.2}/copyright-ignore (100%) rename tools/legal-review/project-manager/{io.helidon.webclient.helidon-webclient-api-4.0.8 => io.helidon.webclient.helidon-webclient-api-4.1.2}/copyright-keep (100%) delete mode 100644 tools/legal-review/project-manager/io.helidon.webclient.helidon-webclient-http1-4.0.8/copyright-keep rename tools/legal-review/project-manager/{io.helidon.http.media.helidon-http-media-4.0.8 => io.helidon.webclient.helidon-webclient-http1-4.1.2}/copyright-ignore (100%) create mode 100644 tools/legal-review/project-manager/io.helidon.webclient.helidon-webclient-http1-4.1.2/copyright-keep rename tools/legal-review/project-manager/{io.helidon.webclient.helidon-webclient-api-4.0.8 => io.helidon.webclient.helidon-webclient-websocket-4.1.2}/copyright-ignore (100%) rename tools/legal-review/project-manager/{io.helidon.webclient.helidon-webclient-websocket-4.0.8 => io.helidon.webclient.helidon-webclient-websocket-4.1.2}/copyright-keep (100%) rename tools/legal-review/project-manager/{io.helidon.webserver.helidon-webserver-4.0.8 => io.helidon.webserver.helidon-webserver-4.1.2}/copyright-ignore (50%) rename tools/legal-review/project-manager/{io.helidon.webserver.helidon-webserver-4.0.8 => io.helidon.webserver.helidon-webserver-4.1.2}/copyright-keep (50%) delete mode 100644 tools/legal-review/project-manager/io.helidon.webserver.helidon-webserver-websocket-4.0.8/copyright-keep rename tools/legal-review/project-manager/{io.helidon.webclient.helidon-webclient-http1-4.0.8 => io.helidon.webserver.helidon-webserver-websocket-4.1.2}/copyright-ignore (100%) create mode 100644 tools/legal-review/project-manager/io.helidon.webserver.helidon-webserver-websocket-4.1.2/copyright-keep delete mode 100644 tools/legal-review/project-manager/io.helidon.websocket.helidon-websocket-4.0.8/copyright-keep create mode 100644 tools/legal-review/project-manager/io.helidon.websocket.helidon-websocket-4.1.2/copyright-keep diff --git a/distribution/engine/THIRD-PARTY/NOTICE b/distribution/engine/THIRD-PARTY/NOTICE index ab7e36138b04..73506659c0fc 100644 --- a/distribution/engine/THIRD-PARTY/NOTICE +++ b/distribution/engine/THIRD-PARTY/NOTICE @@ -208,162 +208,162 @@ Copyright notices related to this dependency can be found in the directory `io.g 'helidon-builder-api', licensed under the Apache 2.0, is distributed with the engine. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.builder.helidon-builder-api-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.builder.helidon-builder-api-4.1.2`. 'helidon-common-features', licensed under the Apache 2.0, is distributed with the engine. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.common.features.helidon-common-features-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.common.features.helidon-common-features-4.1.2`. 'helidon-common-features-api', licensed under the Apache 2.0, is distributed with the engine. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.common.features.helidon-common-features-api-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.common.features.helidon-common-features-api-4.1.2`. 'helidon-common', licensed under the Apache 2.0, is distributed with the engine. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-4.1.2`. 'helidon-common-buffers', licensed under the Apache 2.0, is distributed with the engine. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-buffers-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-buffers-4.1.2`. 'helidon-common-config', licensed under the Apache 2.0, is distributed with the engine. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-config-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-config-4.1.2`. 'helidon-common-configurable', licensed under the Apache 2.0, is distributed with the engine. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-configurable-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-configurable-4.1.2`. 'helidon-common-context', licensed under the Apache 2.0, is distributed with the engine. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-context-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-context-4.1.2`. 'helidon-common-key-util', licensed under the Apache 2.0, is distributed with the engine. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-key-util-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-key-util-4.1.2`. 'helidon-common-mapper', licensed under the Apache 2.0, is distributed with the engine. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-mapper-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-mapper-4.1.2`. 'helidon-common-media-type', licensed under the Apache 2.0, is distributed with the engine. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-media-type-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-media-type-4.1.2`. 'helidon-common-parameters', licensed under the Apache 2.0, is distributed with the engine. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-parameters-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-parameters-4.1.2`. 'helidon-common-security', licensed under the Apache 2.0, is distributed with the engine. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-security-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-security-4.1.2`. 'helidon-common-socket', licensed under the Apache 2.0, is distributed with the engine. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-socket-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-socket-4.1.2`. 'helidon-common-task', licensed under the Apache 2.0, is distributed with the engine. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-task-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-task-4.1.2`. 'helidon-common-tls', licensed under the Apache 2.0, is distributed with the engine. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-tls-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-tls-4.1.2`. 'helidon-common-types', licensed under the Apache 2.0, is distributed with the engine. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-types-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-types-4.1.2`. 'helidon-common-uri', licensed under the Apache 2.0, is distributed with the engine. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-uri-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-uri-4.1.2`. 'helidon-config', licensed under the Apache 2.0, is distributed with the engine. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.config.helidon-config-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.config.helidon-config-4.1.2`. 'helidon', licensed under the Apache 2.0, is distributed with the engine. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.helidon-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.helidon-4.1.2`. 'helidon-http-encoding', licensed under the Apache 2.0, is distributed with the engine. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.http.encoding.helidon-http-encoding-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.http.encoding.helidon-http-encoding-4.1.2`. 'helidon-http', licensed under the Apache 2.0, is distributed with the engine. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.http.helidon-http-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.http.helidon-http-4.1.2`. 'helidon-http-media', licensed under the Apache 2.0, is distributed with the engine. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.http.media.helidon-http-media-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.http.media.helidon-http-media-4.1.2`. 'helidon-inject-api', licensed under the Apache 2.0, is distributed with the engine. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.inject.helidon-inject-api-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.inject.helidon-inject-api-4.1.2`. 'helidon-logging-common', licensed under the Apache 2.0, is distributed with the engine. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.logging.helidon-logging-common-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.logging.helidon-logging-common-4.1.2`. 'helidon-webclient', licensed under the Apache 2.0, is distributed with the engine. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.webclient.helidon-webclient-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.webclient.helidon-webclient-4.1.2`. 'helidon-webclient-api', licensed under the Apache 2.0, is distributed with the engine. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.webclient.helidon-webclient-api-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.webclient.helidon-webclient-api-4.1.2`. 'helidon-webclient-http1', licensed under the Apache 2.0, is distributed with the engine. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.webclient.helidon-webclient-http1-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.webclient.helidon-webclient-http1-4.1.2`. 'helidon-webclient-websocket', licensed under the Apache 2.0, is distributed with the engine. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.webclient.helidon-webclient-websocket-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.webclient.helidon-webclient-websocket-4.1.2`. 'helidon-webserver', licensed under the Apache 2.0, is distributed with the engine. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.webserver.helidon-webserver-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.webserver.helidon-webserver-4.1.2`. 'helidon-webserver-websocket', licensed under the Apache 2.0, is distributed with the engine. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.webserver.helidon-webserver-websocket-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.webserver.helidon-webserver-websocket-4.1.2`. 'helidon-websocket', licensed under the Apache 2.0, is distributed with the engine. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.websocket.helidon-websocket-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.websocket.helidon-websocket-4.1.2`. 'directory-watcher', licensed under the Apache-2.0, is distributed with the engine. diff --git a/distribution/engine/THIRD-PARTY/io.helidon.builder.helidon-builder-api-4.0.8/NOTICES b/distribution/engine/THIRD-PARTY/io.helidon.builder.helidon-builder-api-4.1.2/NOTICES similarity index 100% rename from distribution/engine/THIRD-PARTY/io.helidon.builder.helidon-builder-api-4.0.8/NOTICES rename to distribution/engine/THIRD-PARTY/io.helidon.builder.helidon-builder-api-4.1.2/NOTICES diff --git a/distribution/engine/THIRD-PARTY/io.helidon.common.features.helidon-common-features-4.0.8/NOTICES b/distribution/engine/THIRD-PARTY/io.helidon.common.features.helidon-common-features-4.1.2/NOTICES similarity index 84% rename from distribution/engine/THIRD-PARTY/io.helidon.common.features.helidon-common-features-4.0.8/NOTICES rename to distribution/engine/THIRD-PARTY/io.helidon.common.features.helidon-common-features-4.1.2/NOTICES index 81b7ff436e4d..330f40d1d659 100644 --- a/distribution/engine/THIRD-PARTY/io.helidon.common.features.helidon-common-features-4.0.8/NOTICES +++ b/distribution/engine/THIRD-PARTY/io.helidon.common.features.helidon-common-features-4.1.2/NOTICES @@ -7,3 +7,5 @@ Copyright (c) 2022 Oracle and/or its affiliates. Copyright (c) 2022, 2023 Oracle and/or its affiliates. Copyright (c) 2022, 2024 Oracle and/or its affiliates. + +Copyright (c) 2024 Oracle and/or its affiliates. diff --git a/distribution/engine/THIRD-PARTY/io.helidon.common.features.helidon-common-features-api-4.0.8/NOTICES b/distribution/engine/THIRD-PARTY/io.helidon.common.features.helidon-common-features-api-4.1.2/NOTICES similarity index 100% rename from distribution/engine/THIRD-PARTY/io.helidon.common.features.helidon-common-features-api-4.0.8/NOTICES rename to distribution/engine/THIRD-PARTY/io.helidon.common.features.helidon-common-features-api-4.1.2/NOTICES diff --git a/tools/legal-review/project-manager/io.helidon.common.helidon-common-4.0.8/copyright-keep b/distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-4.1.2/NOTICES similarity index 93% rename from tools/legal-review/project-manager/io.helidon.common.helidon-common-4.0.8/copyright-keep rename to distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-4.1.2/NOTICES index 586cce6cb823..194f020204ef 100644 --- a/tools/legal-review/project-manager/io.helidon.common.helidon-common-4.0.8/copyright-keep +++ b/distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-4.1.2/NOTICES @@ -1,16 +1,29 @@ Copyright (c) 2017, 2021 Oracle and/or its affiliates. -Copyright (c) 2017, 2024 Oracle and/or its affiliates. + Copyright (c) 2017, 2022 Oracle and/or its affiliates. -Copyright (c) 2017, 2023 Oracle and/or its affiliates. + +Copyright (c) 2017, 2024 Oracle and/or its affiliates. + Copyright (c) 2018, 2021 Oracle and/or its affiliates. + Copyright (c) 2018, 2024 Oracle and/or its affiliates. + Copyright (c) 2019, 2020 Oracle and/or its affiliates. + Copyright (c) 2019, 2021 Oracle and/or its affiliates. + Copyright (c) 2019, 2022 Oracle and/or its affiliates. + Copyright (c) 2019, 2023 Oracle and/or its affiliates. + Copyright (c) 2020 Oracle and/or its affiliates. + Copyright (c) 2021 Oracle and/or its affiliates. + Copyright (c) 2021, 2023 Oracle and/or its affiliates. + Copyright (c) 2022 Oracle and/or its affiliates. + Copyright (c) 2023 Oracle and/or its affiliates. + Copyright (c) 2024 Oracle and/or its affiliates. diff --git a/distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-buffers-4.0.8/NOTICES b/distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-buffers-4.1.2/NOTICES similarity index 100% rename from distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-buffers-4.0.8/NOTICES rename to distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-buffers-4.1.2/NOTICES diff --git a/distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-config-4.0.8/NOTICES b/distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-config-4.1.2/NOTICES similarity index 100% rename from distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-config-4.0.8/NOTICES rename to distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-config-4.1.2/NOTICES diff --git a/distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-configurable-4.0.8/NOTICES b/distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-configurable-4.1.2/NOTICES similarity index 84% rename from distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-configurable-4.0.8/NOTICES rename to distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-configurable-4.1.2/NOTICES index 31a82b8315cc..010f077bcc18 100644 --- a/distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-configurable-4.0.8/NOTICES +++ b/distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-configurable-4.1.2/NOTICES @@ -16,6 +16,10 @@ Copyright (c) 2022 Oracle and/or its affiliates. Copyright (c) 2022, 2023 Oracle and/or its affiliates. +Copyright (c) 2022, 2024 Oracle and/or its affiliates. + Copyright (c) 2023 Oracle and/or its affiliates. +Copyright (c) 2023, 2024 Oracle and/or its affiliates. + Copyright (c) 2024 Oracle and/or its affiliates. diff --git a/distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-context-4.0.8/NOTICES b/distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-context-4.1.2/NOTICES similarity index 85% rename from distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-context-4.0.8/NOTICES rename to distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-context-4.1.2/NOTICES index 5f9b18afb7b5..d75ac2a068b6 100644 --- a/distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-context-4.0.8/NOTICES +++ b/distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-context-4.1.2/NOTICES @@ -2,8 +2,6 @@ Copyright (c) 2019, 2020 Oracle and/or its affiliates. Copyright (c) 2019, 2021 Oracle and/or its affiliates. -Copyright (c) 2019, 2022 Oracle and/or its affiliates. - Copyright (c) 2019, 2023 Oracle and/or its affiliates. Copyright (c) 2019, 2024 Oracle and/or its affiliates. diff --git a/distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-key-util-4.0.8/NOTICES b/distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-key-util-4.1.2/NOTICES similarity index 100% rename from distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-key-util-4.0.8/NOTICES rename to distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-key-util-4.1.2/NOTICES diff --git a/distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-mapper-4.0.8/NOTICES b/distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-mapper-4.1.2/NOTICES similarity index 100% rename from distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-mapper-4.0.8/NOTICES rename to distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-mapper-4.1.2/NOTICES diff --git a/distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-media-type-4.0.8/NOTICES b/distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-media-type-4.1.2/NOTICES similarity index 100% rename from distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-media-type-4.0.8/NOTICES rename to distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-media-type-4.1.2/NOTICES diff --git a/distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-parameters-4.0.8/NOTICES b/distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-parameters-4.1.2/NOTICES similarity index 100% rename from distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-parameters-4.0.8/NOTICES rename to distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-parameters-4.1.2/NOTICES diff --git a/distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-security-4.0.8/NOTICES b/distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-security-4.1.2/NOTICES similarity index 100% rename from distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-security-4.0.8/NOTICES rename to distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-security-4.1.2/NOTICES diff --git a/distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-socket-4.0.8/NOTICES b/distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-socket-4.1.2/NOTICES similarity index 100% rename from distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-socket-4.0.8/NOTICES rename to distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-socket-4.1.2/NOTICES diff --git a/distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-task-4.0.8/NOTICES b/distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-task-4.1.2/NOTICES similarity index 100% rename from distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-task-4.0.8/NOTICES rename to distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-task-4.1.2/NOTICES diff --git a/distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-tls-4.0.8/NOTICES b/distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-tls-4.1.2/NOTICES similarity index 100% rename from distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-tls-4.0.8/NOTICES rename to distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-tls-4.1.2/NOTICES diff --git a/distribution/engine/THIRD-PARTY/io.helidon.http.encoding.helidon-http-encoding-4.0.8/NOTICES b/distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-types-4.1.2/NOTICES similarity index 100% rename from distribution/engine/THIRD-PARTY/io.helidon.http.encoding.helidon-http-encoding-4.0.8/NOTICES rename to distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-types-4.1.2/NOTICES diff --git a/distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-uri-4.0.8/NOTICES b/distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-uri-4.1.2/NOTICES similarity index 84% rename from distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-uri-4.0.8/NOTICES rename to distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-uri-4.1.2/NOTICES index efcfbb5cadf3..8d461bc5b828 100644 --- a/distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-uri-4.0.8/NOTICES +++ b/distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-uri-4.1.2/NOTICES @@ -4,8 +4,6 @@ Copyright (c) 2022, 2023 Oracle and/or its affiliates. Copyright (c) 2022, 2024 Oracle and/or its affiliates. -Copyright (c) 2023 Oracle and/or its affiliates. - Copyright (c) 2023, 2024 Oracle and/or its affiliates. Copyright (c) 2024 Oracle and/or its affiliates. diff --git a/distribution/engine/THIRD-PARTY/io.helidon.config.helidon-config-4.0.8/NOTICES b/distribution/engine/THIRD-PARTY/io.helidon.config.helidon-config-4.1.2/NOTICES similarity index 90% rename from distribution/engine/THIRD-PARTY/io.helidon.config.helidon-config-4.0.8/NOTICES rename to distribution/engine/THIRD-PARTY/io.helidon.config.helidon-config-4.1.2/NOTICES index 67f46747e9c4..6de4a738350f 100644 --- a/distribution/engine/THIRD-PARTY/io.helidon.config.helidon-config-4.0.8/NOTICES +++ b/distribution/engine/THIRD-PARTY/io.helidon.config.helidon-config-4.1.2/NOTICES @@ -18,6 +18,8 @@ Copyright (c) 2019, 2021 Oracle and/or its affiliates. Copyright (c) 2019, 2022 Oracle and/or its affiliates. +Copyright (c) 2019, 2024 Oracle and/or its affiliates. + Copyright (c) 2020 Oracle and/or its affiliates. Copyright (c) 2020, 2021 Oracle and/or its affiliates. @@ -34,6 +36,8 @@ Copyright (c) 2021, 2023 Oracle and/or its affiliates. Copyright (c) 2022, 2023 Oracle and/or its affiliates. +Copyright (c) 2022, 2024 Oracle and/or its affiliates. + Copyright (c) 2023 Oracle and/or its affiliates. Copyright (c) 2024 Oracle and/or its affiliates. diff --git a/distribution/engine/THIRD-PARTY/io.helidon.helidon-4.0.8/NOTICES b/distribution/engine/THIRD-PARTY/io.helidon.helidon-4.1.2/NOTICES similarity index 100% rename from distribution/engine/THIRD-PARTY/io.helidon.helidon-4.0.8/NOTICES rename to distribution/engine/THIRD-PARTY/io.helidon.helidon-4.1.2/NOTICES diff --git a/distribution/engine/THIRD-PARTY/io.helidon.http.media.helidon-http-media-4.0.8/NOTICES b/distribution/engine/THIRD-PARTY/io.helidon.http.encoding.helidon-http-encoding-4.1.2/NOTICES similarity index 100% rename from distribution/engine/THIRD-PARTY/io.helidon.http.media.helidon-http-media-4.0.8/NOTICES rename to distribution/engine/THIRD-PARTY/io.helidon.http.encoding.helidon-http-encoding-4.1.2/NOTICES diff --git a/distribution/engine/THIRD-PARTY/io.helidon.http.helidon-http-4.0.8/NOTICES b/distribution/engine/THIRD-PARTY/io.helidon.http.helidon-http-4.1.2/NOTICES similarity index 100% rename from distribution/engine/THIRD-PARTY/io.helidon.http.helidon-http-4.0.8/NOTICES rename to distribution/engine/THIRD-PARTY/io.helidon.http.helidon-http-4.1.2/NOTICES diff --git a/distribution/engine/THIRD-PARTY/io.helidon.webclient.helidon-webclient-http1-4.0.8/NOTICES b/distribution/engine/THIRD-PARTY/io.helidon.http.media.helidon-http-media-4.1.2/NOTICES similarity index 100% rename from distribution/engine/THIRD-PARTY/io.helidon.webclient.helidon-webclient-http1-4.0.8/NOTICES rename to distribution/engine/THIRD-PARTY/io.helidon.http.media.helidon-http-media-4.1.2/NOTICES diff --git a/distribution/engine/THIRD-PARTY/io.helidon.inject.helidon-inject-api-4.0.8/NOTICES b/distribution/engine/THIRD-PARTY/io.helidon.inject.helidon-inject-api-4.1.2/NOTICES similarity index 100% rename from distribution/engine/THIRD-PARTY/io.helidon.inject.helidon-inject-api-4.0.8/NOTICES rename to distribution/engine/THIRD-PARTY/io.helidon.inject.helidon-inject-api-4.1.2/NOTICES diff --git a/distribution/engine/THIRD-PARTY/io.helidon.logging.helidon-logging-common-4.0.8/NOTICES b/distribution/engine/THIRD-PARTY/io.helidon.logging.helidon-logging-common-4.1.2/NOTICES similarity index 84% rename from distribution/engine/THIRD-PARTY/io.helidon.logging.helidon-logging-common-4.0.8/NOTICES rename to distribution/engine/THIRD-PARTY/io.helidon.logging.helidon-logging-common-4.1.2/NOTICES index d5e3ffdd00d7..68c9a9a0b6ba 100644 --- a/distribution/engine/THIRD-PARTY/io.helidon.logging.helidon-logging-common-4.0.8/NOTICES +++ b/distribution/engine/THIRD-PARTY/io.helidon.logging.helidon-logging-common-4.1.2/NOTICES @@ -7,3 +7,5 @@ Copyright (c) 2020, 2022 Oracle and/or its affiliates. Copyright (c) 2020, 2023 Oracle and/or its affiliates. Copyright (c) 2020, 2024 Oracle and/or its affiliates. + +Copyright (c) 2024 Oracle and/or its affiliates. diff --git a/distribution/engine/THIRD-PARTY/io.helidon.webclient.helidon-webclient-4.0.8/NOTICES b/distribution/engine/THIRD-PARTY/io.helidon.webclient.helidon-webclient-4.1.2/NOTICES similarity index 100% rename from distribution/engine/THIRD-PARTY/io.helidon.webclient.helidon-webclient-4.0.8/NOTICES rename to distribution/engine/THIRD-PARTY/io.helidon.webclient.helidon-webclient-4.1.2/NOTICES diff --git a/distribution/engine/THIRD-PARTY/io.helidon.webclient.helidon-webclient-api-4.0.8/NOTICES b/distribution/engine/THIRD-PARTY/io.helidon.webclient.helidon-webclient-api-4.1.2/NOTICES similarity index 100% rename from distribution/engine/THIRD-PARTY/io.helidon.webclient.helidon-webclient-api-4.0.8/NOTICES rename to distribution/engine/THIRD-PARTY/io.helidon.webclient.helidon-webclient-api-4.1.2/NOTICES diff --git a/distribution/engine/THIRD-PARTY/io.helidon.webserver.helidon-webserver-websocket-4.0.8/NOTICES b/distribution/engine/THIRD-PARTY/io.helidon.webclient.helidon-webclient-http1-4.1.2/NOTICES similarity index 100% rename from distribution/engine/THIRD-PARTY/io.helidon.webserver.helidon-webserver-websocket-4.0.8/NOTICES rename to distribution/engine/THIRD-PARTY/io.helidon.webclient.helidon-webclient-http1-4.1.2/NOTICES diff --git a/distribution/project-manager/THIRD-PARTY/io.helidon.webclient.helidon-webclient-websocket-4.0.8/NOTICES b/distribution/engine/THIRD-PARTY/io.helidon.webclient.helidon-webclient-websocket-4.1.2/NOTICES similarity index 77% rename from distribution/project-manager/THIRD-PARTY/io.helidon.webclient.helidon-webclient-websocket-4.0.8/NOTICES rename to distribution/engine/THIRD-PARTY/io.helidon.webclient.helidon-webclient-websocket-4.1.2/NOTICES index 11e6e808f9fd..3ef0464d4ec2 100644 --- a/distribution/project-manager/THIRD-PARTY/io.helidon.webclient.helidon-webclient-websocket-4.0.8/NOTICES +++ b/distribution/engine/THIRD-PARTY/io.helidon.webclient.helidon-webclient-websocket-4.1.2/NOTICES @@ -1,3 +1,5 @@ +helidon-codegen-helidon-copyright + Copyright (c) 2022, 2024 Oracle and/or its affiliates. Copyright (c) 2023 Oracle and/or its affiliates. diff --git a/distribution/engine/THIRD-PARTY/io.helidon.webserver.helidon-webserver-4.0.8/NOTICES b/distribution/engine/THIRD-PARTY/io.helidon.webserver.helidon-webserver-4.1.2/NOTICES similarity index 100% rename from distribution/engine/THIRD-PARTY/io.helidon.webserver.helidon-webserver-4.0.8/NOTICES rename to distribution/engine/THIRD-PARTY/io.helidon.webserver.helidon-webserver-4.1.2/NOTICES diff --git a/distribution/engine/THIRD-PARTY/io.helidon.webserver.helidon-webserver-websocket-4.1.2/NOTICES b/distribution/engine/THIRD-PARTY/io.helidon.webserver.helidon-webserver-websocket-4.1.2/NOTICES new file mode 100644 index 000000000000..e12e3e89f957 --- /dev/null +++ b/distribution/engine/THIRD-PARTY/io.helidon.webserver.helidon-webserver-websocket-4.1.2/NOTICES @@ -0,0 +1,11 @@ +helidon-codegen-helidon-copyright + +Copyright (c) 2022, 2023 Oracle and/or its affiliates. + +Copyright (c) 2022, 2024 Oracle and/or its affiliates. + +Copyright (c) 2023 Oracle and/or its affiliates. + +Copyright (c) 2023, 2024 Oracle and/or its affiliates. + +Copyright (c) 2024 Oracle and/or its affiliates. diff --git a/distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-types-4.0.8/NOTICES b/distribution/engine/THIRD-PARTY/io.helidon.websocket.helidon-websocket-4.1.2/NOTICES similarity index 100% rename from distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-types-4.0.8/NOTICES rename to distribution/engine/THIRD-PARTY/io.helidon.websocket.helidon-websocket-4.1.2/NOTICES diff --git a/distribution/project-manager/THIRD-PARTY/NOTICE b/distribution/project-manager/THIRD-PARTY/NOTICE index 132257d49336..0646f4065546 100644 --- a/distribution/project-manager/THIRD-PARTY/NOTICE +++ b/distribution/project-manager/THIRD-PARTY/NOTICE @@ -183,162 +183,162 @@ Copyright notices related to this dependency can be found in the directory `io.g 'helidon-builder-api', licensed under the Apache 2.0, is distributed with the project-manager. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.builder.helidon-builder-api-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.builder.helidon-builder-api-4.1.2`. 'helidon-common-features', licensed under the Apache 2.0, is distributed with the project-manager. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.common.features.helidon-common-features-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.common.features.helidon-common-features-4.1.2`. 'helidon-common-features-api', licensed under the Apache 2.0, is distributed with the project-manager. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.common.features.helidon-common-features-api-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.common.features.helidon-common-features-api-4.1.2`. 'helidon-common', licensed under the Apache 2.0, is distributed with the project-manager. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-4.1.2`. 'helidon-common-buffers', licensed under the Apache 2.0, is distributed with the project-manager. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-buffers-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-buffers-4.1.2`. 'helidon-common-config', licensed under the Apache 2.0, is distributed with the project-manager. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-config-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-config-4.1.2`. 'helidon-common-configurable', licensed under the Apache 2.0, is distributed with the project-manager. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-configurable-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-configurable-4.1.2`. 'helidon-common-context', licensed under the Apache 2.0, is distributed with the project-manager. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-context-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-context-4.1.2`. 'helidon-common-key-util', licensed under the Apache 2.0, is distributed with the project-manager. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-key-util-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-key-util-4.1.2`. 'helidon-common-mapper', licensed under the Apache 2.0, is distributed with the project-manager. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-mapper-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-mapper-4.1.2`. 'helidon-common-media-type', licensed under the Apache 2.0, is distributed with the project-manager. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-media-type-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-media-type-4.1.2`. 'helidon-common-parameters', licensed under the Apache 2.0, is distributed with the project-manager. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-parameters-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-parameters-4.1.2`. 'helidon-common-security', licensed under the Apache 2.0, is distributed with the project-manager. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-security-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-security-4.1.2`. 'helidon-common-socket', licensed under the Apache 2.0, is distributed with the project-manager. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-socket-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-socket-4.1.2`. 'helidon-common-task', licensed under the Apache 2.0, is distributed with the project-manager. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-task-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-task-4.1.2`. 'helidon-common-tls', licensed under the Apache 2.0, is distributed with the project-manager. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-tls-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-tls-4.1.2`. 'helidon-common-types', licensed under the Apache 2.0, is distributed with the project-manager. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-types-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-types-4.1.2`. 'helidon-common-uri', licensed under the Apache 2.0, is distributed with the project-manager. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-uri-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.common.helidon-common-uri-4.1.2`. 'helidon-config', licensed under the Apache 2.0, is distributed with the project-manager. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.config.helidon-config-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.config.helidon-config-4.1.2`. 'helidon', licensed under the Apache 2.0, is distributed with the project-manager. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.helidon-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.helidon-4.1.2`. 'helidon-http-encoding', licensed under the Apache 2.0, is distributed with the project-manager. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.http.encoding.helidon-http-encoding-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.http.encoding.helidon-http-encoding-4.1.2`. 'helidon-http', licensed under the Apache 2.0, is distributed with the project-manager. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.http.helidon-http-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.http.helidon-http-4.1.2`. 'helidon-http-media', licensed under the Apache 2.0, is distributed with the project-manager. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.http.media.helidon-http-media-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.http.media.helidon-http-media-4.1.2`. 'helidon-inject-api', licensed under the Apache 2.0, is distributed with the project-manager. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.inject.helidon-inject-api-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.inject.helidon-inject-api-4.1.2`. 'helidon-logging-common', licensed under the Apache 2.0, is distributed with the project-manager. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.logging.helidon-logging-common-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.logging.helidon-logging-common-4.1.2`. 'helidon-webclient', licensed under the Apache 2.0, is distributed with the project-manager. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.webclient.helidon-webclient-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.webclient.helidon-webclient-4.1.2`. 'helidon-webclient-api', licensed under the Apache 2.0, is distributed with the project-manager. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.webclient.helidon-webclient-api-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.webclient.helidon-webclient-api-4.1.2`. 'helidon-webclient-http1', licensed under the Apache 2.0, is distributed with the project-manager. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.webclient.helidon-webclient-http1-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.webclient.helidon-webclient-http1-4.1.2`. 'helidon-webclient-websocket', licensed under the Apache 2.0, is distributed with the project-manager. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.webclient.helidon-webclient-websocket-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.webclient.helidon-webclient-websocket-4.1.2`. 'helidon-webserver', licensed under the Apache 2.0, is distributed with the project-manager. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.webserver.helidon-webserver-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.webserver.helidon-webserver-4.1.2`. 'helidon-webserver-websocket', licensed under the Apache 2.0, is distributed with the project-manager. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.webserver.helidon-webserver-websocket-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.webserver.helidon-webserver-websocket-4.1.2`. 'helidon-websocket', licensed under the Apache 2.0, is distributed with the project-manager. The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.helidon.websocket.helidon-websocket-4.0.8`. +Copyright notices related to this dependency can be found in the directory `io.helidon.websocket.helidon-websocket-4.1.2`. 'jakarta.inject-api', licensed under the The Apache Software License, Version 2.0, is distributed with the project-manager. diff --git a/distribution/project-manager/THIRD-PARTY/io.helidon.builder.helidon-builder-api-4.0.8/NOTICES b/distribution/project-manager/THIRD-PARTY/io.helidon.builder.helidon-builder-api-4.1.2/NOTICES similarity index 100% rename from distribution/project-manager/THIRD-PARTY/io.helidon.builder.helidon-builder-api-4.0.8/NOTICES rename to distribution/project-manager/THIRD-PARTY/io.helidon.builder.helidon-builder-api-4.1.2/NOTICES diff --git a/distribution/project-manager/THIRD-PARTY/io.helidon.common.features.helidon-common-features-4.0.8/NOTICES b/distribution/project-manager/THIRD-PARTY/io.helidon.common.features.helidon-common-features-4.1.2/NOTICES similarity index 84% rename from distribution/project-manager/THIRD-PARTY/io.helidon.common.features.helidon-common-features-4.0.8/NOTICES rename to distribution/project-manager/THIRD-PARTY/io.helidon.common.features.helidon-common-features-4.1.2/NOTICES index 81b7ff436e4d..330f40d1d659 100644 --- a/distribution/project-manager/THIRD-PARTY/io.helidon.common.features.helidon-common-features-4.0.8/NOTICES +++ b/distribution/project-manager/THIRD-PARTY/io.helidon.common.features.helidon-common-features-4.1.2/NOTICES @@ -7,3 +7,5 @@ Copyright (c) 2022 Oracle and/or its affiliates. Copyright (c) 2022, 2023 Oracle and/or its affiliates. Copyright (c) 2022, 2024 Oracle and/or its affiliates. + +Copyright (c) 2024 Oracle and/or its affiliates. diff --git a/distribution/project-manager/THIRD-PARTY/io.helidon.common.features.helidon-common-features-api-4.0.8/NOTICES b/distribution/project-manager/THIRD-PARTY/io.helidon.common.features.helidon-common-features-api-4.1.2/NOTICES similarity index 100% rename from distribution/project-manager/THIRD-PARTY/io.helidon.common.features.helidon-common-features-api-4.0.8/NOTICES rename to distribution/project-manager/THIRD-PARTY/io.helidon.common.features.helidon-common-features-api-4.1.2/NOTICES diff --git a/distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-4.0.8/NOTICES b/distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-4.1.2/NOTICES similarity index 93% rename from distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-4.0.8/NOTICES rename to distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-4.1.2/NOTICES index befbd926c86d..194f020204ef 100644 --- a/distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-4.0.8/NOTICES +++ b/distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-4.1.2/NOTICES @@ -2,8 +2,6 @@ Copyright (c) 2017, 2021 Oracle and/or its affiliates. Copyright (c) 2017, 2022 Oracle and/or its affiliates. -Copyright (c) 2017, 2023 Oracle and/or its affiliates. - Copyright (c) 2017, 2024 Oracle and/or its affiliates. Copyright (c) 2018, 2021 Oracle and/or its affiliates. diff --git a/distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-buffers-4.0.8/NOTICES b/distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-buffers-4.1.2/NOTICES similarity index 100% rename from distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-buffers-4.0.8/NOTICES rename to distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-buffers-4.1.2/NOTICES diff --git a/distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-config-4.0.8/NOTICES b/distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-config-4.1.2/NOTICES similarity index 100% rename from distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-config-4.0.8/NOTICES rename to distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-config-4.1.2/NOTICES diff --git a/distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-configurable-4.0.8/NOTICES b/distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-configurable-4.1.2/NOTICES similarity index 84% rename from distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-configurable-4.0.8/NOTICES rename to distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-configurable-4.1.2/NOTICES index 31a82b8315cc..010f077bcc18 100644 --- a/distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-configurable-4.0.8/NOTICES +++ b/distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-configurable-4.1.2/NOTICES @@ -16,6 +16,10 @@ Copyright (c) 2022 Oracle and/or its affiliates. Copyright (c) 2022, 2023 Oracle and/or its affiliates. +Copyright (c) 2022, 2024 Oracle and/or its affiliates. + Copyright (c) 2023 Oracle and/or its affiliates. +Copyright (c) 2023, 2024 Oracle and/or its affiliates. + Copyright (c) 2024 Oracle and/or its affiliates. diff --git a/distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-context-4.0.8/NOTICES b/distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-context-4.1.2/NOTICES similarity index 85% rename from distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-context-4.0.8/NOTICES rename to distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-context-4.1.2/NOTICES index 5f9b18afb7b5..d75ac2a068b6 100644 --- a/distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-context-4.0.8/NOTICES +++ b/distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-context-4.1.2/NOTICES @@ -2,8 +2,6 @@ Copyright (c) 2019, 2020 Oracle and/or its affiliates. Copyright (c) 2019, 2021 Oracle and/or its affiliates. -Copyright (c) 2019, 2022 Oracle and/or its affiliates. - Copyright (c) 2019, 2023 Oracle and/or its affiliates. Copyright (c) 2019, 2024 Oracle and/or its affiliates. diff --git a/distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-key-util-4.0.8/NOTICES b/distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-key-util-4.1.2/NOTICES similarity index 100% rename from distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-key-util-4.0.8/NOTICES rename to distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-key-util-4.1.2/NOTICES diff --git a/distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-mapper-4.0.8/NOTICES b/distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-mapper-4.1.2/NOTICES similarity index 100% rename from distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-mapper-4.0.8/NOTICES rename to distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-mapper-4.1.2/NOTICES diff --git a/distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-media-type-4.0.8/NOTICES b/distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-media-type-4.1.2/NOTICES similarity index 100% rename from distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-media-type-4.0.8/NOTICES rename to distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-media-type-4.1.2/NOTICES diff --git a/distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-parameters-4.0.8/NOTICES b/distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-parameters-4.1.2/NOTICES similarity index 100% rename from distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-parameters-4.0.8/NOTICES rename to distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-parameters-4.1.2/NOTICES diff --git a/distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-security-4.0.8/NOTICES b/distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-security-4.1.2/NOTICES similarity index 100% rename from distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-security-4.0.8/NOTICES rename to distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-security-4.1.2/NOTICES diff --git a/distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-socket-4.0.8/NOTICES b/distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-socket-4.1.2/NOTICES similarity index 100% rename from distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-socket-4.0.8/NOTICES rename to distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-socket-4.1.2/NOTICES diff --git a/distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-task-4.0.8/NOTICES b/distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-task-4.1.2/NOTICES similarity index 100% rename from distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-task-4.0.8/NOTICES rename to distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-task-4.1.2/NOTICES diff --git a/distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-tls-4.0.8/NOTICES b/distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-tls-4.1.2/NOTICES similarity index 100% rename from distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-tls-4.0.8/NOTICES rename to distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-tls-4.1.2/NOTICES diff --git a/distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-types-4.0.8/NOTICES b/distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-types-4.0.8/NOTICES deleted file mode 100644 index ef6fb316033f..000000000000 --- a/distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-types-4.0.8/NOTICES +++ /dev/null @@ -1,7 +0,0 @@ -Copyright (c) 2022, 2023 Oracle and/or its affiliates. - -Copyright (c) 2022, 2024 Oracle and/or its affiliates. - -Copyright (c) 2023 Oracle and/or its affiliates. - -Copyright (c) 2023, 2024 Oracle and/or its affiliates. diff --git a/distribution/project-manager/THIRD-PARTY/io.helidon.http.encoding.helidon-http-encoding-4.0.8/NOTICES b/distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-types-4.1.2/NOTICES similarity index 100% rename from distribution/project-manager/THIRD-PARTY/io.helidon.http.encoding.helidon-http-encoding-4.0.8/NOTICES rename to distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-types-4.1.2/NOTICES diff --git a/distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-uri-4.0.8/NOTICES b/distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-uri-4.1.2/NOTICES similarity index 84% rename from distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-uri-4.0.8/NOTICES rename to distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-uri-4.1.2/NOTICES index efcfbb5cadf3..8d461bc5b828 100644 --- a/distribution/engine/THIRD-PARTY/io.helidon.common.helidon-common-uri-4.0.8/NOTICES +++ b/distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-uri-4.1.2/NOTICES @@ -4,8 +4,6 @@ Copyright (c) 2022, 2023 Oracle and/or its affiliates. Copyright (c) 2022, 2024 Oracle and/or its affiliates. -Copyright (c) 2023 Oracle and/or its affiliates. - Copyright (c) 2023, 2024 Oracle and/or its affiliates. Copyright (c) 2024 Oracle and/or its affiliates. diff --git a/distribution/project-manager/THIRD-PARTY/io.helidon.config.helidon-config-4.0.8/NOTICES b/distribution/project-manager/THIRD-PARTY/io.helidon.config.helidon-config-4.1.2/NOTICES similarity index 90% rename from distribution/project-manager/THIRD-PARTY/io.helidon.config.helidon-config-4.0.8/NOTICES rename to distribution/project-manager/THIRD-PARTY/io.helidon.config.helidon-config-4.1.2/NOTICES index 67f46747e9c4..6de4a738350f 100644 --- a/distribution/project-manager/THIRD-PARTY/io.helidon.config.helidon-config-4.0.8/NOTICES +++ b/distribution/project-manager/THIRD-PARTY/io.helidon.config.helidon-config-4.1.2/NOTICES @@ -18,6 +18,8 @@ Copyright (c) 2019, 2021 Oracle and/or its affiliates. Copyright (c) 2019, 2022 Oracle and/or its affiliates. +Copyright (c) 2019, 2024 Oracle and/or its affiliates. + Copyright (c) 2020 Oracle and/or its affiliates. Copyright (c) 2020, 2021 Oracle and/or its affiliates. @@ -34,6 +36,8 @@ Copyright (c) 2021, 2023 Oracle and/or its affiliates. Copyright (c) 2022, 2023 Oracle and/or its affiliates. +Copyright (c) 2022, 2024 Oracle and/or its affiliates. + Copyright (c) 2023 Oracle and/or its affiliates. Copyright (c) 2024 Oracle and/or its affiliates. diff --git a/distribution/project-manager/THIRD-PARTY/io.helidon.helidon-4.0.8/NOTICES b/distribution/project-manager/THIRD-PARTY/io.helidon.helidon-4.1.2/NOTICES similarity index 100% rename from distribution/project-manager/THIRD-PARTY/io.helidon.helidon-4.0.8/NOTICES rename to distribution/project-manager/THIRD-PARTY/io.helidon.helidon-4.1.2/NOTICES diff --git a/distribution/project-manager/THIRD-PARTY/io.helidon.http.media.helidon-http-media-4.0.8/NOTICES b/distribution/project-manager/THIRD-PARTY/io.helidon.http.encoding.helidon-http-encoding-4.1.2/NOTICES similarity index 100% rename from distribution/project-manager/THIRD-PARTY/io.helidon.http.media.helidon-http-media-4.0.8/NOTICES rename to distribution/project-manager/THIRD-PARTY/io.helidon.http.encoding.helidon-http-encoding-4.1.2/NOTICES diff --git a/distribution/project-manager/THIRD-PARTY/io.helidon.http.helidon-http-4.0.8/NOTICES b/distribution/project-manager/THIRD-PARTY/io.helidon.http.helidon-http-4.1.2/NOTICES similarity index 100% rename from distribution/project-manager/THIRD-PARTY/io.helidon.http.helidon-http-4.0.8/NOTICES rename to distribution/project-manager/THIRD-PARTY/io.helidon.http.helidon-http-4.1.2/NOTICES diff --git a/distribution/project-manager/THIRD-PARTY/io.helidon.webclient.helidon-webclient-http1-4.0.8/NOTICES b/distribution/project-manager/THIRD-PARTY/io.helidon.http.media.helidon-http-media-4.1.2/NOTICES similarity index 100% rename from distribution/project-manager/THIRD-PARTY/io.helidon.webclient.helidon-webclient-http1-4.0.8/NOTICES rename to distribution/project-manager/THIRD-PARTY/io.helidon.http.media.helidon-http-media-4.1.2/NOTICES diff --git a/distribution/project-manager/THIRD-PARTY/io.helidon.inject.helidon-inject-api-4.0.8/NOTICES b/distribution/project-manager/THIRD-PARTY/io.helidon.inject.helidon-inject-api-4.1.2/NOTICES similarity index 100% rename from distribution/project-manager/THIRD-PARTY/io.helidon.inject.helidon-inject-api-4.0.8/NOTICES rename to distribution/project-manager/THIRD-PARTY/io.helidon.inject.helidon-inject-api-4.1.2/NOTICES diff --git a/distribution/project-manager/THIRD-PARTY/io.helidon.logging.helidon-logging-common-4.0.8/NOTICES b/distribution/project-manager/THIRD-PARTY/io.helidon.logging.helidon-logging-common-4.1.2/NOTICES similarity index 84% rename from distribution/project-manager/THIRD-PARTY/io.helidon.logging.helidon-logging-common-4.0.8/NOTICES rename to distribution/project-manager/THIRD-PARTY/io.helidon.logging.helidon-logging-common-4.1.2/NOTICES index d5e3ffdd00d7..68c9a9a0b6ba 100644 --- a/distribution/project-manager/THIRD-PARTY/io.helidon.logging.helidon-logging-common-4.0.8/NOTICES +++ b/distribution/project-manager/THIRD-PARTY/io.helidon.logging.helidon-logging-common-4.1.2/NOTICES @@ -7,3 +7,5 @@ Copyright (c) 2020, 2022 Oracle and/or its affiliates. Copyright (c) 2020, 2023 Oracle and/or its affiliates. Copyright (c) 2020, 2024 Oracle and/or its affiliates. + +Copyright (c) 2024 Oracle and/or its affiliates. diff --git a/distribution/project-manager/THIRD-PARTY/io.helidon.webclient.helidon-webclient-4.0.8/NOTICES b/distribution/project-manager/THIRD-PARTY/io.helidon.webclient.helidon-webclient-4.1.2/NOTICES similarity index 100% rename from distribution/project-manager/THIRD-PARTY/io.helidon.webclient.helidon-webclient-4.0.8/NOTICES rename to distribution/project-manager/THIRD-PARTY/io.helidon.webclient.helidon-webclient-4.1.2/NOTICES diff --git a/distribution/project-manager/THIRD-PARTY/io.helidon.webclient.helidon-webclient-api-4.0.8/NOTICES b/distribution/project-manager/THIRD-PARTY/io.helidon.webclient.helidon-webclient-api-4.1.2/NOTICES similarity index 100% rename from distribution/project-manager/THIRD-PARTY/io.helidon.webclient.helidon-webclient-api-4.0.8/NOTICES rename to distribution/project-manager/THIRD-PARTY/io.helidon.webclient.helidon-webclient-api-4.1.2/NOTICES diff --git a/distribution/project-manager/THIRD-PARTY/io.helidon.webserver.helidon-webserver-websocket-4.0.8/NOTICES b/distribution/project-manager/THIRD-PARTY/io.helidon.webclient.helidon-webclient-http1-4.1.2/NOTICES similarity index 100% rename from distribution/project-manager/THIRD-PARTY/io.helidon.webserver.helidon-webserver-websocket-4.0.8/NOTICES rename to distribution/project-manager/THIRD-PARTY/io.helidon.webclient.helidon-webclient-http1-4.1.2/NOTICES diff --git a/distribution/engine/THIRD-PARTY/io.helidon.webclient.helidon-webclient-websocket-4.0.8/NOTICES b/distribution/project-manager/THIRD-PARTY/io.helidon.webclient.helidon-webclient-websocket-4.1.2/NOTICES similarity index 100% rename from distribution/engine/THIRD-PARTY/io.helidon.webclient.helidon-webclient-websocket-4.0.8/NOTICES rename to distribution/project-manager/THIRD-PARTY/io.helidon.webclient.helidon-webclient-websocket-4.1.2/NOTICES diff --git a/distribution/project-manager/THIRD-PARTY/io.helidon.webserver.helidon-webserver-4.0.8/NOTICES b/distribution/project-manager/THIRD-PARTY/io.helidon.webserver.helidon-webserver-4.1.2/NOTICES similarity index 100% rename from distribution/project-manager/THIRD-PARTY/io.helidon.webserver.helidon-webserver-4.0.8/NOTICES rename to distribution/project-manager/THIRD-PARTY/io.helidon.webserver.helidon-webserver-4.1.2/NOTICES diff --git a/distribution/project-manager/THIRD-PARTY/io.helidon.webserver.helidon-webserver-websocket-4.1.2/NOTICES b/distribution/project-manager/THIRD-PARTY/io.helidon.webserver.helidon-webserver-websocket-4.1.2/NOTICES new file mode 100644 index 000000000000..15a5ed30b4ca --- /dev/null +++ b/distribution/project-manager/THIRD-PARTY/io.helidon.webserver.helidon-webserver-websocket-4.1.2/NOTICES @@ -0,0 +1,9 @@ +Copyright (c) 2022, 2023 Oracle and/or its affiliates. + +Copyright (c) 2022, 2024 Oracle and/or its affiliates. + +Copyright (c) 2023 Oracle and/or its affiliates. + +Copyright (c) 2023, 2024 Oracle and/or its affiliates. + +Copyright (c) 2024 Oracle and/or its affiliates. diff --git a/distribution/project-manager/THIRD-PARTY/io.helidon.websocket.helidon-websocket-4.0.8/NOTICES b/distribution/project-manager/THIRD-PARTY/io.helidon.websocket.helidon-websocket-4.0.8/NOTICES deleted file mode 100644 index ef6fb316033f..000000000000 --- a/distribution/project-manager/THIRD-PARTY/io.helidon.websocket.helidon-websocket-4.0.8/NOTICES +++ /dev/null @@ -1,7 +0,0 @@ -Copyright (c) 2022, 2023 Oracle and/or its affiliates. - -Copyright (c) 2022, 2024 Oracle and/or its affiliates. - -Copyright (c) 2023 Oracle and/or its affiliates. - -Copyright (c) 2023, 2024 Oracle and/or its affiliates. diff --git a/distribution/engine/THIRD-PARTY/io.helidon.websocket.helidon-websocket-4.0.8/NOTICES b/distribution/project-manager/THIRD-PARTY/io.helidon.websocket.helidon-websocket-4.1.2/NOTICES similarity index 100% rename from distribution/engine/THIRD-PARTY/io.helidon.websocket.helidon-websocket-4.0.8/NOTICES rename to distribution/project-manager/THIRD-PARTY/io.helidon.websocket.helidon-websocket-4.1.2/NOTICES diff --git a/tools/legal-review/engine/io.helidon.builder.helidon-builder-api-4.0.8/copyright-keep b/tools/legal-review/engine/io.helidon.builder.helidon-builder-api-4.1.2/copyright-keep similarity index 100% rename from tools/legal-review/engine/io.helidon.builder.helidon-builder-api-4.0.8/copyright-keep rename to tools/legal-review/engine/io.helidon.builder.helidon-builder-api-4.1.2/copyright-keep diff --git a/tools/legal-review/engine/io.helidon.common.features.helidon-common-features-4.0.8/copyright-keep b/tools/legal-review/engine/io.helidon.common.features.helidon-common-features-4.1.2/copyright-keep similarity index 84% rename from tools/legal-review/engine/io.helidon.common.features.helidon-common-features-4.0.8/copyright-keep rename to tools/legal-review/engine/io.helidon.common.features.helidon-common-features-4.1.2/copyright-keep index 155f613ba687..2dd56f57a99f 100644 --- a/tools/legal-review/engine/io.helidon.common.features.helidon-common-features-4.0.8/copyright-keep +++ b/tools/legal-review/engine/io.helidon.common.features.helidon-common-features-4.1.2/copyright-keep @@ -3,3 +3,4 @@ Copyright (c) 2020, 2022 Oracle and/or its affiliates. Copyright (c) 2022 Oracle and/or its affiliates. Copyright (c) 2022, 2023 Oracle and/or its affiliates. Copyright (c) 2022, 2024 Oracle and/or its affiliates. +Copyright (c) 2024 Oracle and/or its affiliates. diff --git a/tools/legal-review/project-manager/io.helidon.common.features.helidon-common-features-api-4.0.8/copyright-keep b/tools/legal-review/engine/io.helidon.common.features.helidon-common-features-api-4.1.2/copyright-keep similarity index 100% rename from tools/legal-review/project-manager/io.helidon.common.features.helidon-common-features-api-4.0.8/copyright-keep rename to tools/legal-review/engine/io.helidon.common.features.helidon-common-features-api-4.1.2/copyright-keep index dc4a47e996f2..19699134bd54 100644 --- a/tools/legal-review/project-manager/io.helidon.common.features.helidon-common-features-api-4.0.8/copyright-keep +++ b/tools/legal-review/engine/io.helidon.common.features.helidon-common-features-api-4.1.2/copyright-keep @@ -1,4 +1,4 @@ -Copyright (c) 2019, 2023 Oracle and/or its affiliates. -Copyright (c) 2022 Oracle and/or its affiliates. -Copyright (c) 2022, 2023 Oracle and/or its affiliates. Copyright (c) 2022, 2024 Oracle and/or its affiliates. +Copyright (c) 2022, 2023 Oracle and/or its affiliates. +Copyright (c) 2022 Oracle and/or its affiliates. +Copyright (c) 2019, 2023 Oracle and/or its affiliates. diff --git a/tools/legal-review/engine/io.helidon.common.helidon-common-4.0.8/copyright-keep b/tools/legal-review/engine/io.helidon.common.helidon-common-4.1.2/copyright-keep similarity index 93% rename from tools/legal-review/engine/io.helidon.common.helidon-common-4.0.8/copyright-keep rename to tools/legal-review/engine/io.helidon.common.helidon-common-4.1.2/copyright-keep index 586cce6cb823..7ee564bac618 100644 --- a/tools/legal-review/engine/io.helidon.common.helidon-common-4.0.8/copyright-keep +++ b/tools/legal-review/engine/io.helidon.common.helidon-common-4.1.2/copyright-keep @@ -1,7 +1,6 @@ Copyright (c) 2017, 2021 Oracle and/or its affiliates. Copyright (c) 2017, 2024 Oracle and/or its affiliates. Copyright (c) 2017, 2022 Oracle and/or its affiliates. -Copyright (c) 2017, 2023 Oracle and/or its affiliates. Copyright (c) 2018, 2021 Oracle and/or its affiliates. Copyright (c) 2018, 2024 Oracle and/or its affiliates. Copyright (c) 2019, 2020 Oracle and/or its affiliates. diff --git a/tools/legal-review/engine/io.helidon.common.helidon-common-buffers-4.0.8/copyright-keep b/tools/legal-review/engine/io.helidon.common.helidon-common-buffers-4.1.2/copyright-keep similarity index 100% rename from tools/legal-review/engine/io.helidon.common.helidon-common-buffers-4.0.8/copyright-keep rename to tools/legal-review/engine/io.helidon.common.helidon-common-buffers-4.1.2/copyright-keep index f939f190f26f..3e26b42aa618 100644 --- a/tools/legal-review/engine/io.helidon.common.helidon-common-buffers-4.0.8/copyright-keep +++ b/tools/legal-review/engine/io.helidon.common.helidon-common-buffers-4.1.2/copyright-keep @@ -1,4 +1,4 @@ -Copyright (c) 2018, 2022 Oracle and/or its affiliates. -Copyright (c) 2022 Oracle and/or its affiliates. -Copyright (c) 2022, 2023 Oracle and/or its affiliates. Copyright (c) 2022, 2024 Oracle and/or its affiliates. +Copyright (c) 2022, 2023 Oracle and/or its affiliates. +Copyright (c) 2022 Oracle and/or its affiliates. +Copyright (c) 2018, 2022 Oracle and/or its affiliates. diff --git a/tools/legal-review/engine/io.helidon.common.helidon-common-config-4.0.8/copyright-keep b/tools/legal-review/engine/io.helidon.common.helidon-common-config-4.1.2/copyright-keep similarity index 100% rename from tools/legal-review/engine/io.helidon.common.helidon-common-config-4.0.8/copyright-keep rename to tools/legal-review/engine/io.helidon.common.helidon-common-config-4.1.2/copyright-keep diff --git a/tools/legal-review/engine/io.helidon.common.helidon-common-configurable-4.0.8/copyright-ignore b/tools/legal-review/engine/io.helidon.common.helidon-common-configurable-4.1.2/copyright-ignore similarity index 100% rename from tools/legal-review/engine/io.helidon.common.helidon-common-configurable-4.0.8/copyright-ignore rename to tools/legal-review/engine/io.helidon.common.helidon-common-configurable-4.1.2/copyright-ignore diff --git a/tools/legal-review/project-manager/io.helidon.common.helidon-common-configurable-4.0.8/copyright-keep b/tools/legal-review/engine/io.helidon.common.helidon-common-configurable-4.1.2/copyright-keep similarity index 84% rename from tools/legal-review/project-manager/io.helidon.common.helidon-common-configurable-4.0.8/copyright-keep rename to tools/legal-review/engine/io.helidon.common.helidon-common-configurable-4.1.2/copyright-keep index f8108a06f9fd..5cf8b43f3c3e 100644 --- a/tools/legal-review/project-manager/io.helidon.common.helidon-common-configurable-4.0.8/copyright-keep +++ b/tools/legal-review/engine/io.helidon.common.helidon-common-configurable-4.1.2/copyright-keep @@ -1,11 +1,13 @@ Copyright (c) 2017, 2021 Oracle and/or its affiliates. -Copyright (c) 2017, 2022 Oracle and/or its affiliates. Copyright (c) 2017, 2023 Oracle and/or its affiliates. +Copyright (c) 2017, 2022 Oracle and/or its affiliates. Copyright (c) 2018, 2023 Oracle and/or its affiliates. Copyright (c) 2018, 2024 Oracle and/or its affiliates. Copyright (c) 2019, 2022 Oracle and/or its affiliates. Copyright (c) 2019, 2023 Oracle and/or its affiliates. Copyright (c) 2022 Oracle and/or its affiliates. Copyright (c) 2022, 2023 Oracle and/or its affiliates. +Copyright (c) 2022, 2024 Oracle and/or its affiliates. Copyright (c) 2023 Oracle and/or its affiliates. +Copyright (c) 2023, 2024 Oracle and/or its affiliates. Copyright (c) 2024 Oracle and/or its affiliates. diff --git a/tools/legal-review/project-manager/io.helidon.common.helidon-common-context-4.0.8/copyright-keep b/tools/legal-review/engine/io.helidon.common.helidon-common-context-4.1.2/copyright-keep similarity index 85% rename from tools/legal-review/project-manager/io.helidon.common.helidon-common-context-4.0.8/copyright-keep rename to tools/legal-review/engine/io.helidon.common.helidon-common-context-4.1.2/copyright-keep index 03d6fcbe1485..07361f1b408e 100644 --- a/tools/legal-review/project-manager/io.helidon.common.helidon-common-context-4.0.8/copyright-keep +++ b/tools/legal-review/engine/io.helidon.common.helidon-common-context-4.1.2/copyright-keep @@ -1,7 +1,6 @@ -Copyright (c) 2019, 2020 Oracle and/or its affiliates. -Copyright (c) 2019, 2021 Oracle and/or its affiliates. -Copyright (c) 2019, 2022 Oracle and/or its affiliates. -Copyright (c) 2019, 2023 Oracle and/or its affiliates. -Copyright (c) 2019, 2024 Oracle and/or its affiliates. -Copyright (c) 2020 Oracle and/or its affiliates. Copyright (c) 2020, 2022 Oracle and/or its affiliates. +Copyright (c) 2020 Oracle and/or its affiliates. +Copyright (c) 2019, 2024 Oracle and/or its affiliates. +Copyright (c) 2019, 2023 Oracle and/or its affiliates. +Copyright (c) 2019, 2021 Oracle and/or its affiliates. +Copyright (c) 2019, 2020 Oracle and/or its affiliates. diff --git a/tools/legal-review/engine/io.helidon.common.helidon-common-key-util-4.0.8/copyright-ignore b/tools/legal-review/engine/io.helidon.common.helidon-common-key-util-4.1.2/copyright-ignore similarity index 100% rename from tools/legal-review/engine/io.helidon.common.helidon-common-key-util-4.0.8/copyright-ignore rename to tools/legal-review/engine/io.helidon.common.helidon-common-key-util-4.1.2/copyright-ignore diff --git a/tools/legal-review/engine/io.helidon.common.helidon-common-key-util-4.0.8/copyright-keep b/tools/legal-review/engine/io.helidon.common.helidon-common-key-util-4.1.2/copyright-keep similarity index 100% rename from tools/legal-review/engine/io.helidon.common.helidon-common-key-util-4.0.8/copyright-keep rename to tools/legal-review/engine/io.helidon.common.helidon-common-key-util-4.1.2/copyright-keep diff --git a/tools/legal-review/engine/io.helidon.common.helidon-common-mapper-4.0.8/copyright-keep b/tools/legal-review/engine/io.helidon.common.helidon-common-mapper-4.1.2/copyright-keep similarity index 100% rename from tools/legal-review/engine/io.helidon.common.helidon-common-mapper-4.0.8/copyright-keep rename to tools/legal-review/engine/io.helidon.common.helidon-common-mapper-4.1.2/copyright-keep diff --git a/tools/legal-review/engine/io.helidon.common.helidon-common-media-type-4.0.8/copyright-keep b/tools/legal-review/engine/io.helidon.common.helidon-common-media-type-4.1.2/copyright-keep similarity index 100% rename from tools/legal-review/engine/io.helidon.common.helidon-common-media-type-4.0.8/copyright-keep rename to tools/legal-review/engine/io.helidon.common.helidon-common-media-type-4.1.2/copyright-keep diff --git a/tools/legal-review/project-manager/io.helidon.common.helidon-common-parameters-4.0.8/copyright-keep b/tools/legal-review/engine/io.helidon.common.helidon-common-parameters-4.1.2/copyright-keep similarity index 100% rename from tools/legal-review/project-manager/io.helidon.common.helidon-common-parameters-4.0.8/copyright-keep rename to tools/legal-review/engine/io.helidon.common.helidon-common-parameters-4.1.2/copyright-keep index 44f653e0c1d6..9225963f4ab9 100644 --- a/tools/legal-review/project-manager/io.helidon.common.helidon-common-parameters-4.0.8/copyright-keep +++ b/tools/legal-review/engine/io.helidon.common.helidon-common-parameters-4.1.2/copyright-keep @@ -1,3 +1,3 @@ -Copyright (c) 2022 Oracle and/or its affiliates. -Copyright (c) 2022, 2023 Oracle and/or its affiliates. Copyright (c) 2022, 2024 Oracle and/or its affiliates. +Copyright (c) 2022, 2023 Oracle and/or its affiliates. +Copyright (c) 2022 Oracle and/or its affiliates. diff --git a/tools/legal-review/engine/io.helidon.common.helidon-common-security-4.0.8/copyright-keep b/tools/legal-review/engine/io.helidon.common.helidon-common-security-4.1.2/copyright-keep similarity index 100% rename from tools/legal-review/engine/io.helidon.common.helidon-common-security-4.0.8/copyright-keep rename to tools/legal-review/engine/io.helidon.common.helidon-common-security-4.1.2/copyright-keep index 44f653e0c1d6..9225963f4ab9 100644 --- a/tools/legal-review/engine/io.helidon.common.helidon-common-security-4.0.8/copyright-keep +++ b/tools/legal-review/engine/io.helidon.common.helidon-common-security-4.1.2/copyright-keep @@ -1,3 +1,3 @@ -Copyright (c) 2022 Oracle and/or its affiliates. -Copyright (c) 2022, 2023 Oracle and/or its affiliates. Copyright (c) 2022, 2024 Oracle and/or its affiliates. +Copyright (c) 2022, 2023 Oracle and/or its affiliates. +Copyright (c) 2022 Oracle and/or its affiliates. diff --git a/tools/legal-review/engine/io.helidon.common.helidon-common-socket-4.0.8/copyright-ignore b/tools/legal-review/engine/io.helidon.common.helidon-common-socket-4.1.2/copyright-ignore similarity index 100% rename from tools/legal-review/engine/io.helidon.common.helidon-common-socket-4.0.8/copyright-ignore rename to tools/legal-review/engine/io.helidon.common.helidon-common-socket-4.1.2/copyright-ignore diff --git a/tools/legal-review/project-manager/io.helidon.common.helidon-common-socket-4.0.8/copyright-keep b/tools/legal-review/engine/io.helidon.common.helidon-common-socket-4.1.2/copyright-keep similarity index 100% rename from tools/legal-review/project-manager/io.helidon.common.helidon-common-socket-4.0.8/copyright-keep rename to tools/legal-review/engine/io.helidon.common.helidon-common-socket-4.1.2/copyright-keep index 91a06b3072e0..b4e48fe96f84 100644 --- a/tools/legal-review/project-manager/io.helidon.common.helidon-common-socket-4.0.8/copyright-keep +++ b/tools/legal-review/engine/io.helidon.common.helidon-common-socket-4.1.2/copyright-keep @@ -1,5 +1,5 @@ -Copyright (c) 2022 Oracle and/or its affiliates. -Copyright (c) 2022, 2023 Oracle and/or its affiliates. -Copyright (c) 2022, 2024 Oracle and/or its affiliates. -Copyright (c) 2023 Oracle and/or its affiliates. Copyright (c) 2024 Oracle and/or its affiliates. +Copyright (c) 2023 Oracle and/or its affiliates. +Copyright (c) 2022, 2024 Oracle and/or its affiliates. +Copyright (c) 2022, 2023 Oracle and/or its affiliates. +Copyright (c) 2022 Oracle and/or its affiliates. diff --git a/tools/legal-review/engine/io.helidon.common.helidon-common-task-4.0.8/copyright-keep b/tools/legal-review/engine/io.helidon.common.helidon-common-task-4.1.2/copyright-keep similarity index 100% rename from tools/legal-review/engine/io.helidon.common.helidon-common-task-4.0.8/copyright-keep rename to tools/legal-review/engine/io.helidon.common.helidon-common-task-4.1.2/copyright-keep diff --git a/tools/legal-review/engine/io.helidon.common.helidon-common-tls-4.0.8/copyright-ignore b/tools/legal-review/engine/io.helidon.common.helidon-common-tls-4.1.2/copyright-ignore similarity index 100% rename from tools/legal-review/engine/io.helidon.common.helidon-common-tls-4.0.8/copyright-ignore rename to tools/legal-review/engine/io.helidon.common.helidon-common-tls-4.1.2/copyright-ignore diff --git a/tools/legal-review/engine/io.helidon.webclient.helidon-webclient-http1-4.0.8/copyright-keep b/tools/legal-review/engine/io.helidon.common.helidon-common-tls-4.1.2/copyright-keep similarity index 100% rename from tools/legal-review/engine/io.helidon.webclient.helidon-webclient-http1-4.0.8/copyright-keep rename to tools/legal-review/engine/io.helidon.common.helidon-common-tls-4.1.2/copyright-keep index 1536d2f9870d..133589b49c99 100644 --- a/tools/legal-review/engine/io.helidon.webclient.helidon-webclient-http1-4.0.8/copyright-keep +++ b/tools/legal-review/engine/io.helidon.common.helidon-common-tls-4.1.2/copyright-keep @@ -1,5 +1,5 @@ -Copyright (c) 2022, 2023 Oracle and/or its affiliates. -Copyright (c) 2022, 2024 Oracle and/or its affiliates. -Copyright (c) 2023 Oracle and/or its affiliates. -Copyright (c) 2023, 2024 Oracle and/or its affiliates. Copyright (c) 2024 Oracle and/or its affiliates. +Copyright (c) 2023, 2024 Oracle and/or its affiliates. +Copyright (c) 2023 Oracle and/or its affiliates. +Copyright (c) 2022, 2024 Oracle and/or its affiliates. +Copyright (c) 2022, 2023 Oracle and/or its affiliates. diff --git a/tools/legal-review/engine/io.helidon.webserver.helidon-webserver-websocket-4.0.8/copyright-keep b/tools/legal-review/engine/io.helidon.common.helidon-common-types-4.1.2/copyright-keep similarity index 100% rename from tools/legal-review/engine/io.helidon.webserver.helidon-webserver-websocket-4.0.8/copyright-keep rename to tools/legal-review/engine/io.helidon.common.helidon-common-types-4.1.2/copyright-keep index 1536d2f9870d..133589b49c99 100644 --- a/tools/legal-review/engine/io.helidon.webserver.helidon-webserver-websocket-4.0.8/copyright-keep +++ b/tools/legal-review/engine/io.helidon.common.helidon-common-types-4.1.2/copyright-keep @@ -1,5 +1,5 @@ -Copyright (c) 2022, 2023 Oracle and/or its affiliates. -Copyright (c) 2022, 2024 Oracle and/or its affiliates. -Copyright (c) 2023 Oracle and/or its affiliates. -Copyright (c) 2023, 2024 Oracle and/or its affiliates. Copyright (c) 2024 Oracle and/or its affiliates. +Copyright (c) 2023, 2024 Oracle and/or its affiliates. +Copyright (c) 2023 Oracle and/or its affiliates. +Copyright (c) 2022, 2024 Oracle and/or its affiliates. +Copyright (c) 2022, 2023 Oracle and/or its affiliates. diff --git a/tools/legal-review/engine/io.helidon.common.helidon-common-uri-4.0.8/copyright-ignore b/tools/legal-review/engine/io.helidon.common.helidon-common-uri-4.1.2/copyright-ignore similarity index 100% rename from tools/legal-review/engine/io.helidon.common.helidon-common-uri-4.0.8/copyright-ignore rename to tools/legal-review/engine/io.helidon.common.helidon-common-uri-4.1.2/copyright-ignore diff --git a/tools/legal-review/project-manager/io.helidon.common.helidon-common-uri-4.0.8/copyright-keep b/tools/legal-review/engine/io.helidon.common.helidon-common-uri-4.1.2/copyright-keep similarity index 84% rename from tools/legal-review/project-manager/io.helidon.common.helidon-common-uri-4.0.8/copyright-keep rename to tools/legal-review/engine/io.helidon.common.helidon-common-uri-4.1.2/copyright-keep index bc893c7761cb..cb9c180b653a 100644 --- a/tools/legal-review/project-manager/io.helidon.common.helidon-common-uri-4.0.8/copyright-keep +++ b/tools/legal-review/engine/io.helidon.common.helidon-common-uri-4.1.2/copyright-keep @@ -1,6 +1,5 @@ -Copyright (c) 2022 Oracle and/or its affiliates. -Copyright (c) 2022, 2023 Oracle and/or its affiliates. -Copyright (c) 2022, 2024 Oracle and/or its affiliates. -Copyright (c) 2023 Oracle and/or its affiliates. -Copyright (c) 2023, 2024 Oracle and/or its affiliates. Copyright (c) 2024 Oracle and/or its affiliates. +Copyright (c) 2023, 2024 Oracle and/or its affiliates. +Copyright (c) 2022, 2024 Oracle and/or its affiliates. +Copyright (c) 2022, 2023 Oracle and/or its affiliates. +Copyright (c) 2022 Oracle and/or its affiliates. diff --git a/tools/legal-review/engine/io.helidon.config.helidon-config-4.0.8/copyright-keep b/tools/legal-review/engine/io.helidon.config.helidon-config-4.0.8/copyright-keep deleted file mode 100644 index b87961c30df5..000000000000 --- a/tools/legal-review/engine/io.helidon.config.helidon-config-4.0.8/copyright-keep +++ /dev/null @@ -1,20 +0,0 @@ -Copyright (c) 2017, 2020 Oracle and/or its affiliates. -Copyright (c) 2017, 2021 Oracle and/or its affiliates. -Copyright (c) 2017, 2022 Oracle and/or its affiliates. -Copyright (c) 2017, 2023 Oracle and/or its affiliates. -Copyright (c) 2017, 2024 Oracle and/or its affiliates. -Copyright (c) 2018, 2022 Oracle and/or its affiliates. -Copyright (c) 2018, 2023 Oracle and/or its affiliates. -Copyright (c) 2019, 2020 Oracle and/or its affiliates. -Copyright (c) 2019, 2022 Oracle and/or its affiliates. -Copyright (c) 2020 Oracle and/or its affiliates. -Copyright (c) 2020, 2021 Oracle and/or its affiliates. -Copyright (c) 2020, 2022 Oracle and/or its affiliates. -Copyright (c) 2020, 2023 Oracle and/or its affiliates. -Copyright (c) 2020, 2024 Oracle and/or its affiliates. -Copyright (c) 2021 Oracle and/or its affiliates. -Copyright (c) 2021, 2023 Oracle and/or its affiliates. -Copyright (c) 2022, 2023 Oracle and/or its affiliates. -Copyright (c) 2023 Oracle and/or its affiliates. -Copyright (c) 2024 Oracle and/or its affiliates. -Copyright (c) 2019, 2021 Oracle and/or its affiliates. diff --git a/tools/legal-review/engine/io.helidon.http.encoding.helidon-http-encoding-4.0.8/copyright-ignore b/tools/legal-review/engine/io.helidon.config.helidon-config-4.1.2/copyright-ignore similarity index 100% rename from tools/legal-review/engine/io.helidon.http.encoding.helidon-http-encoding-4.0.8/copyright-ignore rename to tools/legal-review/engine/io.helidon.config.helidon-config-4.1.2/copyright-ignore diff --git a/tools/legal-review/project-manager/io.helidon.config.helidon-config-4.0.8/copyright-keep b/tools/legal-review/engine/io.helidon.config.helidon-config-4.1.2/copyright-keep similarity index 90% rename from tools/legal-review/project-manager/io.helidon.config.helidon-config-4.0.8/copyright-keep rename to tools/legal-review/engine/io.helidon.config.helidon-config-4.1.2/copyright-keep index b87961c30df5..d8de19b613f0 100644 --- a/tools/legal-review/project-manager/io.helidon.config.helidon-config-4.0.8/copyright-keep +++ b/tools/legal-review/engine/io.helidon.config.helidon-config-4.1.2/copyright-keep @@ -18,3 +18,5 @@ Copyright (c) 2022, 2023 Oracle and/or its affiliates. Copyright (c) 2023 Oracle and/or its affiliates. Copyright (c) 2024 Oracle and/or its affiliates. Copyright (c) 2019, 2021 Oracle and/or its affiliates. +Copyright (c) 2022, 2024 Oracle and/or its affiliates. +Copyright (c) 2019, 2024 Oracle and/or its affiliates. diff --git a/tools/legal-review/engine/io.helidon.helidon-4.0.8/copyright-keep b/tools/legal-review/engine/io.helidon.helidon-4.1.2/copyright-keep similarity index 100% rename from tools/legal-review/engine/io.helidon.helidon-4.0.8/copyright-keep rename to tools/legal-review/engine/io.helidon.helidon-4.1.2/copyright-keep diff --git a/tools/legal-review/engine/io.helidon.http.media.helidon-http-media-4.0.8/copyright-ignore b/tools/legal-review/engine/io.helidon.http.encoding.helidon-http-encoding-4.1.2/copyright-ignore similarity index 100% rename from tools/legal-review/engine/io.helidon.http.media.helidon-http-media-4.0.8/copyright-ignore rename to tools/legal-review/engine/io.helidon.http.encoding.helidon-http-encoding-4.1.2/copyright-ignore diff --git a/tools/legal-review/engine/io.helidon.common.helidon-common-tls-4.0.8/copyright-keep b/tools/legal-review/engine/io.helidon.http.encoding.helidon-http-encoding-4.1.2/copyright-keep similarity index 100% rename from tools/legal-review/engine/io.helidon.common.helidon-common-tls-4.0.8/copyright-keep rename to tools/legal-review/engine/io.helidon.http.encoding.helidon-http-encoding-4.1.2/copyright-keep diff --git a/tools/legal-review/engine/io.helidon.http.helidon-http-4.0.8/copyright-keep b/tools/legal-review/engine/io.helidon.http.helidon-http-4.1.2/copyright-keep similarity index 100% rename from tools/legal-review/engine/io.helidon.http.helidon-http-4.0.8/copyright-keep rename to tools/legal-review/engine/io.helidon.http.helidon-http-4.1.2/copyright-keep diff --git a/tools/legal-review/engine/io.helidon.webclient.helidon-webclient-api-4.0.8/copyright-ignore b/tools/legal-review/engine/io.helidon.http.media.helidon-http-media-4.1.2/copyright-ignore similarity index 100% rename from tools/legal-review/engine/io.helidon.webclient.helidon-webclient-api-4.0.8/copyright-ignore rename to tools/legal-review/engine/io.helidon.http.media.helidon-http-media-4.1.2/copyright-ignore diff --git a/tools/legal-review/engine/io.helidon.http.encoding.helidon-http-encoding-4.0.8/copyright-keep b/tools/legal-review/engine/io.helidon.http.media.helidon-http-media-4.1.2/copyright-keep similarity index 100% rename from tools/legal-review/engine/io.helidon.http.encoding.helidon-http-encoding-4.0.8/copyright-keep rename to tools/legal-review/engine/io.helidon.http.media.helidon-http-media-4.1.2/copyright-keep diff --git a/tools/legal-review/engine/io.helidon.inject.helidon-inject-api-4.0.8/copyright-ignore b/tools/legal-review/engine/io.helidon.inject.helidon-inject-api-4.1.2/copyright-ignore similarity index 100% rename from tools/legal-review/engine/io.helidon.inject.helidon-inject-api-4.0.8/copyright-ignore rename to tools/legal-review/engine/io.helidon.inject.helidon-inject-api-4.1.2/copyright-ignore diff --git a/tools/legal-review/engine/io.helidon.inject.helidon-inject-api-4.0.8/copyright-keep b/tools/legal-review/engine/io.helidon.inject.helidon-inject-api-4.1.2/copyright-keep similarity index 100% rename from tools/legal-review/engine/io.helidon.inject.helidon-inject-api-4.0.8/copyright-keep rename to tools/legal-review/engine/io.helidon.inject.helidon-inject-api-4.1.2/copyright-keep diff --git a/tools/legal-review/engine/io.helidon.logging.helidon-logging-common-4.0.8/copyright-keep b/tools/legal-review/engine/io.helidon.logging.helidon-logging-common-4.0.8/copyright-keep deleted file mode 100644 index 4b22a402cdee..000000000000 --- a/tools/legal-review/engine/io.helidon.logging.helidon-logging-common-4.0.8/copyright-keep +++ /dev/null @@ -1,5 +0,0 @@ -Copyright (c) 2019, 2022 Oracle and/or its affiliates. -Copyright (c) 2020 Oracle and/or its affiliates. -Copyright (c) 2020, 2022 Oracle and/or its affiliates. -Copyright (c) 2020, 2023 Oracle and/or its affiliates. -Copyright (c) 2020, 2024 Oracle and/or its affiliates. diff --git a/tools/legal-review/project-manager/io.helidon.logging.helidon-logging-common-4.0.8/copyright-keep b/tools/legal-review/engine/io.helidon.logging.helidon-logging-common-4.1.2/copyright-keep similarity index 84% rename from tools/legal-review/project-manager/io.helidon.logging.helidon-logging-common-4.0.8/copyright-keep rename to tools/legal-review/engine/io.helidon.logging.helidon-logging-common-4.1.2/copyright-keep index 4b22a402cdee..46b88a615bd3 100644 --- a/tools/legal-review/project-manager/io.helidon.logging.helidon-logging-common-4.0.8/copyright-keep +++ b/tools/legal-review/engine/io.helidon.logging.helidon-logging-common-4.1.2/copyright-keep @@ -3,3 +3,4 @@ Copyright (c) 2020 Oracle and/or its affiliates. Copyright (c) 2020, 2022 Oracle and/or its affiliates. Copyright (c) 2020, 2023 Oracle and/or its affiliates. Copyright (c) 2020, 2024 Oracle and/or its affiliates. +Copyright (c) 2024 Oracle and/or its affiliates. diff --git a/tools/legal-review/engine/io.helidon.webclient.helidon-webclient-4.0.8/copyright-keep b/tools/legal-review/engine/io.helidon.webclient.helidon-webclient-4.1.2/copyright-keep similarity index 100% rename from tools/legal-review/engine/io.helidon.webclient.helidon-webclient-4.0.8/copyright-keep rename to tools/legal-review/engine/io.helidon.webclient.helidon-webclient-4.1.2/copyright-keep diff --git a/tools/legal-review/engine/io.helidon.webclient.helidon-webclient-http1-4.0.8/copyright-ignore b/tools/legal-review/engine/io.helidon.webclient.helidon-webclient-api-4.1.2/copyright-ignore similarity index 100% rename from tools/legal-review/engine/io.helidon.webclient.helidon-webclient-http1-4.0.8/copyright-ignore rename to tools/legal-review/engine/io.helidon.webclient.helidon-webclient-api-4.1.2/copyright-ignore diff --git a/tools/legal-review/engine/io.helidon.webclient.helidon-webclient-api-4.0.8/copyright-keep b/tools/legal-review/engine/io.helidon.webclient.helidon-webclient-api-4.1.2/copyright-keep similarity index 100% rename from tools/legal-review/engine/io.helidon.webclient.helidon-webclient-api-4.0.8/copyright-keep rename to tools/legal-review/engine/io.helidon.webclient.helidon-webclient-api-4.1.2/copyright-keep index da86cd1d12cf..4e64fde5a5ec 100644 --- a/tools/legal-review/engine/io.helidon.webclient.helidon-webclient-api-4.0.8/copyright-keep +++ b/tools/legal-review/engine/io.helidon.webclient.helidon-webclient-api-4.1.2/copyright-keep @@ -1,6 +1,6 @@ -Copyright (c) 2020, 2023 Oracle and/or its affiliates. -Copyright (c) 2022, 2023 Oracle and/or its affiliates. -Copyright (c) 2022, 2024 Oracle and/or its affiliates. -Copyright (c) 2023 Oracle and/or its affiliates. -Copyright (c) 2023, 2024 Oracle and/or its affiliates. Copyright (c) 2024 Oracle and/or its affiliates. +Copyright (c) 2023, 2024 Oracle and/or its affiliates. +Copyright (c) 2023 Oracle and/or its affiliates. +Copyright (c) 2022, 2024 Oracle and/or its affiliates. +Copyright (c) 2022, 2023 Oracle and/or its affiliates. +Copyright (c) 2020, 2023 Oracle and/or its affiliates. diff --git a/tools/legal-review/engine/io.helidon.webclient.helidon-webclient-websocket-4.0.8/copyright-ignore b/tools/legal-review/engine/io.helidon.webclient.helidon-webclient-http1-4.1.2/copyright-ignore similarity index 100% rename from tools/legal-review/engine/io.helidon.webclient.helidon-webclient-websocket-4.0.8/copyright-ignore rename to tools/legal-review/engine/io.helidon.webclient.helidon-webclient-http1-4.1.2/copyright-ignore diff --git a/tools/legal-review/project-manager/io.helidon.builder.helidon-builder-api-4.0.8/copyright-keep b/tools/legal-review/engine/io.helidon.webclient.helidon-webclient-http1-4.1.2/copyright-keep similarity index 100% rename from tools/legal-review/project-manager/io.helidon.builder.helidon-builder-api-4.0.8/copyright-keep rename to tools/legal-review/engine/io.helidon.webclient.helidon-webclient-http1-4.1.2/copyright-keep index 1536d2f9870d..133589b49c99 100644 --- a/tools/legal-review/project-manager/io.helidon.builder.helidon-builder-api-4.0.8/copyright-keep +++ b/tools/legal-review/engine/io.helidon.webclient.helidon-webclient-http1-4.1.2/copyright-keep @@ -1,5 +1,5 @@ -Copyright (c) 2022, 2023 Oracle and/or its affiliates. -Copyright (c) 2022, 2024 Oracle and/or its affiliates. -Copyright (c) 2023 Oracle and/or its affiliates. -Copyright (c) 2023, 2024 Oracle and/or its affiliates. Copyright (c) 2024 Oracle and/or its affiliates. +Copyright (c) 2023, 2024 Oracle and/or its affiliates. +Copyright (c) 2023 Oracle and/or its affiliates. +Copyright (c) 2022, 2024 Oracle and/or its affiliates. +Copyright (c) 2022, 2023 Oracle and/or its affiliates. diff --git a/tools/legal-review/engine/io.helidon.webclient.helidon-webclient-websocket-4.0.8/copyright-keep b/tools/legal-review/engine/io.helidon.webclient.helidon-webclient-websocket-4.1.2/copyright-keep similarity index 77% rename from tools/legal-review/engine/io.helidon.webclient.helidon-webclient-websocket-4.0.8/copyright-keep rename to tools/legal-review/engine/io.helidon.webclient.helidon-webclient-websocket-4.1.2/copyright-keep index b546632376a1..6afb1a99da96 100644 --- a/tools/legal-review/engine/io.helidon.webclient.helidon-webclient-websocket-4.0.8/copyright-keep +++ b/tools/legal-review/engine/io.helidon.webclient.helidon-webclient-websocket-4.1.2/copyright-keep @@ -1,4 +1,5 @@ -Copyright (c) 2022, 2024 Oracle and/or its affiliates. -Copyright (c) 2023 Oracle and/or its affiliates. -Copyright (c) 2023, 2024 Oracle and/or its affiliates. Copyright (c) 2024 Oracle and/or its affiliates. +Copyright (c) 2023, 2024 Oracle and/or its affiliates. +Copyright (c) 2023 Oracle and/or its affiliates. +Copyright (c) 2022, 2024 Oracle and/or its affiliates. +helidon-codegen-helidon-copyright diff --git a/tools/legal-review/engine/io.helidon.webserver.helidon-webserver-4.0.8/copyright-ignore b/tools/legal-review/engine/io.helidon.webserver.helidon-webserver-4.1.2/copyright-ignore similarity index 100% rename from tools/legal-review/engine/io.helidon.webserver.helidon-webserver-4.0.8/copyright-ignore rename to tools/legal-review/engine/io.helidon.webserver.helidon-webserver-4.1.2/copyright-ignore diff --git a/tools/legal-review/engine/io.helidon.webserver.helidon-webserver-4.0.8/copyright-keep b/tools/legal-review/engine/io.helidon.webserver.helidon-webserver-4.1.2/copyright-keep similarity index 100% rename from tools/legal-review/engine/io.helidon.webserver.helidon-webserver-4.0.8/copyright-keep rename to tools/legal-review/engine/io.helidon.webserver.helidon-webserver-4.1.2/copyright-keep diff --git a/tools/legal-review/engine/io.helidon.webserver.helidon-webserver-websocket-4.1.2/copyright-keep b/tools/legal-review/engine/io.helidon.webserver.helidon-webserver-websocket-4.1.2/copyright-keep new file mode 100644 index 000000000000..984d6db43454 --- /dev/null +++ b/tools/legal-review/engine/io.helidon.webserver.helidon-webserver-websocket-4.1.2/copyright-keep @@ -0,0 +1,6 @@ +Copyright (c) 2024 Oracle and/or its affiliates. +Copyright (c) 2023, 2024 Oracle and/or its affiliates. +Copyright (c) 2023 Oracle and/or its affiliates. +Copyright (c) 2022, 2024 Oracle and/or its affiliates. +Copyright (c) 2022, 2023 Oracle and/or its affiliates. +helidon-codegen-helidon-copyright diff --git a/tools/legal-review/engine/io.helidon.websocket.helidon-websocket-4.0.8/copyright-keep b/tools/legal-review/engine/io.helidon.websocket.helidon-websocket-4.0.8/copyright-keep deleted file mode 100644 index 75eb49ff37bd..000000000000 --- a/tools/legal-review/engine/io.helidon.websocket.helidon-websocket-4.0.8/copyright-keep +++ /dev/null @@ -1,4 +0,0 @@ -Copyright (c) 2022, 2023 Oracle and/or its affiliates. -Copyright (c) 2022, 2024 Oracle and/or its affiliates. -Copyright (c) 2023 Oracle and/or its affiliates. -Copyright (c) 2023, 2024 Oracle and/or its affiliates. diff --git a/tools/legal-review/engine/io.helidon.common.helidon-common-types-4.0.8/copyright-keep b/tools/legal-review/engine/io.helidon.websocket.helidon-websocket-4.1.2/copyright-keep similarity index 100% rename from tools/legal-review/engine/io.helidon.common.helidon-common-types-4.0.8/copyright-keep rename to tools/legal-review/engine/io.helidon.websocket.helidon-websocket-4.1.2/copyright-keep diff --git a/tools/legal-review/engine/report-state b/tools/legal-review/engine/report-state index 55cfd453e717..1a5bb7bf4cb4 100644 --- a/tools/legal-review/engine/report-state +++ b/tools/legal-review/engine/report-state @@ -1,3 +1,3 @@ -19F001BC871D58934CF6C85C14C7A446476DBA77F1C0D23AE14B885A65437915 -4023A94E9C4C20A053BCE1C592B04C6311759B9547E76748AD0F3DCB0A4C3ABC +531464D9E4442989B127753363F20DCDA3FDFEE8C20492720A5C9905BF2A1E1C +7B45943C89E109092F1FC330E1B2481EFA36F5D9387E15FDE6F195DE247FF2A8 0 diff --git a/tools/legal-review/project-manager/io.helidon.builder.helidon-builder-api-4.1.2/copyright-keep b/tools/legal-review/project-manager/io.helidon.builder.helidon-builder-api-4.1.2/copyright-keep new file mode 100644 index 000000000000..725fa1ee7707 --- /dev/null +++ b/tools/legal-review/project-manager/io.helidon.builder.helidon-builder-api-4.1.2/copyright-keep @@ -0,0 +1,10 @@ +Copyright (c) 2022, 2023 Oracle and/or its affiliates. +Copyright (c) 2022, 2024 Oracle and/or its affiliates. +Copyright (c) 2023 Oracle and/or its affiliates. +Copyright (c) 2023, 2024 Oracle and/or its affiliates. +Copyright (c) 2024 Oracle and/or its affiliates. +Copyright (c) 2024 Oracle and/or its affiliates. +Copyright (c) 2023, 2024 Oracle and/or its affiliates. +Copyright (c) 2023 Oracle and/or its affiliates. +Copyright (c) 2022, 2024 Oracle and/or its affiliates. +Copyright (c) 2022, 2023 Oracle and/or its affiliates. diff --git a/tools/legal-review/project-manager/io.helidon.common.features.helidon-common-features-4.0.8/copyright-keep b/tools/legal-review/project-manager/io.helidon.common.features.helidon-common-features-4.0.8/copyright-keep deleted file mode 100644 index 155f613ba687..000000000000 --- a/tools/legal-review/project-manager/io.helidon.common.features.helidon-common-features-4.0.8/copyright-keep +++ /dev/null @@ -1,5 +0,0 @@ -Copyright (c) 2019, 2023 Oracle and/or its affiliates. -Copyright (c) 2020, 2022 Oracle and/or its affiliates. -Copyright (c) 2022 Oracle and/or its affiliates. -Copyright (c) 2022, 2023 Oracle and/or its affiliates. -Copyright (c) 2022, 2024 Oracle and/or its affiliates. diff --git a/tools/legal-review/project-manager/io.helidon.common.features.helidon-common-features-4.1.2/copyright-keep b/tools/legal-review/project-manager/io.helidon.common.features.helidon-common-features-4.1.2/copyright-keep new file mode 100644 index 000000000000..58a0e5b2a085 --- /dev/null +++ b/tools/legal-review/project-manager/io.helidon.common.features.helidon-common-features-4.1.2/copyright-keep @@ -0,0 +1,11 @@ +Copyright (c) 2019, 2023 Oracle and/or its affiliates. +Copyright (c) 2020, 2022 Oracle and/or its affiliates. +Copyright (c) 2022 Oracle and/or its affiliates. +Copyright (c) 2022, 2023 Oracle and/or its affiliates. +Copyright (c) 2022, 2024 Oracle and/or its affiliates. +Copyright (c) 2024 Oracle and/or its affiliates. +Copyright (c) 2022, 2024 Oracle and/or its affiliates. +Copyright (c) 2022, 2023 Oracle and/or its affiliates. +Copyright (c) 2022 Oracle and/or its affiliates. +Copyright (c) 2020, 2022 Oracle and/or its affiliates. +Copyright (c) 2019, 2023 Oracle and/or its affiliates. diff --git a/tools/legal-review/engine/io.helidon.common.features.helidon-common-features-api-4.0.8/copyright-keep b/tools/legal-review/project-manager/io.helidon.common.features.helidon-common-features-api-4.1.2/copyright-keep similarity index 100% rename from tools/legal-review/engine/io.helidon.common.features.helidon-common-features-api-4.0.8/copyright-keep rename to tools/legal-review/project-manager/io.helidon.common.features.helidon-common-features-api-4.1.2/copyright-keep index dc4a47e996f2..19699134bd54 100644 --- a/tools/legal-review/engine/io.helidon.common.features.helidon-common-features-api-4.0.8/copyright-keep +++ b/tools/legal-review/project-manager/io.helidon.common.features.helidon-common-features-api-4.1.2/copyright-keep @@ -1,4 +1,4 @@ -Copyright (c) 2019, 2023 Oracle and/or its affiliates. -Copyright (c) 2022 Oracle and/or its affiliates. -Copyright (c) 2022, 2023 Oracle and/or its affiliates. Copyright (c) 2022, 2024 Oracle and/or its affiliates. +Copyright (c) 2022, 2023 Oracle and/or its affiliates. +Copyright (c) 2022 Oracle and/or its affiliates. +Copyright (c) 2019, 2023 Oracle and/or its affiliates. diff --git a/distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-4.0.8/NOTICES b/tools/legal-review/project-manager/io.helidon.common.helidon-common-4.1.2/copyright-keep similarity index 50% rename from distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-4.0.8/NOTICES rename to tools/legal-review/project-manager/io.helidon.common.helidon-common-4.1.2/copyright-keep index befbd926c86d..147ee935c7ab 100644 --- a/distribution/project-manager/THIRD-PARTY/io.helidon.common.helidon-common-4.0.8/NOTICES +++ b/tools/legal-review/project-manager/io.helidon.common.helidon-common-4.1.2/copyright-keep @@ -1,31 +1,30 @@ Copyright (c) 2017, 2021 Oracle and/or its affiliates. - -Copyright (c) 2017, 2022 Oracle and/or its affiliates. - -Copyright (c) 2017, 2023 Oracle and/or its affiliates. - Copyright (c) 2017, 2024 Oracle and/or its affiliates. - +Copyright (c) 2017, 2022 Oracle and/or its affiliates. Copyright (c) 2018, 2021 Oracle and/or its affiliates. - Copyright (c) 2018, 2024 Oracle and/or its affiliates. - Copyright (c) 2019, 2020 Oracle and/or its affiliates. - Copyright (c) 2019, 2021 Oracle and/or its affiliates. - Copyright (c) 2019, 2022 Oracle and/or its affiliates. - Copyright (c) 2019, 2023 Oracle and/or its affiliates. - Copyright (c) 2020 Oracle and/or its affiliates. - Copyright (c) 2021 Oracle and/or its affiliates. - Copyright (c) 2021, 2023 Oracle and/or its affiliates. - Copyright (c) 2022 Oracle and/or its affiliates. - Copyright (c) 2023 Oracle and/or its affiliates. - Copyright (c) 2024 Oracle and/or its affiliates. +Copyright (c) 2017, 2021 Oracle and/or its affiliates. +Copyright (c) 2017, 2022 Oracle and/or its affiliates. +Copyright (c) 2017, 2024 Oracle and/or its affiliates. +Copyright (c) 2024 Oracle and/or its affiliates. +Copyright (c) 2023 Oracle and/or its affiliates. +Copyright (c) 2022 Oracle and/or its affiliates. +Copyright (c) 2021, 2023 Oracle and/or its affiliates. +Copyright (c) 2021 Oracle and/or its affiliates. +Copyright (c) 2020 Oracle and/or its affiliates. +Copyright (c) 2019, 2023 Oracle and/or its affiliates. +Copyright (c) 2019, 2022 Oracle and/or its affiliates. +Copyright (c) 2019, 2021 Oracle and/or its affiliates. +Copyright (c) 2019, 2020 Oracle and/or its affiliates. +Copyright (c) 2018, 2024 Oracle and/or its affiliates. +Copyright (c) 2018, 2021 Oracle and/or its affiliates. diff --git a/tools/legal-review/project-manager/io.helidon.common.helidon-common-buffers-4.0.8/copyright-keep b/tools/legal-review/project-manager/io.helidon.common.helidon-common-buffers-4.1.2/copyright-keep similarity index 100% rename from tools/legal-review/project-manager/io.helidon.common.helidon-common-buffers-4.0.8/copyright-keep rename to tools/legal-review/project-manager/io.helidon.common.helidon-common-buffers-4.1.2/copyright-keep index f939f190f26f..3e26b42aa618 100644 --- a/tools/legal-review/project-manager/io.helidon.common.helidon-common-buffers-4.0.8/copyright-keep +++ b/tools/legal-review/project-manager/io.helidon.common.helidon-common-buffers-4.1.2/copyright-keep @@ -1,4 +1,4 @@ -Copyright (c) 2018, 2022 Oracle and/or its affiliates. -Copyright (c) 2022 Oracle and/or its affiliates. -Copyright (c) 2022, 2023 Oracle and/or its affiliates. Copyright (c) 2022, 2024 Oracle and/or its affiliates. +Copyright (c) 2022, 2023 Oracle and/or its affiliates. +Copyright (c) 2022 Oracle and/or its affiliates. +Copyright (c) 2018, 2022 Oracle and/or its affiliates. diff --git a/tools/legal-review/project-manager/io.helidon.common.helidon-common-config-4.0.8/copyright-keep b/tools/legal-review/project-manager/io.helidon.common.helidon-common-config-4.1.2/copyright-keep similarity index 100% rename from tools/legal-review/project-manager/io.helidon.common.helidon-common-config-4.0.8/copyright-keep rename to tools/legal-review/project-manager/io.helidon.common.helidon-common-config-4.1.2/copyright-keep index e4b9fe1779fc..1049013b5132 100644 --- a/tools/legal-review/project-manager/io.helidon.common.helidon-common-config-4.0.8/copyright-keep +++ b/tools/legal-review/project-manager/io.helidon.common.helidon-common-config-4.1.2/copyright-keep @@ -1,8 +1,8 @@ -Copyright (c) 2017, 2022 Oracle and/or its affiliates. -Copyright (c) 2018, 2023 Oracle and/or its affiliates. -Copyright (c) 2018, 2024 Oracle and/or its affiliates. -Copyright (c) 2019, 2023 Oracle and/or its affiliates. -Copyright (c) 2022 Oracle and/or its affiliates. -Copyright (c) 2022, 2023 Oracle and/or its affiliates. -Copyright (c) 2022, 2024 Oracle and/or its affiliates. Copyright (c) 2023 Oracle and/or its affiliates. +Copyright (c) 2022, 2024 Oracle and/or its affiliates. +Copyright (c) 2022, 2023 Oracle and/or its affiliates. +Copyright (c) 2022 Oracle and/or its affiliates. +Copyright (c) 2019, 2023 Oracle and/or its affiliates. +Copyright (c) 2018, 2024 Oracle and/or its affiliates. +Copyright (c) 2018, 2023 Oracle and/or its affiliates. +Copyright (c) 2017, 2022 Oracle and/or its affiliates. diff --git a/tools/legal-review/engine/io.helidon.webserver.helidon-webserver-websocket-4.0.8/copyright-ignore b/tools/legal-review/project-manager/io.helidon.common.helidon-common-configurable-4.1.2/copyright-ignore similarity index 100% rename from tools/legal-review/engine/io.helidon.webserver.helidon-webserver-websocket-4.0.8/copyright-ignore rename to tools/legal-review/project-manager/io.helidon.common.helidon-common-configurable-4.1.2/copyright-ignore diff --git a/tools/legal-review/engine/io.helidon.common.helidon-common-configurable-4.0.8/copyright-keep b/tools/legal-review/project-manager/io.helidon.common.helidon-common-configurable-4.1.2/copyright-keep similarity index 84% rename from tools/legal-review/engine/io.helidon.common.helidon-common-configurable-4.0.8/copyright-keep rename to tools/legal-review/project-manager/io.helidon.common.helidon-common-configurable-4.1.2/copyright-keep index f8108a06f9fd..f5fb3f9166d0 100644 --- a/tools/legal-review/engine/io.helidon.common.helidon-common-configurable-4.0.8/copyright-keep +++ b/tools/legal-review/project-manager/io.helidon.common.helidon-common-configurable-4.1.2/copyright-keep @@ -1,11 +1,13 @@ -Copyright (c) 2017, 2021 Oracle and/or its affiliates. -Copyright (c) 2017, 2022 Oracle and/or its affiliates. -Copyright (c) 2017, 2023 Oracle and/or its affiliates. -Copyright (c) 2018, 2023 Oracle and/or its affiliates. -Copyright (c) 2018, 2024 Oracle and/or its affiliates. -Copyright (c) 2019, 2022 Oracle and/or its affiliates. -Copyright (c) 2019, 2023 Oracle and/or its affiliates. -Copyright (c) 2022 Oracle and/or its affiliates. -Copyright (c) 2022, 2023 Oracle and/or its affiliates. -Copyright (c) 2023 Oracle and/or its affiliates. Copyright (c) 2024 Oracle and/or its affiliates. +Copyright (c) 2023, 2024 Oracle and/or its affiliates. +Copyright (c) 2023 Oracle and/or its affiliates. +Copyright (c) 2022, 2024 Oracle and/or its affiliates. +Copyright (c) 2022, 2023 Oracle and/or its affiliates. +Copyright (c) 2022 Oracle and/or its affiliates. +Copyright (c) 2019, 2023 Oracle and/or its affiliates. +Copyright (c) 2019, 2022 Oracle and/or its affiliates. +Copyright (c) 2018, 2024 Oracle and/or its affiliates. +Copyright (c) 2018, 2023 Oracle and/or its affiliates. +Copyright (c) 2017, 2023 Oracle and/or its affiliates. +Copyright (c) 2017, 2022 Oracle and/or its affiliates. +Copyright (c) 2017, 2021 Oracle and/or its affiliates. diff --git a/tools/legal-review/engine/io.helidon.common.helidon-common-context-4.0.8/copyright-keep b/tools/legal-review/project-manager/io.helidon.common.helidon-common-context-4.1.2/copyright-keep similarity index 85% rename from tools/legal-review/engine/io.helidon.common.helidon-common-context-4.0.8/copyright-keep rename to tools/legal-review/project-manager/io.helidon.common.helidon-common-context-4.1.2/copyright-keep index 03d6fcbe1485..07361f1b408e 100644 --- a/tools/legal-review/engine/io.helidon.common.helidon-common-context-4.0.8/copyright-keep +++ b/tools/legal-review/project-manager/io.helidon.common.helidon-common-context-4.1.2/copyright-keep @@ -1,7 +1,6 @@ -Copyright (c) 2019, 2020 Oracle and/or its affiliates. -Copyright (c) 2019, 2021 Oracle and/or its affiliates. -Copyright (c) 2019, 2022 Oracle and/or its affiliates. -Copyright (c) 2019, 2023 Oracle and/or its affiliates. -Copyright (c) 2019, 2024 Oracle and/or its affiliates. -Copyright (c) 2020 Oracle and/or its affiliates. Copyright (c) 2020, 2022 Oracle and/or its affiliates. +Copyright (c) 2020 Oracle and/or its affiliates. +Copyright (c) 2019, 2024 Oracle and/or its affiliates. +Copyright (c) 2019, 2023 Oracle and/or its affiliates. +Copyright (c) 2019, 2021 Oracle and/or its affiliates. +Copyright (c) 2019, 2020 Oracle and/or its affiliates. diff --git a/tools/legal-review/project-manager/io.helidon.common.helidon-common-configurable-4.0.8/copyright-ignore b/tools/legal-review/project-manager/io.helidon.common.helidon-common-key-util-4.1.2/copyright-ignore similarity index 100% rename from tools/legal-review/project-manager/io.helidon.common.helidon-common-configurable-4.0.8/copyright-ignore rename to tools/legal-review/project-manager/io.helidon.common.helidon-common-key-util-4.1.2/copyright-ignore diff --git a/tools/legal-review/project-manager/io.helidon.common.helidon-common-key-util-4.0.8/copyright-keep b/tools/legal-review/project-manager/io.helidon.common.helidon-common-key-util-4.1.2/copyright-keep similarity index 100% rename from tools/legal-review/project-manager/io.helidon.common.helidon-common-key-util-4.0.8/copyright-keep rename to tools/legal-review/project-manager/io.helidon.common.helidon-common-key-util-4.1.2/copyright-keep index b9f28539f8af..1c208826c7a3 100644 --- a/tools/legal-review/project-manager/io.helidon.common.helidon-common-key-util-4.0.8/copyright-keep +++ b/tools/legal-review/project-manager/io.helidon.common.helidon-common-key-util-4.1.2/copyright-keep @@ -1,8 +1,8 @@ -Copyright (c) 2017, 2021 Oracle and/or its affiliates. -Copyright (c) 2017, 2023 Oracle and/or its affiliates. -Copyright (c) 2017, 2024 Oracle and/or its affiliates. -Copyright (c) 2018, 2024 Oracle and/or its affiliates. -Copyright (c) 2021, 2022 Oracle and/or its affiliates. -Copyright (c) 2023 Oracle and/or its affiliates. -Copyright (c) 2023, 2024 Oracle and/or its affiliates. Copyright (c) 2024 Oracle and/or its affiliates. +Copyright (c) 2023, 2024 Oracle and/or its affiliates. +Copyright (c) 2023 Oracle and/or its affiliates. +Copyright (c) 2021, 2022 Oracle and/or its affiliates. +Copyright (c) 2018, 2024 Oracle and/or its affiliates. +Copyright (c) 2017, 2024 Oracle and/or its affiliates. +Copyright (c) 2017, 2023 Oracle and/or its affiliates. +Copyright (c) 2017, 2021 Oracle and/or its affiliates. diff --git a/tools/legal-review/project-manager/io.helidon.common.helidon-common-mapper-4.0.8/copyright-keep b/tools/legal-review/project-manager/io.helidon.common.helidon-common-mapper-4.1.2/copyright-keep similarity index 100% rename from tools/legal-review/project-manager/io.helidon.common.helidon-common-mapper-4.0.8/copyright-keep rename to tools/legal-review/project-manager/io.helidon.common.helidon-common-mapper-4.1.2/copyright-keep index 69db29aa2ed5..d0f64048a0e5 100644 --- a/tools/legal-review/project-manager/io.helidon.common.helidon-common-mapper-4.0.8/copyright-keep +++ b/tools/legal-review/project-manager/io.helidon.common.helidon-common-mapper-4.1.2/copyright-keep @@ -1,7 +1,7 @@ -Copyright (c) 2019, 2021 Oracle and/or its affiliates. -Copyright (c) 2019, 2023 Oracle and/or its affiliates. -Copyright (c) 2019, 2024 Oracle and/or its affiliates. -Copyright (c) 2020, 2021 Oracle and/or its affiliates. -Copyright (c) 2022 Oracle and/or its affiliates. -Copyright (c) 2023 Oracle and/or its affiliates. Copyright (c) 2023, 2024 Oracle and/or its affiliates. +Copyright (c) 2023 Oracle and/or its affiliates. +Copyright (c) 2022 Oracle and/or its affiliates. +Copyright (c) 2020, 2021 Oracle and/or its affiliates. +Copyright (c) 2019, 2024 Oracle and/or its affiliates. +Copyright (c) 2019, 2023 Oracle and/or its affiliates. +Copyright (c) 2019, 2021 Oracle and/or its affiliates. diff --git a/tools/legal-review/project-manager/io.helidon.common.helidon-common-media-type-4.0.8/copyright-keep b/tools/legal-review/project-manager/io.helidon.common.helidon-common-media-type-4.1.2/copyright-keep similarity index 100% rename from tools/legal-review/project-manager/io.helidon.common.helidon-common-media-type-4.0.8/copyright-keep rename to tools/legal-review/project-manager/io.helidon.common.helidon-common-media-type-4.1.2/copyright-keep index 37ae4c3edaac..61795397b2d0 100644 --- a/tools/legal-review/project-manager/io.helidon.common.helidon-common-media-type-4.0.8/copyright-keep +++ b/tools/legal-review/project-manager/io.helidon.common.helidon-common-media-type-4.1.2/copyright-keep @@ -1,8 +1,8 @@ -Copyright (c) 2019, 2021 Oracle and/or its affiliates. -Copyright (c) 2019, 2022 Oracle and/or its affiliates. -Copyright (c) 2019, 2023 Oracle and/or its affiliates. -Copyright (c) 2019, 2024 Oracle and/or its affiliates. -Copyright (c) 2022 Oracle and/or its affiliates. -Copyright (c) 2022, 2023 Oracle and/or its affiliates. -Copyright (c) 2022, 2024 Oracle and/or its affiliates. Copyright (c) 2023 Oracle and/or its affiliates. +Copyright (c) 2022, 2024 Oracle and/or its affiliates. +Copyright (c) 2022, 2023 Oracle and/or its affiliates. +Copyright (c) 2022 Oracle and/or its affiliates. +Copyright (c) 2019, 2024 Oracle and/or its affiliates. +Copyright (c) 2019, 2023 Oracle and/or its affiliates. +Copyright (c) 2019, 2022 Oracle and/or its affiliates. +Copyright (c) 2019, 2021 Oracle and/or its affiliates. diff --git a/tools/legal-review/engine/io.helidon.common.helidon-common-parameters-4.0.8/copyright-keep b/tools/legal-review/project-manager/io.helidon.common.helidon-common-parameters-4.1.2/copyright-keep similarity index 100% rename from tools/legal-review/engine/io.helidon.common.helidon-common-parameters-4.0.8/copyright-keep rename to tools/legal-review/project-manager/io.helidon.common.helidon-common-parameters-4.1.2/copyright-keep index 44f653e0c1d6..9225963f4ab9 100644 --- a/tools/legal-review/engine/io.helidon.common.helidon-common-parameters-4.0.8/copyright-keep +++ b/tools/legal-review/project-manager/io.helidon.common.helidon-common-parameters-4.1.2/copyright-keep @@ -1,3 +1,3 @@ -Copyright (c) 2022 Oracle and/or its affiliates. -Copyright (c) 2022, 2023 Oracle and/or its affiliates. Copyright (c) 2022, 2024 Oracle and/or its affiliates. +Copyright (c) 2022, 2023 Oracle and/or its affiliates. +Copyright (c) 2022 Oracle and/or its affiliates. diff --git a/tools/legal-review/project-manager/io.helidon.common.helidon-common-security-4.0.8/copyright-keep b/tools/legal-review/project-manager/io.helidon.common.helidon-common-security-4.1.2/copyright-keep similarity index 100% rename from tools/legal-review/project-manager/io.helidon.common.helidon-common-security-4.0.8/copyright-keep rename to tools/legal-review/project-manager/io.helidon.common.helidon-common-security-4.1.2/copyright-keep index 44f653e0c1d6..9225963f4ab9 100644 --- a/tools/legal-review/project-manager/io.helidon.common.helidon-common-security-4.0.8/copyright-keep +++ b/tools/legal-review/project-manager/io.helidon.common.helidon-common-security-4.1.2/copyright-keep @@ -1,3 +1,3 @@ -Copyright (c) 2022 Oracle and/or its affiliates. -Copyright (c) 2022, 2023 Oracle and/or its affiliates. Copyright (c) 2022, 2024 Oracle and/or its affiliates. +Copyright (c) 2022, 2023 Oracle and/or its affiliates. +Copyright (c) 2022 Oracle and/or its affiliates. diff --git a/tools/legal-review/project-manager/io.helidon.common.helidon-common-key-util-4.0.8/copyright-ignore b/tools/legal-review/project-manager/io.helidon.common.helidon-common-socket-4.1.2/copyright-ignore similarity index 100% rename from tools/legal-review/project-manager/io.helidon.common.helidon-common-key-util-4.0.8/copyright-ignore rename to tools/legal-review/project-manager/io.helidon.common.helidon-common-socket-4.1.2/copyright-ignore diff --git a/tools/legal-review/engine/io.helidon.common.helidon-common-socket-4.0.8/copyright-keep b/tools/legal-review/project-manager/io.helidon.common.helidon-common-socket-4.1.2/copyright-keep similarity index 100% rename from tools/legal-review/engine/io.helidon.common.helidon-common-socket-4.0.8/copyright-keep rename to tools/legal-review/project-manager/io.helidon.common.helidon-common-socket-4.1.2/copyright-keep index 91a06b3072e0..b4e48fe96f84 100644 --- a/tools/legal-review/engine/io.helidon.common.helidon-common-socket-4.0.8/copyright-keep +++ b/tools/legal-review/project-manager/io.helidon.common.helidon-common-socket-4.1.2/copyright-keep @@ -1,5 +1,5 @@ -Copyright (c) 2022 Oracle and/or its affiliates. -Copyright (c) 2022, 2023 Oracle and/or its affiliates. -Copyright (c) 2022, 2024 Oracle and/or its affiliates. -Copyright (c) 2023 Oracle and/or its affiliates. Copyright (c) 2024 Oracle and/or its affiliates. +Copyright (c) 2023 Oracle and/or its affiliates. +Copyright (c) 2022, 2024 Oracle and/or its affiliates. +Copyright (c) 2022, 2023 Oracle and/or its affiliates. +Copyright (c) 2022 Oracle and/or its affiliates. diff --git a/tools/legal-review/project-manager/io.helidon.common.helidon-common-task-4.0.8/copyright-keep b/tools/legal-review/project-manager/io.helidon.common.helidon-common-task-4.1.2/copyright-keep similarity index 100% rename from tools/legal-review/project-manager/io.helidon.common.helidon-common-task-4.0.8/copyright-keep rename to tools/legal-review/project-manager/io.helidon.common.helidon-common-task-4.1.2/copyright-keep index 022f8853db00..ab9d42a68617 100644 --- a/tools/legal-review/project-manager/io.helidon.common.helidon-common-task-4.0.8/copyright-keep +++ b/tools/legal-review/project-manager/io.helidon.common.helidon-common-task-4.1.2/copyright-keep @@ -1,2 +1,2 @@ -Copyright (c) 2023 Oracle and/or its affiliates. Copyright (c) 2023, 2024 Oracle and/or its affiliates. +Copyright (c) 2023 Oracle and/or its affiliates. diff --git a/tools/legal-review/project-manager/io.helidon.common.helidon-common-tls-4.0.8/copyright-keep b/tools/legal-review/project-manager/io.helidon.common.helidon-common-tls-4.0.8/copyright-keep deleted file mode 100644 index 1536d2f9870d..000000000000 --- a/tools/legal-review/project-manager/io.helidon.common.helidon-common-tls-4.0.8/copyright-keep +++ /dev/null @@ -1,5 +0,0 @@ -Copyright (c) 2022, 2023 Oracle and/or its affiliates. -Copyright (c) 2022, 2024 Oracle and/or its affiliates. -Copyright (c) 2023 Oracle and/or its affiliates. -Copyright (c) 2023, 2024 Oracle and/or its affiliates. -Copyright (c) 2024 Oracle and/or its affiliates. diff --git a/tools/legal-review/project-manager/io.helidon.common.helidon-common-socket-4.0.8/copyright-ignore b/tools/legal-review/project-manager/io.helidon.common.helidon-common-tls-4.1.2/copyright-ignore similarity index 100% rename from tools/legal-review/project-manager/io.helidon.common.helidon-common-socket-4.0.8/copyright-ignore rename to tools/legal-review/project-manager/io.helidon.common.helidon-common-tls-4.1.2/copyright-ignore diff --git a/tools/legal-review/engine/io.helidon.http.media.helidon-http-media-4.0.8/copyright-keep b/tools/legal-review/project-manager/io.helidon.common.helidon-common-tls-4.1.2/copyright-keep similarity index 100% rename from tools/legal-review/engine/io.helidon.http.media.helidon-http-media-4.0.8/copyright-keep rename to tools/legal-review/project-manager/io.helidon.common.helidon-common-tls-4.1.2/copyright-keep index 1536d2f9870d..133589b49c99 100644 --- a/tools/legal-review/engine/io.helidon.http.media.helidon-http-media-4.0.8/copyright-keep +++ b/tools/legal-review/project-manager/io.helidon.common.helidon-common-tls-4.1.2/copyright-keep @@ -1,5 +1,5 @@ -Copyright (c) 2022, 2023 Oracle and/or its affiliates. -Copyright (c) 2022, 2024 Oracle and/or its affiliates. -Copyright (c) 2023 Oracle and/or its affiliates. -Copyright (c) 2023, 2024 Oracle and/or its affiliates. Copyright (c) 2024 Oracle and/or its affiliates. +Copyright (c) 2023, 2024 Oracle and/or its affiliates. +Copyright (c) 2023 Oracle and/or its affiliates. +Copyright (c) 2022, 2024 Oracle and/or its affiliates. +Copyright (c) 2022, 2023 Oracle and/or its affiliates. diff --git a/tools/legal-review/project-manager/io.helidon.common.helidon-common-types-4.0.8/copyright-keep b/tools/legal-review/project-manager/io.helidon.common.helidon-common-types-4.0.8/copyright-keep deleted file mode 100644 index 75eb49ff37bd..000000000000 --- a/tools/legal-review/project-manager/io.helidon.common.helidon-common-types-4.0.8/copyright-keep +++ /dev/null @@ -1,4 +0,0 @@ -Copyright (c) 2022, 2023 Oracle and/or its affiliates. -Copyright (c) 2022, 2024 Oracle and/or its affiliates. -Copyright (c) 2023 Oracle and/or its affiliates. -Copyright (c) 2023, 2024 Oracle and/or its affiliates. diff --git a/tools/legal-review/project-manager/io.helidon.common.helidon-common-types-4.1.2/copyright-keep b/tools/legal-review/project-manager/io.helidon.common.helidon-common-types-4.1.2/copyright-keep new file mode 100644 index 000000000000..133589b49c99 --- /dev/null +++ b/tools/legal-review/project-manager/io.helidon.common.helidon-common-types-4.1.2/copyright-keep @@ -0,0 +1,5 @@ +Copyright (c) 2024 Oracle and/or its affiliates. +Copyright (c) 2023, 2024 Oracle and/or its affiliates. +Copyright (c) 2023 Oracle and/or its affiliates. +Copyright (c) 2022, 2024 Oracle and/or its affiliates. +Copyright (c) 2022, 2023 Oracle and/or its affiliates. diff --git a/tools/legal-review/project-manager/io.helidon.common.helidon-common-tls-4.0.8/copyright-ignore b/tools/legal-review/project-manager/io.helidon.common.helidon-common-uri-4.1.2/copyright-ignore similarity index 100% rename from tools/legal-review/project-manager/io.helidon.common.helidon-common-tls-4.0.8/copyright-ignore rename to tools/legal-review/project-manager/io.helidon.common.helidon-common-uri-4.1.2/copyright-ignore diff --git a/tools/legal-review/engine/io.helidon.common.helidon-common-uri-4.0.8/copyright-keep b/tools/legal-review/project-manager/io.helidon.common.helidon-common-uri-4.1.2/copyright-keep similarity index 84% rename from tools/legal-review/engine/io.helidon.common.helidon-common-uri-4.0.8/copyright-keep rename to tools/legal-review/project-manager/io.helidon.common.helidon-common-uri-4.1.2/copyright-keep index bc893c7761cb..cb9c180b653a 100644 --- a/tools/legal-review/engine/io.helidon.common.helidon-common-uri-4.0.8/copyright-keep +++ b/tools/legal-review/project-manager/io.helidon.common.helidon-common-uri-4.1.2/copyright-keep @@ -1,6 +1,5 @@ -Copyright (c) 2022 Oracle and/or its affiliates. -Copyright (c) 2022, 2023 Oracle and/or its affiliates. -Copyright (c) 2022, 2024 Oracle and/or its affiliates. -Copyright (c) 2023 Oracle and/or its affiliates. -Copyright (c) 2023, 2024 Oracle and/or its affiliates. Copyright (c) 2024 Oracle and/or its affiliates. +Copyright (c) 2023, 2024 Oracle and/or its affiliates. +Copyright (c) 2022, 2024 Oracle and/or its affiliates. +Copyright (c) 2022, 2023 Oracle and/or its affiliates. +Copyright (c) 2022 Oracle and/or its affiliates. diff --git a/tools/legal-review/project-manager/io.helidon.config.helidon-config-4.0.8/copyright-ignore b/tools/legal-review/project-manager/io.helidon.config.helidon-config-4.0.8/copyright-ignore deleted file mode 100644 index 8338fbe2e55b..000000000000 --- a/tools/legal-review/project-manager/io.helidon.config.helidon-config-4.0.8/copyright-ignore +++ /dev/null @@ -1,2 +0,0 @@ -helidon-common-processor-helidon-copyright -helidon-common-processor-helidon-copyright diff --git a/tools/legal-review/project-manager/io.helidon.common.helidon-common-uri-4.0.8/copyright-ignore b/tools/legal-review/project-manager/io.helidon.config.helidon-config-4.1.2/copyright-ignore similarity index 100% rename from tools/legal-review/project-manager/io.helidon.common.helidon-common-uri-4.0.8/copyright-ignore rename to tools/legal-review/project-manager/io.helidon.config.helidon-config-4.1.2/copyright-ignore diff --git a/tools/legal-review/project-manager/io.helidon.config.helidon-config-4.1.2/copyright-keep b/tools/legal-review/project-manager/io.helidon.config.helidon-config-4.1.2/copyright-keep new file mode 100644 index 000000000000..5940109a0634 --- /dev/null +++ b/tools/legal-review/project-manager/io.helidon.config.helidon-config-4.1.2/copyright-keep @@ -0,0 +1,42 @@ +Copyright (c) 2017, 2020 Oracle and/or its affiliates. +Copyright (c) 2017, 2021 Oracle and/or its affiliates. +Copyright (c) 2017, 2022 Oracle and/or its affiliates. +Copyright (c) 2017, 2023 Oracle and/or its affiliates. +Copyright (c) 2017, 2024 Oracle and/or its affiliates. +Copyright (c) 2018, 2022 Oracle and/or its affiliates. +Copyright (c) 2018, 2023 Oracle and/or its affiliates. +Copyright (c) 2019, 2020 Oracle and/or its affiliates. +Copyright (c) 2019, 2022 Oracle and/or its affiliates. +Copyright (c) 2020 Oracle and/or its affiliates. +Copyright (c) 2020, 2021 Oracle and/or its affiliates. +Copyright (c) 2020, 2022 Oracle and/or its affiliates. +Copyright (c) 2020, 2023 Oracle and/or its affiliates. +Copyright (c) 2020, 2024 Oracle and/or its affiliates. +Copyright (c) 2021 Oracle and/or its affiliates. +Copyright (c) 2021, 2023 Oracle and/or its affiliates. +Copyright (c) 2022, 2023 Oracle and/or its affiliates. +Copyright (c) 2023 Oracle and/or its affiliates. +Copyright (c) 2024 Oracle and/or its affiliates. +Copyright (c) 2019, 2021 Oracle and/or its affiliates. +Copyright (c) 2017, 2020 Oracle and/or its affiliates. +Copyright (c) 2017, 2021 Oracle and/or its affiliates. +Copyright (c) 2017, 2022 Oracle and/or its affiliates. +Copyright (c) 2017, 2023 Oracle and/or its affiliates. +Copyright (c) 2017, 2024 Oracle and/or its affiliates. +Copyright (c) 2018, 2022 Oracle and/or its affiliates. +Copyright (c) 2018, 2023 Oracle and/or its affiliates. +Copyright (c) 2019, 2020 Oracle and/or its affiliates. +Copyright (c) 2019, 2021 Oracle and/or its affiliates. +Copyright (c) 2019, 2022 Oracle and/or its affiliates. +Copyright (c) 2019, 2024 Oracle and/or its affiliates. +Copyright (c) 2020 Oracle and/or its affiliates. +Copyright (c) 2020, 2021 Oracle and/or its affiliates. +Copyright (c) 2020, 2022 Oracle and/or its affiliates. +Copyright (c) 2020, 2023 Oracle and/or its affiliates. +Copyright (c) 2020, 2024 Oracle and/or its affiliates. +Copyright (c) 2021 Oracle and/or its affiliates. +Copyright (c) 2021, 2023 Oracle and/or its affiliates. +Copyright (c) 2022, 2023 Oracle and/or its affiliates. +Copyright (c) 2022, 2024 Oracle and/or its affiliates. +Copyright (c) 2023 Oracle and/or its affiliates. +Copyright (c) 2024 Oracle and/or its affiliates. diff --git a/tools/legal-review/project-manager/io.helidon.helidon-4.0.8/copyright-keep b/tools/legal-review/project-manager/io.helidon.helidon-4.0.8/copyright-keep deleted file mode 100644 index d2344b7f6a4a..000000000000 --- a/tools/legal-review/project-manager/io.helidon.helidon-4.0.8/copyright-keep +++ /dev/null @@ -1,4 +0,0 @@ -Copyright (c) 2022, 2023 Oracle and/or its affiliates. -Copyright (c) 2023 Oracle and/or its affiliates. -Copyright (c) 2023, 2024 Oracle and/or its affiliates. -Copyright (c) 2024 Oracle and/or its affiliates. diff --git a/tools/legal-review/project-manager/io.helidon.helidon-4.1.2/copyright-keep b/tools/legal-review/project-manager/io.helidon.helidon-4.1.2/copyright-keep new file mode 100644 index 000000000000..090708464705 --- /dev/null +++ b/tools/legal-review/project-manager/io.helidon.helidon-4.1.2/copyright-keep @@ -0,0 +1,8 @@ +Copyright (c) 2022, 2023 Oracle and/or its affiliates. +Copyright (c) 2023 Oracle and/or its affiliates. +Copyright (c) 2023, 2024 Oracle and/or its affiliates. +Copyright (c) 2024 Oracle and/or its affiliates. +Copyright (c) 2024 Oracle and/or its affiliates. +Copyright (c) 2023, 2024 Oracle and/or its affiliates. +Copyright (c) 2023 Oracle and/or its affiliates. +Copyright (c) 2022, 2023 Oracle and/or its affiliates. diff --git a/tools/legal-review/project-manager/io.helidon.http.encoding.helidon-http-encoding-4.0.8/copyright-keep b/tools/legal-review/project-manager/io.helidon.http.encoding.helidon-http-encoding-4.0.8/copyright-keep deleted file mode 100644 index 1536d2f9870d..000000000000 --- a/tools/legal-review/project-manager/io.helidon.http.encoding.helidon-http-encoding-4.0.8/copyright-keep +++ /dev/null @@ -1,5 +0,0 @@ -Copyright (c) 2022, 2023 Oracle and/or its affiliates. -Copyright (c) 2022, 2024 Oracle and/or its affiliates. -Copyright (c) 2023 Oracle and/or its affiliates. -Copyright (c) 2023, 2024 Oracle and/or its affiliates. -Copyright (c) 2024 Oracle and/or its affiliates. diff --git a/tools/legal-review/project-manager/io.helidon.webserver.helidon-webserver-websocket-4.0.8/copyright-ignore b/tools/legal-review/project-manager/io.helidon.http.encoding.helidon-http-encoding-4.1.2/copyright-ignore similarity index 50% rename from tools/legal-review/project-manager/io.helidon.webserver.helidon-webserver-websocket-4.0.8/copyright-ignore rename to tools/legal-review/project-manager/io.helidon.http.encoding.helidon-http-encoding-4.1.2/copyright-ignore index ab09cc389a35..160dd9d6c4b0 100644 --- a/tools/legal-review/project-manager/io.helidon.webserver.helidon-webserver-websocket-4.0.8/copyright-ignore +++ b/tools/legal-review/project-manager/io.helidon.http.encoding.helidon-http-encoding-4.1.2/copyright-ignore @@ -1 +1,2 @@ helidon-codegen-helidon-copyright +helidon-codegen-helidon-copyright diff --git a/tools/legal-review/project-manager/io.helidon.http.encoding.helidon-http-encoding-4.1.2/copyright-keep b/tools/legal-review/project-manager/io.helidon.http.encoding.helidon-http-encoding-4.1.2/copyright-keep new file mode 100644 index 000000000000..725fa1ee7707 --- /dev/null +++ b/tools/legal-review/project-manager/io.helidon.http.encoding.helidon-http-encoding-4.1.2/copyright-keep @@ -0,0 +1,10 @@ +Copyright (c) 2022, 2023 Oracle and/or its affiliates. +Copyright (c) 2022, 2024 Oracle and/or its affiliates. +Copyright (c) 2023 Oracle and/or its affiliates. +Copyright (c) 2023, 2024 Oracle and/or its affiliates. +Copyright (c) 2024 Oracle and/or its affiliates. +Copyright (c) 2024 Oracle and/or its affiliates. +Copyright (c) 2023, 2024 Oracle and/or its affiliates. +Copyright (c) 2023 Oracle and/or its affiliates. +Copyright (c) 2022, 2024 Oracle and/or its affiliates. +Copyright (c) 2022, 2023 Oracle and/or its affiliates. diff --git a/tools/legal-review/project-manager/io.helidon.http.helidon-http-4.0.8/copyright-keep b/tools/legal-review/project-manager/io.helidon.http.helidon-http-4.1.2/copyright-keep similarity index 50% rename from tools/legal-review/project-manager/io.helidon.http.helidon-http-4.0.8/copyright-keep rename to tools/legal-review/project-manager/io.helidon.http.helidon-http-4.1.2/copyright-keep index b4263f37e3d2..94bef4cf382b 100644 --- a/tools/legal-review/project-manager/io.helidon.http.helidon-http-4.0.8/copyright-keep +++ b/tools/legal-review/project-manager/io.helidon.http.helidon-http-4.1.2/copyright-keep @@ -7,3 +7,12 @@ Copyright (c) 2022, 2024 Oracle and/or its affiliates. Copyright (c) 2023 Oracle and/or its affiliates. Copyright (c) 2023, 2024 Oracle and/or its affiliates. Copyright (c) 2024 Oracle and/or its affiliates. +Copyright (c) 2024 Oracle and/or its affiliates. +Copyright (c) 2023, 2024 Oracle and/or its affiliates. +Copyright (c) 2023 Oracle and/or its affiliates. +Copyright (c) 2022, 2024 Oracle and/or its affiliates. +Copyright (c) 2022, 2023 Oracle and/or its affiliates. +Copyright (c) 2021, 2023 Oracle and/or its affiliates. +Copyright (c) 2018, 2024 Oracle and/or its affiliates. +Copyright (c) 2018, 2023 Oracle and/or its affiliates. +Copyright (c) 2017, 2023 Oracle and/or its affiliates. diff --git a/tools/legal-review/project-manager/io.helidon.http.media.helidon-http-media-4.0.8/copyright-keep b/tools/legal-review/project-manager/io.helidon.http.media.helidon-http-media-4.0.8/copyright-keep deleted file mode 100644 index 1536d2f9870d..000000000000 --- a/tools/legal-review/project-manager/io.helidon.http.media.helidon-http-media-4.0.8/copyright-keep +++ /dev/null @@ -1,5 +0,0 @@ -Copyright (c) 2022, 2023 Oracle and/or its affiliates. -Copyright (c) 2022, 2024 Oracle and/or its affiliates. -Copyright (c) 2023 Oracle and/or its affiliates. -Copyright (c) 2023, 2024 Oracle and/or its affiliates. -Copyright (c) 2024 Oracle and/or its affiliates. diff --git a/tools/legal-review/project-manager/io.helidon.webclient.helidon-webclient-websocket-4.0.8/copyright-ignore b/tools/legal-review/project-manager/io.helidon.http.media.helidon-http-media-4.1.2/copyright-ignore similarity index 50% rename from tools/legal-review/project-manager/io.helidon.webclient.helidon-webclient-websocket-4.0.8/copyright-ignore rename to tools/legal-review/project-manager/io.helidon.http.media.helidon-http-media-4.1.2/copyright-ignore index ab09cc389a35..160dd9d6c4b0 100644 --- a/tools/legal-review/project-manager/io.helidon.webclient.helidon-webclient-websocket-4.0.8/copyright-ignore +++ b/tools/legal-review/project-manager/io.helidon.http.media.helidon-http-media-4.1.2/copyright-ignore @@ -1 +1,2 @@ helidon-codegen-helidon-copyright +helidon-codegen-helidon-copyright diff --git a/tools/legal-review/project-manager/io.helidon.http.media.helidon-http-media-4.1.2/copyright-keep b/tools/legal-review/project-manager/io.helidon.http.media.helidon-http-media-4.1.2/copyright-keep new file mode 100644 index 000000000000..725fa1ee7707 --- /dev/null +++ b/tools/legal-review/project-manager/io.helidon.http.media.helidon-http-media-4.1.2/copyright-keep @@ -0,0 +1,10 @@ +Copyright (c) 2022, 2023 Oracle and/or its affiliates. +Copyright (c) 2022, 2024 Oracle and/or its affiliates. +Copyright (c) 2023 Oracle and/or its affiliates. +Copyright (c) 2023, 2024 Oracle and/or its affiliates. +Copyright (c) 2024 Oracle and/or its affiliates. +Copyright (c) 2024 Oracle and/or its affiliates. +Copyright (c) 2023, 2024 Oracle and/or its affiliates. +Copyright (c) 2023 Oracle and/or its affiliates. +Copyright (c) 2022, 2024 Oracle and/or its affiliates. +Copyright (c) 2022, 2023 Oracle and/or its affiliates. diff --git a/tools/legal-review/project-manager/io.helidon.inject.helidon-inject-api-4.0.8/copyright-ignore b/tools/legal-review/project-manager/io.helidon.inject.helidon-inject-api-4.0.8/copyright-ignore deleted file mode 100644 index d240efaa8b9a..000000000000 --- a/tools/legal-review/project-manager/io.helidon.inject.helidon-inject-api-4.0.8/copyright-ignore +++ /dev/null @@ -1 +0,0 @@ -helidon-common-processor-helidon-copyright diff --git a/tools/legal-review/project-manager/io.helidon.inject.helidon-inject-api-4.0.8/copyright-keep b/tools/legal-review/project-manager/io.helidon.inject.helidon-inject-api-4.0.8/copyright-keep deleted file mode 100644 index c34fd5dcab0c..000000000000 --- a/tools/legal-review/project-manager/io.helidon.inject.helidon-inject-api-4.0.8/copyright-keep +++ /dev/null @@ -1,3 +0,0 @@ -Copyright (c) 2022, 2024 Oracle and/or its affiliates. -Copyright (c) 2023, 2024 Oracle and/or its affiliates. -Copyright (c) 2024 Oracle and/or its affiliates. diff --git a/tools/legal-review/engine/io.helidon.config.helidon-config-4.0.8/copyright-ignore b/tools/legal-review/project-manager/io.helidon.inject.helidon-inject-api-4.1.2/copyright-ignore similarity index 100% rename from tools/legal-review/engine/io.helidon.config.helidon-config-4.0.8/copyright-ignore rename to tools/legal-review/project-manager/io.helidon.inject.helidon-inject-api-4.1.2/copyright-ignore diff --git a/tools/legal-review/project-manager/io.helidon.inject.helidon-inject-api-4.1.2/copyright-keep b/tools/legal-review/project-manager/io.helidon.inject.helidon-inject-api-4.1.2/copyright-keep new file mode 100644 index 000000000000..bd31506b0c8d --- /dev/null +++ b/tools/legal-review/project-manager/io.helidon.inject.helidon-inject-api-4.1.2/copyright-keep @@ -0,0 +1,6 @@ +Copyright (c) 2022, 2024 Oracle and/or its affiliates. +Copyright (c) 2023, 2024 Oracle and/or its affiliates. +Copyright (c) 2024 Oracle and/or its affiliates. +Copyright (c) 2024 Oracle and/or its affiliates. +Copyright (c) 2023, 2024 Oracle and/or its affiliates. +Copyright (c) 2022, 2024 Oracle and/or its affiliates. diff --git a/tools/legal-review/project-manager/io.helidon.logging.helidon-logging-common-4.1.2/copyright-keep b/tools/legal-review/project-manager/io.helidon.logging.helidon-logging-common-4.1.2/copyright-keep new file mode 100644 index 000000000000..f7fdce86b31c --- /dev/null +++ b/tools/legal-review/project-manager/io.helidon.logging.helidon-logging-common-4.1.2/copyright-keep @@ -0,0 +1,11 @@ +Copyright (c) 2019, 2022 Oracle and/or its affiliates. +Copyright (c) 2020 Oracle and/or its affiliates. +Copyright (c) 2020, 2022 Oracle and/or its affiliates. +Copyright (c) 2020, 2023 Oracle and/or its affiliates. +Copyright (c) 2020, 2024 Oracle and/or its affiliates. +Copyright (c) 2024 Oracle and/or its affiliates. +Copyright (c) 2020, 2024 Oracle and/or its affiliates. +Copyright (c) 2020, 2023 Oracle and/or its affiliates. +Copyright (c) 2020, 2022 Oracle and/or its affiliates. +Copyright (c) 2020 Oracle and/or its affiliates. +Copyright (c) 2019, 2022 Oracle and/or its affiliates. diff --git a/tools/legal-review/project-manager/io.helidon.webclient.helidon-webclient-4.0.8/copyright-keep b/tools/legal-review/project-manager/io.helidon.webclient.helidon-webclient-4.0.8/copyright-keep deleted file mode 100644 index 2585c5d1ac2e..000000000000 --- a/tools/legal-review/project-manager/io.helidon.webclient.helidon-webclient-4.0.8/copyright-keep +++ /dev/null @@ -1,2 +0,0 @@ -Copyright (c) 2022, 2023 Oracle and/or its affiliates. -Copyright (c) 2022, 2024 Oracle and/or its affiliates. diff --git a/tools/legal-review/project-manager/io.helidon.webclient.helidon-webclient-4.1.2/copyright-keep b/tools/legal-review/project-manager/io.helidon.webclient.helidon-webclient-4.1.2/copyright-keep new file mode 100644 index 000000000000..25489a2e43e7 --- /dev/null +++ b/tools/legal-review/project-manager/io.helidon.webclient.helidon-webclient-4.1.2/copyright-keep @@ -0,0 +1,4 @@ +Copyright (c) 2022, 2023 Oracle and/or its affiliates. +Copyright (c) 2022, 2024 Oracle and/or its affiliates. +Copyright (c) 2022, 2024 Oracle and/or its affiliates. +Copyright (c) 2022, 2023 Oracle and/or its affiliates. diff --git a/tools/legal-review/project-manager/io.helidon.http.encoding.helidon-http-encoding-4.0.8/copyright-ignore b/tools/legal-review/project-manager/io.helidon.webclient.helidon-webclient-api-4.1.2/copyright-ignore similarity index 100% rename from tools/legal-review/project-manager/io.helidon.http.encoding.helidon-http-encoding-4.0.8/copyright-ignore rename to tools/legal-review/project-manager/io.helidon.webclient.helidon-webclient-api-4.1.2/copyright-ignore diff --git a/tools/legal-review/project-manager/io.helidon.webclient.helidon-webclient-api-4.0.8/copyright-keep b/tools/legal-review/project-manager/io.helidon.webclient.helidon-webclient-api-4.1.2/copyright-keep similarity index 100% rename from tools/legal-review/project-manager/io.helidon.webclient.helidon-webclient-api-4.0.8/copyright-keep rename to tools/legal-review/project-manager/io.helidon.webclient.helidon-webclient-api-4.1.2/copyright-keep index da86cd1d12cf..4e64fde5a5ec 100644 --- a/tools/legal-review/project-manager/io.helidon.webclient.helidon-webclient-api-4.0.8/copyright-keep +++ b/tools/legal-review/project-manager/io.helidon.webclient.helidon-webclient-api-4.1.2/copyright-keep @@ -1,6 +1,6 @@ -Copyright (c) 2020, 2023 Oracle and/or its affiliates. -Copyright (c) 2022, 2023 Oracle and/or its affiliates. -Copyright (c) 2022, 2024 Oracle and/or its affiliates. -Copyright (c) 2023 Oracle and/or its affiliates. -Copyright (c) 2023, 2024 Oracle and/or its affiliates. Copyright (c) 2024 Oracle and/or its affiliates. +Copyright (c) 2023, 2024 Oracle and/or its affiliates. +Copyright (c) 2023 Oracle and/or its affiliates. +Copyright (c) 2022, 2024 Oracle and/or its affiliates. +Copyright (c) 2022, 2023 Oracle and/or its affiliates. +Copyright (c) 2020, 2023 Oracle and/or its affiliates. diff --git a/tools/legal-review/project-manager/io.helidon.webclient.helidon-webclient-http1-4.0.8/copyright-keep b/tools/legal-review/project-manager/io.helidon.webclient.helidon-webclient-http1-4.0.8/copyright-keep deleted file mode 100644 index 1536d2f9870d..000000000000 --- a/tools/legal-review/project-manager/io.helidon.webclient.helidon-webclient-http1-4.0.8/copyright-keep +++ /dev/null @@ -1,5 +0,0 @@ -Copyright (c) 2022, 2023 Oracle and/or its affiliates. -Copyright (c) 2022, 2024 Oracle and/or its affiliates. -Copyright (c) 2023 Oracle and/or its affiliates. -Copyright (c) 2023, 2024 Oracle and/or its affiliates. -Copyright (c) 2024 Oracle and/or its affiliates. diff --git a/tools/legal-review/project-manager/io.helidon.http.media.helidon-http-media-4.0.8/copyright-ignore b/tools/legal-review/project-manager/io.helidon.webclient.helidon-webclient-http1-4.1.2/copyright-ignore similarity index 100% rename from tools/legal-review/project-manager/io.helidon.http.media.helidon-http-media-4.0.8/copyright-ignore rename to tools/legal-review/project-manager/io.helidon.webclient.helidon-webclient-http1-4.1.2/copyright-ignore diff --git a/tools/legal-review/project-manager/io.helidon.webclient.helidon-webclient-http1-4.1.2/copyright-keep b/tools/legal-review/project-manager/io.helidon.webclient.helidon-webclient-http1-4.1.2/copyright-keep new file mode 100644 index 000000000000..133589b49c99 --- /dev/null +++ b/tools/legal-review/project-manager/io.helidon.webclient.helidon-webclient-http1-4.1.2/copyright-keep @@ -0,0 +1,5 @@ +Copyright (c) 2024 Oracle and/or its affiliates. +Copyright (c) 2023, 2024 Oracle and/or its affiliates. +Copyright (c) 2023 Oracle and/or its affiliates. +Copyright (c) 2022, 2024 Oracle and/or its affiliates. +Copyright (c) 2022, 2023 Oracle and/or its affiliates. diff --git a/tools/legal-review/project-manager/io.helidon.webclient.helidon-webclient-api-4.0.8/copyright-ignore b/tools/legal-review/project-manager/io.helidon.webclient.helidon-webclient-websocket-4.1.2/copyright-ignore similarity index 100% rename from tools/legal-review/project-manager/io.helidon.webclient.helidon-webclient-api-4.0.8/copyright-ignore rename to tools/legal-review/project-manager/io.helidon.webclient.helidon-webclient-websocket-4.1.2/copyright-ignore diff --git a/tools/legal-review/project-manager/io.helidon.webclient.helidon-webclient-websocket-4.0.8/copyright-keep b/tools/legal-review/project-manager/io.helidon.webclient.helidon-webclient-websocket-4.1.2/copyright-keep similarity index 100% rename from tools/legal-review/project-manager/io.helidon.webclient.helidon-webclient-websocket-4.0.8/copyright-keep rename to tools/legal-review/project-manager/io.helidon.webclient.helidon-webclient-websocket-4.1.2/copyright-keep index b546632376a1..9693d6da46e0 100644 --- a/tools/legal-review/project-manager/io.helidon.webclient.helidon-webclient-websocket-4.0.8/copyright-keep +++ b/tools/legal-review/project-manager/io.helidon.webclient.helidon-webclient-websocket-4.1.2/copyright-keep @@ -1,4 +1,4 @@ -Copyright (c) 2022, 2024 Oracle and/or its affiliates. -Copyright (c) 2023 Oracle and/or its affiliates. -Copyright (c) 2023, 2024 Oracle and/or its affiliates. Copyright (c) 2024 Oracle and/or its affiliates. +Copyright (c) 2023, 2024 Oracle and/or its affiliates. +Copyright (c) 2023 Oracle and/or its affiliates. +Copyright (c) 2022, 2024 Oracle and/or its affiliates. diff --git a/tools/legal-review/project-manager/io.helidon.webserver.helidon-webserver-4.0.8/copyright-ignore b/tools/legal-review/project-manager/io.helidon.webserver.helidon-webserver-4.1.2/copyright-ignore similarity index 50% rename from tools/legal-review/project-manager/io.helidon.webserver.helidon-webserver-4.0.8/copyright-ignore rename to tools/legal-review/project-manager/io.helidon.webserver.helidon-webserver-4.1.2/copyright-ignore index ab09cc389a35..160dd9d6c4b0 100644 --- a/tools/legal-review/project-manager/io.helidon.webserver.helidon-webserver-4.0.8/copyright-ignore +++ b/tools/legal-review/project-manager/io.helidon.webserver.helidon-webserver-4.1.2/copyright-ignore @@ -1 +1,2 @@ helidon-codegen-helidon-copyright +helidon-codegen-helidon-copyright diff --git a/tools/legal-review/project-manager/io.helidon.webserver.helidon-webserver-4.0.8/copyright-keep b/tools/legal-review/project-manager/io.helidon.webserver.helidon-webserver-4.1.2/copyright-keep similarity index 50% rename from tools/legal-review/project-manager/io.helidon.webserver.helidon-webserver-4.0.8/copyright-keep rename to tools/legal-review/project-manager/io.helidon.webserver.helidon-webserver-4.1.2/copyright-keep index 204a360105b5..7611fffee2ca 100644 --- a/tools/legal-review/project-manager/io.helidon.webserver.helidon-webserver-4.0.8/copyright-keep +++ b/tools/legal-review/project-manager/io.helidon.webserver.helidon-webserver-4.1.2/copyright-keep @@ -4,3 +4,9 @@ Copyright (c) 2022, 2024 Oracle and/or its affiliates. Copyright (c) 2023 Oracle and/or its affiliates. Copyright (c) 2023, 2024 Oracle and/or its affiliates. Copyright (c) 2024 Oracle and/or its affiliates. +Copyright (c) 2024 Oracle and/or its affiliates. +Copyright (c) 2023, 2024 Oracle and/or its affiliates. +Copyright (c) 2023 Oracle and/or its affiliates. +Copyright (c) 2022, 2024 Oracle and/or its affiliates. +Copyright (c) 2022, 2023 Oracle and/or its affiliates. +Copyright (c) 2021, 2023 Oracle and/or its affiliates. diff --git a/tools/legal-review/project-manager/io.helidon.webserver.helidon-webserver-websocket-4.0.8/copyright-keep b/tools/legal-review/project-manager/io.helidon.webserver.helidon-webserver-websocket-4.0.8/copyright-keep deleted file mode 100644 index 1536d2f9870d..000000000000 --- a/tools/legal-review/project-manager/io.helidon.webserver.helidon-webserver-websocket-4.0.8/copyright-keep +++ /dev/null @@ -1,5 +0,0 @@ -Copyright (c) 2022, 2023 Oracle and/or its affiliates. -Copyright (c) 2022, 2024 Oracle and/or its affiliates. -Copyright (c) 2023 Oracle and/or its affiliates. -Copyright (c) 2023, 2024 Oracle and/or its affiliates. -Copyright (c) 2024 Oracle and/or its affiliates. diff --git a/tools/legal-review/project-manager/io.helidon.webclient.helidon-webclient-http1-4.0.8/copyright-ignore b/tools/legal-review/project-manager/io.helidon.webserver.helidon-webserver-websocket-4.1.2/copyright-ignore similarity index 100% rename from tools/legal-review/project-manager/io.helidon.webclient.helidon-webclient-http1-4.0.8/copyright-ignore rename to tools/legal-review/project-manager/io.helidon.webserver.helidon-webserver-websocket-4.1.2/copyright-ignore diff --git a/tools/legal-review/project-manager/io.helidon.webserver.helidon-webserver-websocket-4.1.2/copyright-keep b/tools/legal-review/project-manager/io.helidon.webserver.helidon-webserver-websocket-4.1.2/copyright-keep new file mode 100644 index 000000000000..133589b49c99 --- /dev/null +++ b/tools/legal-review/project-manager/io.helidon.webserver.helidon-webserver-websocket-4.1.2/copyright-keep @@ -0,0 +1,5 @@ +Copyright (c) 2024 Oracle and/or its affiliates. +Copyright (c) 2023, 2024 Oracle and/or its affiliates. +Copyright (c) 2023 Oracle and/or its affiliates. +Copyright (c) 2022, 2024 Oracle and/or its affiliates. +Copyright (c) 2022, 2023 Oracle and/or its affiliates. diff --git a/tools/legal-review/project-manager/io.helidon.websocket.helidon-websocket-4.0.8/copyright-keep b/tools/legal-review/project-manager/io.helidon.websocket.helidon-websocket-4.0.8/copyright-keep deleted file mode 100644 index 75eb49ff37bd..000000000000 --- a/tools/legal-review/project-manager/io.helidon.websocket.helidon-websocket-4.0.8/copyright-keep +++ /dev/null @@ -1,4 +0,0 @@ -Copyright (c) 2022, 2023 Oracle and/or its affiliates. -Copyright (c) 2022, 2024 Oracle and/or its affiliates. -Copyright (c) 2023 Oracle and/or its affiliates. -Copyright (c) 2023, 2024 Oracle and/or its affiliates. diff --git a/tools/legal-review/project-manager/io.helidon.websocket.helidon-websocket-4.1.2/copyright-keep b/tools/legal-review/project-manager/io.helidon.websocket.helidon-websocket-4.1.2/copyright-keep new file mode 100644 index 000000000000..38de838135e7 --- /dev/null +++ b/tools/legal-review/project-manager/io.helidon.websocket.helidon-websocket-4.1.2/copyright-keep @@ -0,0 +1,8 @@ +Copyright (c) 2022, 2023 Oracle and/or its affiliates. +Copyright (c) 2022, 2024 Oracle and/or its affiliates. +Copyright (c) 2023 Oracle and/or its affiliates. +Copyright (c) 2023, 2024 Oracle and/or its affiliates. +Copyright (c) 2023, 2024 Oracle and/or its affiliates. +Copyright (c) 2023 Oracle and/or its affiliates. +Copyright (c) 2022, 2024 Oracle and/or its affiliates. +Copyright (c) 2022, 2023 Oracle and/or its affiliates. diff --git a/tools/legal-review/project-manager/report-state b/tools/legal-review/project-manager/report-state index ef5f79c5ff39..308d06a3d86d 100644 --- a/tools/legal-review/project-manager/report-state +++ b/tools/legal-review/project-manager/report-state @@ -1,3 +1,3 @@ -17B483DD3EEF872666ABEFAFBB01049EFF1980543E14BF7E22F9AD0A4C59A954 -879435B72CB9D2FD9E96DF25D96D647DE4E618DD5EE8272A76BDADB3D66DE060 +38FFA779960E697DA009AF02CFBB9B2CC5E396911FEBC3495E16058023A8F16F +79955D6F3940B454136F8BE49F3C3AFD78DF12310280DA947F713B702AA6B6D1 0 From d0b954befa107416cd653ee0025b64fae5faa12d Mon Sep 17 00:00:00 2001 From: Dmitry Bushev Date: Wed, 30 Oct 2024 15:57:31 +0000 Subject: [PATCH 16/21] fix: after merge --- build.sbt | 1 - lib/java/ydoc-server/src/main/java/org/enso/ydoc/Ydoc.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 74a1b757fdc9..eeb1875446f6 100644 --- a/build.sbt +++ b/build.sbt @@ -1959,7 +1959,6 @@ lazy val `ydoc-server` = project .buildNativeImage( "ydoc", staticOnLinux = false, - includeRuntime = false, mainClass = Some("org.enso.ydoc.Main"), additionalOptions = Seq( // useful perf & debug switches: diff --git a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/Ydoc.java b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/Ydoc.java index ea5ac21793a0..228eed0b77a2 100644 --- a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/Ydoc.java +++ b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/Ydoc.java @@ -92,7 +92,7 @@ public Ydoc build() { } if (contextBuilder == null) { - contextBuilder = WebEnvironment.createContext().allowIO(IOAccess.ALL).allowAllAccess(true); + contextBuilder = WebEnvironment.createContext().allowIO(IOAccess.ALL); } if (hostname == null) { From f8c878c86c800aadc2b1c0bc3dad5dfa89314416 Mon Sep 17 00:00:00 2001 From: Dmitry Bushev Date: Wed, 30 Oct 2024 15:59:46 +0000 Subject: [PATCH 17/21] update: native-image configs --- .../java/org/enso/ydoc/polyfill/web/URL.java | 3 + .../org/enso/ydoc/jni-config.json | 4 + .../org/enso/ydoc/reflect-config.json | 122 ++++++++++++++++++ .../org/enso/ydoc/resource-config.json | 12 ++ 4 files changed, 141 insertions(+) diff --git a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/URL.java b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/URL.java index ccd23e3ff65e..7a45f573baa9 100644 --- a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/URL.java +++ b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/URL.java @@ -7,6 +7,9 @@ /** * Implements the URL Node.js interface and can be * used directly for interop with JS. + * + *

Note that {@code HostAccess.Export} entries are not detected by the Native Image Agent {@code + * -agentlib:native-image-agent} and should be manually listed in the reflect-config.json. */ public final class URL { diff --git a/lib/java/ydoc-server/src/main/resources/META-INF/native-image/org/enso/ydoc/jni-config.json b/lib/java/ydoc-server/src/main/resources/META-INF/native-image/org/enso/ydoc/jni-config.json index 637373730e41..966d95584954 100644 --- a/lib/java/ydoc-server/src/main/resources/META-INF/native-image/org/enso/ydoc/jni-config.json +++ b/lib/java/ydoc-server/src/main/resources/META-INF/native-image/org/enso/ydoc/jni-config.json @@ -1,4 +1,8 @@ [ +{ + "name":"java.lang.Boolean", + "methods":[{"name":"getBoolean","parameterTypes":["java.lang.String"] }] +}, { "name":"java.lang.Class", "methods":[{"name":"getClassLoader","parameterTypes":[] }] diff --git a/lib/java/ydoc-server/src/main/resources/META-INF/native-image/org/enso/ydoc/reflect-config.json b/lib/java/ydoc-server/src/main/resources/META-INF/native-image/org/enso/ydoc/reflect-config.json index 54277c603f4e..2bd3ef784502 100644 --- a/lib/java/ydoc-server/src/main/resources/META-INF/native-image/org/enso/ydoc/reflect-config.json +++ b/lib/java/ydoc-server/src/main/resources/META-INF/native-image/org/enso/ydoc/reflect-config.json @@ -53,6 +53,30 @@ "name":"ch.qos.logback.core.spi.ContextAware", "methods":[{"name":"valueOf","parameterTypes":["java.lang.String"] }] }, +{ + "name":"com.sun.crypto.provider.AESCipher$General", + "methods":[{"name":"","parameterTypes":[] }] +}, +{ + "name":"com.sun.crypto.provider.ARCFOURCipher", + "methods":[{"name":"","parameterTypes":[] }] +}, +{ + "name":"com.sun.crypto.provider.ChaCha20Cipher$ChaCha20Poly1305", + "methods":[{"name":"","parameterTypes":[] }] +}, +{ + "name":"com.sun.crypto.provider.DESCipher", + "methods":[{"name":"","parameterTypes":[] }] +}, +{ + "name":"com.sun.crypto.provider.DESedeCipher", + "methods":[{"name":"","parameterTypes":[] }] +}, +{ + "name":"com.sun.crypto.provider.GaloisCounterMode$AESGCM", + "methods":[{"name":"","parameterTypes":[] }] +}, { "name":"com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl", "methods":[{"name":"","parameterTypes":[] }] @@ -93,9 +117,18 @@ "name":"java.net.URLPermission", "methods":[{"name":"","parameterTypes":["java.lang.String","java.lang.String"] }] }, +{ + "name":"java.security.AlgorithmParametersSpi" +}, { "name":"java.security.AllPermission" }, +{ + "name":"java.security.KeyStoreSpi" +}, +{ + "name":"java.security.SecureRandomParameters" +}, { "name":"java.security.SecurityPermission" }, @@ -118,12 +151,25 @@ "name":"java.util.concurrent.atomic.Striped64", "fields":[{"name":"base"}, {"name":"cellsBusy"}] }, +{ + "name":"javax.security.auth.x500.X500Principal", + "fields":[{"name":"thisX500Name"}], + "methods":[{"name":"","parameterTypes":["sun.security.x509.X500Name"] }] +}, { "name":"javax.smartcardio.CardPermission" }, { "name":"jdk.internal.misc.Unsafe" }, +{ + "name":"org.enso.ydoc.polyfill.web.URL", + "fields":[{"name":"pathname"},{"name":"searchParams"}] +}, +{ + "name":"org.enso.ydoc.polyfill.web.URL$URLSearchParams", + "methods":[{"name":"get","parameterTypes":["java.lang.String"]}] +}, { "name":"org.graalvm.polyglot.io.IOHelper", "fields":[{"name":"ACCESS"}] @@ -132,8 +178,84 @@ "name":"org.graalvm.polyglot.management.Management", "fields":[{"name":"ACCESS"}] }, +{ + "name":"sun.security.pkcs12.PKCS12KeyStore", + "methods":[{"name":"","parameterTypes":[] }] +}, +{ + "name":"sun.security.pkcs12.PKCS12KeyStore$DualFormatPKCS12", + "methods":[{"name":"","parameterTypes":[] }] +}, +{ + "name":"sun.security.provider.NativePRNG", + "methods":[{"name":"","parameterTypes":[] }, {"name":"","parameterTypes":["java.security.SecureRandomParameters"] }] +}, { "name":"sun.security.provider.SHA", "methods":[{"name":"","parameterTypes":[] }] +}, +{ + "name":"sun.security.provider.X509Factory", + "methods":[{"name":"","parameterTypes":[] }] +}, +{ + "name":"sun.security.rsa.RSAKeyFactory$Legacy", + "methods":[{"name":"","parameterTypes":[] }] +}, +{ + "name":"sun.security.ssl.SSLContextImpl$TLSContext", + "methods":[{"name":"","parameterTypes":[] }] +}, +{ + "name":"sun.security.ssl.TrustManagerFactoryImpl$PKIXFactory", + "methods":[{"name":"","parameterTypes":[] }] +}, +{ + "name":"sun.security.x509.AuthorityInfoAccessExtension", + "methods":[{"name":"","parameterTypes":["java.lang.Boolean","java.lang.Object"] }] +}, +{ + "name":"sun.security.x509.AuthorityKeyIdentifierExtension", + "methods":[{"name":"","parameterTypes":["java.lang.Boolean","java.lang.Object"] }] +}, +{ + "name":"sun.security.x509.BasicConstraintsExtension", + "methods":[{"name":"","parameterTypes":["java.lang.Boolean","java.lang.Object"] }] +}, +{ + "name":"sun.security.x509.CRLDistributionPointsExtension", + "methods":[{"name":"","parameterTypes":["java.lang.Boolean","java.lang.Object"] }] +}, +{ + "name":"sun.security.x509.CertificatePoliciesExtension", + "methods":[{"name":"","parameterTypes":["java.lang.Boolean","java.lang.Object"] }] +}, +{ + "name":"sun.security.x509.ExtendedKeyUsageExtension", + "methods":[{"name":"","parameterTypes":["java.lang.Boolean","java.lang.Object"] }] +}, +{ + "name":"sun.security.x509.IssuerAlternativeNameExtension", + "methods":[{"name":"","parameterTypes":["java.lang.Boolean","java.lang.Object"] }] +}, +{ + "name":"sun.security.x509.KeyUsageExtension", + "methods":[{"name":"","parameterTypes":["java.lang.Boolean","java.lang.Object"] }] +}, +{ + "name":"sun.security.x509.NetscapeCertTypeExtension", + "methods":[{"name":"","parameterTypes":["java.lang.Boolean","java.lang.Object"] }] +}, +{ + "name":"sun.security.x509.PrivateKeyUsageExtension", + "methods":[{"name":"","parameterTypes":["java.lang.Boolean","java.lang.Object"] }] +}, +{ + "name":"sun.security.x509.SubjectAlternativeNameExtension", + "methods":[{"name":"","parameterTypes":["java.lang.Boolean","java.lang.Object"] }] +}, +{ + "name":"sun.security.x509.SubjectKeyIdentifierExtension", + "methods":[{"name":"","parameterTypes":["java.lang.Boolean","java.lang.Object"] }] } ] diff --git a/lib/java/ydoc-server/src/main/resources/META-INF/native-image/org/enso/ydoc/resource-config.json b/lib/java/ydoc-server/src/main/resources/META-INF/native-image/org/enso/ydoc/resource-config.json index a55c05c333a2..318d291a467c 100644 --- a/lib/java/ydoc-server/src/main/resources/META-INF/native-image/org/enso/ydoc/resource-config.json +++ b/lib/java/ydoc-server/src/main/resources/META-INF/native-image/org/enso/ydoc/resource-config.json @@ -40,6 +40,16 @@ "pattern":"\\QMETA-INF/services/io.helidon.http.media.spi.MediaSupportProvider\\E" }, { "pattern":"\\QMETA-INF/services/io.helidon.logging.common.spi.LoggingProvider\\E" + }, { + "pattern":"\\QMETA-INF/services/io.helidon.webclient.spi.DnsResolverProvider\\E" + }, { + "pattern":"\\QMETA-INF/services/io.helidon.webclient.spi.HttpClientSpiProvider\\E" + }, { + "pattern":"\\QMETA-INF/services/io.helidon.webclient.spi.ProtocolConfigProvider\\E" + }, { + "pattern":"\\QMETA-INF/services/io.helidon.webclient.spi.SourceHandlerProvider\\E" + }, { + "pattern":"\\QMETA-INF/services/io.helidon.webclient.spi.WebClientServiceProvider\\E" }, { "pattern":"\\QMETA-INF/services/io.helidon.webserver.http1.spi.Http1UpgradeProvider\\E" }, { @@ -52,6 +62,8 @@ "pattern":"\\QMETA-INF/services/java.lang.System$LoggerFinder\\E" }, { "pattern":"\\QMETA-INF/services/java.net.spi.InetAddressResolverProvider\\E" + }, { + "pattern":"\\QMETA-INF/services/java.net.spi.URLStreamHandlerProvider\\E" }, { "pattern":"\\QMETA-INF/services/java.time.zone.ZoneRulesProvider\\E" }, { From b3df0a8ce22acae1512f1f421a538857e70f6ecb Mon Sep 17 00:00:00 2001 From: Dmitry Bushev Date: Wed, 30 Oct 2024 16:01:29 +0000 Subject: [PATCH 18/21] fix: override helidon-client loom executor --- .../polyfill/web/Target_ExecutorsFactory.java | 2 +- .../ydoc/polyfill/web/Target_LoomClient.java | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Target_LoomClient.java diff --git a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Target_ExecutorsFactory.java b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Target_ExecutorsFactory.java index 748e618091d4..ff1b5fe110b0 100644 --- a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Target_ExecutorsFactory.java +++ b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Target_ExecutorsFactory.java @@ -10,7 +10,7 @@ final class Target_ExecutorsFactory { @Substitute private static ThreadFactory virtualThreadFactory() { - return Thread.ofPlatform().name("Emulating loom", 0).factory(); + return Thread.ofPlatform().name("emulating-loom-helidon-server-", 0).factory(); } @Substitute diff --git a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Target_LoomClient.java b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Target_LoomClient.java new file mode 100644 index 000000000000..13e44c486dd3 --- /dev/null +++ b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/Target_LoomClient.java @@ -0,0 +1,25 @@ +package org.enso.ydoc.polyfill.web; + +import com.oracle.svm.core.annotate.Alias; +import com.oracle.svm.core.annotate.RecomputeFieldValue; +import com.oracle.svm.core.annotate.TargetClass; +import io.helidon.common.LazyValue; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.function.Supplier; + +@TargetClass(className = "io.helidon.webclient.api.LoomClient") +final class Target_LoomClient { + + @Alias + @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.FromAlias) + static LazyValue EXECUTOR = LazyValue.create(new ExecutorSupplier()); + + private static final class ExecutorSupplier implements Supplier { + @Override + public ExecutorService get() { + return Executors.newThreadPerTaskExecutor( + Thread.ofPlatform().name("emulating-loom-helidon-client-", 0).factory()); + } + } +} From 5440ed6f5d601001c59772f456c621e68cdf641b Mon Sep 17 00:00:00 2001 From: Dmitry Bushev Date: Wed, 30 Oct 2024 16:07:30 +0000 Subject: [PATCH 19/21] misc: cleanup --- .vscode/launch.json | 4 ++-- build.sbt | 11 ++--------- .../src/main/java/module-info.java | 6 ------ .../src/main/java/org/enso/ht/Main.java | 18 ------------------ .../ydoc-server/src/main/resources/logback.xml | 2 +- 5 files changed, 5 insertions(+), 36 deletions(-) delete mode 100644 lib/java/helidon-test/src/main/java/module-info.java delete mode 100644 lib/java/helidon-test/src/main/java/org/enso/ht/Main.java diff --git a/.vscode/launch.json b/.vscode/launch.json index e17624d39b78..8c6d1f8bede4 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -32,8 +32,8 @@ "type": "nativeimage", "request": "launch", "name": "Launch Native Image", - "nativeImagePath": "${workspaceFolder}/ydoc", - // "args": "" + "nativeImagePath": "${workspaceFolder}/runner", + "args": "--run ${file}" } ] } \ No newline at end of file diff --git a/build.sbt b/build.sbt index eeb1875446f6..daa225afa2b5 100644 --- a/build.sbt +++ b/build.sbt @@ -1897,6 +1897,7 @@ lazy val `ydoc-server` = project ), libraryDependencies ++= Seq( "org.graalvm.truffle" % "truffle-api" % graalMavenPackagesVersion % "provided", + "org.graalvm.sdk" % "nativeimage" % graalMavenPackagesVersion % "provided", "org.graalvm.polyglot" % "inspect-community" % graalMavenPackagesVersion % "runtime", "org.graalvm.polyglot" % "js-community" % graalMavenPackagesVersion % "runtime", "org.slf4j" % "slf4j-api" % slf4jVersion, @@ -1905,7 +1906,6 @@ lazy val `ydoc-server` = project "junit" % "junit" % junitVersion % Test, "com.github.sbt" % "junit-interface" % junitIfVersion % Test, "com.fasterxml.jackson.core" % "jackson-databind" % jacksonVersion % Test, - "org.graalvm.sdk" % "nativeimage" % graalMavenPackagesVersion % "provided" ), libraryDependencies ++= { GraalVM.modules ++ GraalVM.jsPkgs ++ GraalVM.chromeInspectorPkgs ++ helidon @@ -1919,7 +1919,6 @@ lazy val `ydoc-server` = project Compile / run / connectInput := true, Compile / run / javaOptions := Seq( "-ea" - //"-agentlib:native-image-agent=config-merge-dir=/home/dbushev/projects/luna/enso/lib/java/ydoc-server/src/main/resources/META-INF/native-image/org/enso/ydoc" ), // We need to assembly the cmd line options here manually, because we need // to add path to this module, and adding that directly to the `modulePath` setting @@ -1959,13 +1958,7 @@ lazy val `ydoc-server` = project .buildNativeImage( "ydoc", staticOnLinux = false, - mainClass = Some("org.enso.ydoc.Main"), - additionalOptions = Seq( - // useful perf & debug switches: - // "-g", - // "-H:+SourceLevelDebug", - // "-H:-DeleteLocalSymbols", - ) + mainClass = Some("org.enso.ydoc.Main") ) .value, buildNativeImage := NativeImage diff --git a/lib/java/helidon-test/src/main/java/module-info.java b/lib/java/helidon-test/src/main/java/module-info.java deleted file mode 100644 index a4cacf010814..000000000000 --- a/lib/java/helidon-test/src/main/java/module-info.java +++ /dev/null @@ -1,6 +0,0 @@ -module org.enso.ht { - requires io.helidon.webclient; - requires io.helidon.webclient.websocket; - requires io.helidon.webserver; - requires io.helidon.webserver.websocket; -} diff --git a/lib/java/helidon-test/src/main/java/org/enso/ht/Main.java b/lib/java/helidon-test/src/main/java/org/enso/ht/Main.java deleted file mode 100644 index 0b949969d1ec..000000000000 --- a/lib/java/helidon-test/src/main/java/org/enso/ht/Main.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.enso.ht; - -import io.helidon.webserver.WebServer; - -public class Main { - - private Main() {} - - public static void main(String[] args) throws Exception { - System.setProperty( - "helidon.serialFilter.pattern", - "javax.management.**;java.lang.**;java.rmi.**;javax.security.auth.Subject;!*"); - - var server = WebServer.builder().host("localhost").port(1235).build().start(); - - System.out.println("WebServer started."); - } -} diff --git a/lib/java/ydoc-server/src/main/resources/logback.xml b/lib/java/ydoc-server/src/main/resources/logback.xml index 29389ba9cce1..3ce331ce1a62 100644 --- a/lib/java/ydoc-server/src/main/resources/logback.xml +++ b/lib/java/ydoc-server/src/main/resources/logback.xml @@ -11,7 +11,7 @@ - + From e272cb13703a898713dcfed462acc834348d20e6 Mon Sep 17 00:00:00 2001 From: Dmitry Bushev Date: Wed, 30 Oct 2024 16:15:01 +0000 Subject: [PATCH 20/21] update: legal review --- tools/legal-review/engine/report-state | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/legal-review/engine/report-state b/tools/legal-review/engine/report-state index 1a5bb7bf4cb4..6ae7ebd1092c 100644 --- a/tools/legal-review/engine/report-state +++ b/tools/legal-review/engine/report-state @@ -1,3 +1,3 @@ -531464D9E4442989B127753363F20DCDA3FDFEE8C20492720A5C9905BF2A1E1C +17B7561F9A5547456DB58D715BF8FFA09A3A57656942004846CBE87C1B4DFC28 7B45943C89E109092F1FC330E1B2481EFA36F5D9387E15FDE6F195DE247FF2A8 0 From d5a0c6c15c9942a15115500f33cae4f3b468bedf Mon Sep 17 00:00:00 2001 From: Dmitry Bushev Date: Wed, 30 Oct 2024 16:21:35 +0000 Subject: [PATCH 21/21] misc: cleanup --- build.sbt | 7 +++---- .../main/java/org/enso/ydoc/polyfill/web/WebSocket.java | 7 +------ 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/build.sbt b/build.sbt index daa225afa2b5..ded00875bb31 100644 --- a/build.sbt +++ b/build.sbt @@ -1905,7 +1905,7 @@ lazy val `ydoc-server` = project "io.helidon.webserver" % "helidon-webserver-websocket" % helidonVersion, "junit" % "junit" % junitVersion % Test, "com.github.sbt" % "junit-interface" % junitIfVersion % Test, - "com.fasterxml.jackson.core" % "jackson-databind" % jacksonVersion % Test, + "com.fasterxml.jackson.core" % "jackson-databind" % jacksonVersion % Test ), libraryDependencies ++= { GraalVM.modules ++ GraalVM.jsPkgs ++ GraalVM.chromeInspectorPkgs ++ helidon @@ -1957,8 +1957,8 @@ lazy val `ydoc-server` = project rebuildNativeImage := NativeImage .buildNativeImage( "ydoc", - staticOnLinux = false, - mainClass = Some("org.enso.ydoc.Main") + staticOnLinux = false, + mainClass = Some("org.enso.ydoc.Main") ) .value, buildNativeImage := NativeImage @@ -1970,7 +1970,6 @@ lazy val `ydoc-server` = project ) .dependsOn(`syntax-rust-definition`) .dependsOn(`logging-service-logback`) -//.dependsOn(`profiling-utils`) lazy val `persistance` = (project in file("lib/java/persistance")) .enablePlugins(JPMSPlugin) diff --git a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/WebSocket.java b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/WebSocket.java index 71920e2c6c60..f2eb4ef5e498 100644 --- a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/WebSocket.java +++ b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/polyfill/web/WebSocket.java @@ -150,12 +150,7 @@ yield new WebSocketConnection( return connection; }); - try { - yield WebServer.builder().host(host).port(port).addRouting(routing).build(); - } catch (Exception ex) { - ex.printStackTrace(); - throw new IllegalStateException(ex); - } + yield WebServer.builder().host(host).port(port).addRouting(routing).build(); } case WEB_SOCKET_SERVER_START -> {