This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 78ee8ceaddbfecff1564c9b9fcc8c536670946e4 Author: James Netherton <[email protected]> AuthorDate: Wed Mar 25 08:57:44 2026 +0000 Force alignment to Groovy 5.x --- .../groovy/deployment/GroovyProcessor.java | 13 ++ extensions/groovy/runtime/pom.xml | 6 + .../runtime/graal/SubstituteCacheableCallSite.java | 38 +++++ .../graal/SubstituteIndyFallbackSupplier.java | 36 +++++ .../runtime/graal/SubstituteIndyInterface.java | 132 +++++++++++++++ .../graal/SubstituteMethodHandleWrapper.java | 37 +++++ pom.xml | 2 +- poms/bom/src/main/generated/flattened-full-pom.xml | 180 ++++++++++----------- .../src/main/generated/flattened-reduced-pom.xml | 4 +- .../generated/flattened-reduced-verbose-pom.xml | 12 +- 10 files changed, 361 insertions(+), 99 deletions(-) diff --git a/extensions/groovy/deployment/src/main/java/org/apache/camel/quarkus/component/groovy/deployment/GroovyProcessor.java b/extensions/groovy/deployment/src/main/java/org/apache/camel/quarkus/component/groovy/deployment/GroovyProcessor.java index 136a111d2e..577f982301 100644 --- a/extensions/groovy/deployment/src/main/java/org/apache/camel/quarkus/component/groovy/deployment/GroovyProcessor.java +++ b/extensions/groovy/deployment/src/main/java/org/apache/camel/quarkus/component/groovy/deployment/GroovyProcessor.java @@ -27,9 +27,11 @@ import io.quarkus.deployment.annotations.ExecutionTime; import io.quarkus.deployment.annotations.Record; import io.quarkus.deployment.builditem.FeatureBuildItem; import io.quarkus.deployment.builditem.GeneratedClassBuildItem; +import io.quarkus.deployment.builditem.RemovedResourceBuildItem; import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; import io.quarkus.deployment.pkg.builditem.CurateOutcomeBuildItem; import io.quarkus.deployment.pkg.steps.NativeOrNativeSourcesBuild; +import io.quarkus.maven.dependency.ArtifactKey; import io.quarkus.maven.dependency.ResolvedDependency; import io.quarkus.paths.PathCollection; import io.quarkus.runtime.RuntimeValue; @@ -177,6 +179,17 @@ class GroovyProcessor { return null; } + // TODO: Remove this - https://github.com/apache/camel-quarkus/issues/8468 + @BuildStep + RemovedResourceBuildItem removedResources() { + return new RemovedResourceBuildItem( + ArtifactKey.fromString("io.quarkiverse.groovy:quarkus-groovy"), + Set.of("io/quarkiverse/groovy/runtime/graal/SubstituteCacheableCallSite.class", + "io/quarkiverse/groovy/runtime/graal/SubstituteIndyFallbackSupplier.class", + "io/quarkiverse/groovy/runtime/graal/SubstituteIndyInterface.class", + "io/quarkiverse/groovy/runtime/graal/SubstituteMethodHandleWrapper.class")); + } + /** * Convert a Groovy expression into a Script class to be able to compile it. * diff --git a/extensions/groovy/runtime/pom.xml b/extensions/groovy/runtime/pom.xml index 310dde5587..74b6171c65 100644 --- a/extensions/groovy/runtime/pom.xml +++ b/extensions/groovy/runtime/pom.xml @@ -52,6 +52,12 @@ <groupId>io.quarkiverse.groovy</groupId> <artifactId>quarkus-groovy</artifactId> </dependency> + <!-- TODO: Remove this - https://github.com/apache/camel-quarkus/issues/8468 --> + <dependency> + <groupId>org.graalvm.sdk</groupId> + <artifactId>nativeimage</artifactId> + <scope>provided</scope> + </dependency> </dependencies> <build> diff --git a/extensions/groovy/runtime/src/main/java/org/apache/camel/quarkus/component/groovy/runtime/graal/SubstituteCacheableCallSite.java b/extensions/groovy/runtime/src/main/java/org/apache/camel/quarkus/component/groovy/runtime/graal/SubstituteCacheableCallSite.java new file mode 100644 index 0000000000..fee00f681a --- /dev/null +++ b/extensions/groovy/runtime/src/main/java/org/apache/camel/quarkus/component/groovy/runtime/graal/SubstituteCacheableCallSite.java @@ -0,0 +1,38 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.quarkus.component.groovy.runtime.graal; + +import com.oracle.svm.core.annotate.Alias; +import com.oracle.svm.core.annotate.TargetClass; +import org.codehaus.groovy.runtime.memoize.MemoizeCache; +import org.codehaus.groovy.vmplugin.v8.CacheableCallSite; + +// TODO: Remove this - https://github.com/apache/camel-quarkus/issues/8468 +@TargetClass(CacheableCallSite.class) +final class SubstituteCacheableCallSite { + + @Alias + public SubstituteMethodHandleWrapper getAndPut(String className, + MemoizeCache.ValueProvider<? super String, ? extends SubstituteMethodHandleWrapper> valueProvider) { + return null; + } + + @Alias + public SubstituteMethodHandleWrapper put(String name, SubstituteMethodHandleWrapper mhw) { + return null; + } +} diff --git a/extensions/groovy/runtime/src/main/java/org/apache/camel/quarkus/component/groovy/runtime/graal/SubstituteIndyFallbackSupplier.java b/extensions/groovy/runtime/src/main/java/org/apache/camel/quarkus/component/groovy/runtime/graal/SubstituteIndyFallbackSupplier.java new file mode 100644 index 0000000000..efbbb37334 --- /dev/null +++ b/extensions/groovy/runtime/src/main/java/org/apache/camel/quarkus/component/groovy/runtime/graal/SubstituteIndyFallbackSupplier.java @@ -0,0 +1,36 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.quarkus.component.groovy.runtime.graal; + +import com.oracle.svm.core.annotate.Alias; +import com.oracle.svm.core.annotate.Substitute; +import com.oracle.svm.core.annotate.TargetClass; +import org.codehaus.groovy.vmplugin.v8.CacheableCallSite; + +// TODO: Remove this - https://github.com/apache/camel-quarkus/issues/8468 +@TargetClass(className = "org.codehaus.groovy.vmplugin.v8.IndyInterface$FallbackSupplier") +final class SubstituteIndyFallbackSupplier { + @Alias + SubstituteIndyFallbackSupplier(CacheableCallSite callSite, Class<?> sender, String methodName, int callID, + Boolean safeNavigation, Boolean thisCall, Boolean spreadCall, Object dummyReceiver, Object[] arguments) { + } + + @Substitute + SubstituteMethodHandleWrapper get() { + return null; + } +} diff --git a/extensions/groovy/runtime/src/main/java/org/apache/camel/quarkus/component/groovy/runtime/graal/SubstituteIndyInterface.java b/extensions/groovy/runtime/src/main/java/org/apache/camel/quarkus/component/groovy/runtime/graal/SubstituteIndyInterface.java new file mode 100644 index 0000000000..7441c48513 --- /dev/null +++ b/extensions/groovy/runtime/src/main/java/org/apache/camel/quarkus/component/groovy/runtime/graal/SubstituteIndyInterface.java @@ -0,0 +1,132 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.quarkus.component.groovy.runtime.graal; + +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MutableCallSite; +import java.util.function.BiFunction; + +import com.oracle.svm.core.annotate.Alias; +import com.oracle.svm.core.annotate.Substitute; +import com.oracle.svm.core.annotate.TargetClass; +import org.codehaus.groovy.vmplugin.v8.CacheableCallSite; +import org.codehaus.groovy.vmplugin.v8.IndyInterface; + +// TODO: Remove this - https://github.com/apache/camel-quarkus/issues/8468 +@TargetClass(IndyInterface.class) +final class SubstituteIndyInterface { + + @Alias + private static SubstituteMethodHandleWrapper NULL_METHOD_HANDLE_WRAPPER; + + @Substitute + protected static void invalidateSwitchPoints() { + throw new UnsupportedOperationException("invalidateSwitchPoints is not supported"); + } + + @Alias + private static boolean bypassCache(Boolean spreadCall, Object[] arguments) { + return false; + } + + @Alias + private static SubstituteMethodHandleWrapper fallback(CacheableCallSite callSite, Class<?> sender, String methodName, + int callID, Boolean safeNavigation, Boolean thisCall, Boolean spreadCall, Object dummyReceiver, + Object[] arguments) { + return null; + } + + @Alias + private static <T> T doWithCallSite(MutableCallSite callSite, Object[] arguments, + BiFunction<? super SubstituteCacheableCallSite, ? super Object, ? extends T> f) { + return null; + } + + @Substitute + public static Object selectMethod(CacheableCallSite callSite, Class<?> sender, String methodName, int callID, + Boolean safeNavigation, Boolean thisCall, Boolean spreadCall, Object dummyReceiver, Object[] arguments) + throws Throwable { + final SubstituteMethodHandleWrapper mhw = fallback(callSite, sender, methodName, callID, safeNavigation, thisCall, + spreadCall, dummyReceiver, arguments); + + if (callSite instanceof CacheableCallSite) { + CacheableCallSite cacheableCallSite = (CacheableCallSite) callSite; + + final MethodHandle defaultTarget = cacheableCallSite.getDefaultTarget(); + if (defaultTarget == cacheableCallSite.getTarget()) { + // correct the stale methodhandle in the inline cache of callsite + // it is important but impacts the performance somehow when cache misses frequently + doWithCallSite(callSite, arguments, new SubstituteIndyInterface.ToCacheBiFunction(mhw)); + } + } + + return mhw.getCachedMethodHandle().invokeExact(arguments); + } + + @Substitute + public static Object fromCache(CacheableCallSite callSite, Class<?> sender, String methodName, int callID, + Boolean safeNavigation, Boolean thisCall, Boolean spreadCall, Object dummyReceiver, Object[] arguments) + throws Throwable { + SubstituteIndyFallbackSupplier fallbackSupplier = new SubstituteIndyFallbackSupplier(callSite, sender, methodName, + callID, safeNavigation, thisCall, spreadCall, dummyReceiver, arguments); + + SubstituteMethodHandleWrapper mhw = bypassCache(spreadCall, arguments) + ? NULL_METHOD_HANDLE_WRAPPER + : doWithCallSite( + callSite, arguments, + new SubstituteIndyInterface.FromCacheBiFunction(fallbackSupplier)); + + if (NULL_METHOD_HANDLE_WRAPPER == mhw) { + mhw = fallbackSupplier.get(); + } + + return mhw.getCachedMethodHandle().invokeExact(arguments); + } + + static class ToCacheBiFunction implements BiFunction<SubstituteCacheableCallSite, Object, SubstituteMethodHandleWrapper> { + + private final SubstituteMethodHandleWrapper mhw; + + ToCacheBiFunction(SubstituteMethodHandleWrapper mhw) { + this.mhw = mhw; + } + + @Override + public SubstituteMethodHandleWrapper apply(SubstituteCacheableCallSite cs, Object receiver) { + return cs.put(receiver.getClass().getName(), mhw); + } + } + + static class FromCacheBiFunction implements BiFunction<SubstituteCacheableCallSite, Object, SubstituteMethodHandleWrapper> { + + private final SubstituteIndyFallbackSupplier fallbackSupplier; + + FromCacheBiFunction(SubstituteIndyFallbackSupplier fallbackSupplier) { + this.fallbackSupplier = fallbackSupplier; + } + + @Override + public SubstituteMethodHandleWrapper apply(SubstituteCacheableCallSite cs, Object receiver) { + return cs.getAndPut( + receiver.getClass().getName(), + c -> { + SubstituteMethodHandleWrapper fbMhw = fallbackSupplier.get(); + return fbMhw.isCanSetTarget() ? fbMhw : NULL_METHOD_HANDLE_WRAPPER; + }); + } + } +} diff --git a/extensions/groovy/runtime/src/main/java/org/apache/camel/quarkus/component/groovy/runtime/graal/SubstituteMethodHandleWrapper.java b/extensions/groovy/runtime/src/main/java/org/apache/camel/quarkus/component/groovy/runtime/graal/SubstituteMethodHandleWrapper.java new file mode 100644 index 0000000000..349a974855 --- /dev/null +++ b/extensions/groovy/runtime/src/main/java/org/apache/camel/quarkus/component/groovy/runtime/graal/SubstituteMethodHandleWrapper.java @@ -0,0 +1,37 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.quarkus.component.groovy.runtime.graal; + +import java.lang.invoke.MethodHandle; + +import com.oracle.svm.core.annotate.Alias; +import com.oracle.svm.core.annotate.TargetClass; + +// TODO: Remove this - https://github.com/apache/camel-quarkus/issues/8468 +@TargetClass(className = "org.codehaus.groovy.vmplugin.v8.MethodHandleWrapper") +final class SubstituteMethodHandleWrapper { + + @Alias + public boolean isCanSetTarget() { + return false; + } + + @Alias + public MethodHandle getCachedMethodHandle() { + return null; + } +} diff --git a/pom.xml b/pom.xml index 1561c0cbb0..d51eb94b5c 100644 --- a/pom.xml +++ b/pom.xml @@ -113,7 +113,7 @@ <google-oauth-client.version>1.39.0</google-oauth-client.version><!-- @sync com.google.cloud:google-cloud-bigquery:${google-cloud-bigquery.version} dep:com.google.oauth-client:google-oauth-client --> <graalvm.version>23.1.2</graalvm.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.graalvm.sdk:nativeimage --> <graalvm-docs.version>jdk21</graalvm-docs.version><!-- @sync io.quarkus:quarkus-documentation:${quarkus.version} prop:graal-community.tag-for-documentation --> - <groovy.version>4.0.29</groovy.version><!-- @sync io.quarkiverse.groovy:quarkus-groovy-parent:${quarkiverse-groovy.version} prop:groovy.version --> + <groovy.version>5.0.4</groovy.version><!-- TODO: Reinstate @sync tag https://github.com/apache/camel-quarkus/issues/8468 --><!-- io.quarkiverse.groovy:quarkus-groovy-parent:${quarkiverse-groovy.version} prop:groovy.version --> <hapi.version>${hapi-version}</hapi.version> <hapi-base.version>${hapi-base-version}</hapi-base.version> <hapi-fhir.version>${hapi-fhir-version}</hapi-fhir.version> diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 1a08ebfdf5..c5546c840d 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -8936,154 +8936,154 @@ <version>4.1.5</version><!-- io.quarkiverse.cxf:quarkus-cxf-bom:3.33.0 --> </dependency> <dependency> - <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <artifactId>groovy</artifactId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <version>4.0.29</version><!-- org.apache.groovy:groovy-bom:4.0.29 --> + <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <artifactId>groovy</artifactId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <version>5.0.4</version><!-- org.apache.groovy:groovy-bom:5.0.4 --> </dependency> <dependency> - <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <artifactId>groovy-ant</artifactId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <version>4.0.29</version><!-- org.apache.groovy:groovy-bom:4.0.29 --> + <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <artifactId>groovy-ant</artifactId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <version>5.0.4</version><!-- org.apache.groovy:groovy-bom:5.0.4 --> </dependency> <dependency> - <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <artifactId>groovy-astbuilder</artifactId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <version>4.0.29</version><!-- org.apache.groovy:groovy-bom:4.0.29 --> + <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <artifactId>groovy-astbuilder</artifactId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <version>5.0.4</version><!-- org.apache.groovy:groovy-bom:5.0.4 --> </dependency> <dependency> - <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <artifactId>groovy-cli-commons</artifactId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <version>4.0.29</version><!-- org.apache.groovy:groovy-bom:4.0.29 --> + <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <artifactId>groovy-cli-commons</artifactId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <version>5.0.4</version><!-- org.apache.groovy:groovy-bom:5.0.4 --> </dependency> <dependency> - <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <artifactId>groovy-cli-picocli</artifactId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <version>4.0.29</version><!-- org.apache.groovy:groovy-bom:4.0.29 --> + <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <artifactId>groovy-cli-picocli</artifactId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <version>5.0.4</version><!-- org.apache.groovy:groovy-bom:5.0.4 --> </dependency> <dependency> - <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <artifactId>groovy-console</artifactId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <version>4.0.29</version><!-- org.apache.groovy:groovy-bom:4.0.29 --> + <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <artifactId>groovy-console</artifactId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <version>5.0.4</version><!-- org.apache.groovy:groovy-bom:5.0.4 --> </dependency> <dependency> - <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <artifactId>groovy-contracts</artifactId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <version>4.0.29</version><!-- org.apache.groovy:groovy-bom:4.0.29 --> + <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <artifactId>groovy-contracts</artifactId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <version>5.0.4</version><!-- org.apache.groovy:groovy-bom:5.0.4 --> </dependency> <dependency> - <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <artifactId>groovy-datetime</artifactId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <version>4.0.29</version><!-- org.apache.groovy:groovy-bom:4.0.29 --> + <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <artifactId>groovy-datetime</artifactId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <version>5.0.4</version><!-- org.apache.groovy:groovy-bom:5.0.4 --> </dependency> <dependency> - <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <artifactId>groovy-dateutil</artifactId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <version>4.0.29</version><!-- org.apache.groovy:groovy-bom:4.0.29 --> + <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <artifactId>groovy-dateutil</artifactId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <version>5.0.4</version><!-- org.apache.groovy:groovy-bom:5.0.4 --> </dependency> <dependency> - <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <artifactId>groovy-docgenerator</artifactId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <version>4.0.29</version><!-- org.apache.groovy:groovy-bom:4.0.29 --> + <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <artifactId>groovy-docgenerator</artifactId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <version>5.0.4</version><!-- org.apache.groovy:groovy-bom:5.0.4 --> </dependency> <dependency> - <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <artifactId>groovy-ginq</artifactId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <version>4.0.29</version><!-- org.apache.groovy:groovy-bom:4.0.29 --> + <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <artifactId>groovy-ginq</artifactId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <version>5.0.4</version><!-- org.apache.groovy:groovy-bom:5.0.4 --> </dependency> <dependency> - <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <artifactId>groovy-groovydoc</artifactId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <version>4.0.29</version><!-- org.apache.groovy:groovy-bom:4.0.29 --> + <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <artifactId>groovy-groovydoc</artifactId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <version>5.0.4</version><!-- org.apache.groovy:groovy-bom:5.0.4 --> </dependency> <dependency> - <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <artifactId>groovy-groovysh</artifactId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <version>4.0.29</version><!-- org.apache.groovy:groovy-bom:4.0.29 --> + <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <artifactId>groovy-groovysh</artifactId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <version>5.0.4</version><!-- org.apache.groovy:groovy-bom:5.0.4 --> </dependency> <dependency> - <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <artifactId>groovy-jmx</artifactId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <version>4.0.29</version><!-- org.apache.groovy:groovy-bom:4.0.29 --> + <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <artifactId>groovy-jmx</artifactId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <version>5.0.4</version><!-- org.apache.groovy:groovy-bom:5.0.4 --> </dependency> <dependency> - <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <artifactId>groovy-json</artifactId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <version>4.0.29</version><!-- org.apache.groovy:groovy-bom:4.0.29 --> + <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <artifactId>groovy-json</artifactId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <version>5.0.4</version><!-- org.apache.groovy:groovy-bom:5.0.4 --> </dependency> <dependency> - <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <artifactId>groovy-jsr223</artifactId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <version>4.0.29</version><!-- org.apache.groovy:groovy-bom:4.0.29 --> + <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <artifactId>groovy-jsr223</artifactId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <version>5.0.4</version><!-- org.apache.groovy:groovy-bom:5.0.4 --> </dependency> <dependency> - <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <artifactId>groovy-macro</artifactId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <version>4.0.29</version><!-- org.apache.groovy:groovy-bom:4.0.29 --> + <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <artifactId>groovy-macro</artifactId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <version>5.0.4</version><!-- org.apache.groovy:groovy-bom:5.0.4 --> </dependency> <dependency> - <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <artifactId>groovy-macro-library</artifactId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <version>4.0.29</version><!-- org.apache.groovy:groovy-bom:4.0.29 --> + <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <artifactId>groovy-macro-library</artifactId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <version>5.0.4</version><!-- org.apache.groovy:groovy-bom:5.0.4 --> </dependency> <dependency> - <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <artifactId>groovy-nio</artifactId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <version>4.0.29</version><!-- org.apache.groovy:groovy-bom:4.0.29 --> + <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <artifactId>groovy-nio</artifactId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <version>5.0.4</version><!-- org.apache.groovy:groovy-bom:5.0.4 --> </dependency> <dependency> - <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <artifactId>groovy-servlet</artifactId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <version>4.0.29</version><!-- org.apache.groovy:groovy-bom:4.0.29 --> + <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <artifactId>groovy-servlet</artifactId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <version>5.0.4</version><!-- org.apache.groovy:groovy-bom:5.0.4 --> </dependency> <dependency> - <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <artifactId>groovy-sql</artifactId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <version>4.0.29</version><!-- org.apache.groovy:groovy-bom:4.0.29 --> + <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <artifactId>groovy-sql</artifactId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <version>5.0.4</version><!-- org.apache.groovy:groovy-bom:5.0.4 --> </dependency> <dependency> - <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <artifactId>groovy-swing</artifactId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <version>4.0.29</version><!-- org.apache.groovy:groovy-bom:4.0.29 --> + <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <artifactId>groovy-swing</artifactId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <version>5.0.4</version><!-- org.apache.groovy:groovy-bom:5.0.4 --> </dependency> <dependency> - <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <artifactId>groovy-templates</artifactId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <version>4.0.29</version><!-- org.apache.groovy:groovy-bom:4.0.29 --> + <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <artifactId>groovy-templates</artifactId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <version>5.0.4</version><!-- org.apache.groovy:groovy-bom:5.0.4 --> </dependency> <dependency> - <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <artifactId>groovy-test</artifactId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <version>4.0.29</version><!-- org.apache.groovy:groovy-bom:4.0.29 --> + <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <artifactId>groovy-test</artifactId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <version>5.0.4</version><!-- org.apache.groovy:groovy-bom:5.0.4 --> </dependency> <dependency> - <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <artifactId>groovy-test-junit5</artifactId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <version>4.0.29</version><!-- org.apache.groovy:groovy-bom:4.0.29 --> + <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <artifactId>groovy-test-junit5</artifactId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <version>5.0.4</version><!-- org.apache.groovy:groovy-bom:5.0.4 --> </dependency> <dependency> - <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <artifactId>groovy-testng</artifactId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <version>4.0.29</version><!-- org.apache.groovy:groovy-bom:4.0.29 --> + <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <artifactId>groovy-testng</artifactId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <version>5.0.4</version><!-- org.apache.groovy:groovy-bom:5.0.4 --> </dependency> <dependency> - <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <artifactId>groovy-toml</artifactId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <version>4.0.29</version><!-- org.apache.groovy:groovy-bom:4.0.29 --> + <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <artifactId>groovy-toml</artifactId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <version>5.0.4</version><!-- org.apache.groovy:groovy-bom:5.0.4 --> </dependency> <dependency> - <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <artifactId>groovy-typecheckers</artifactId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <version>4.0.29</version><!-- org.apache.groovy:groovy-bom:4.0.29 --> + <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <artifactId>groovy-typecheckers</artifactId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <version>5.0.4</version><!-- org.apache.groovy:groovy-bom:5.0.4 --> </dependency> <dependency> - <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <artifactId>groovy-xml</artifactId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <version>4.0.29</version><!-- org.apache.groovy:groovy-bom:4.0.29 --> + <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <artifactId>groovy-xml</artifactId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <version>5.0.4</version><!-- org.apache.groovy:groovy-bom:5.0.4 --> </dependency> <dependency> - <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <artifactId>groovy-yaml</artifactId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <version>4.0.29</version><!-- org.apache.groovy:groovy-bom:4.0.29 --> + <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <artifactId>groovy-yaml</artifactId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <version>5.0.4</version><!-- org.apache.groovy:groovy-bom:5.0.4 --> </dependency> <dependency> <groupId>software.amazon.awssdk</groupId><!-- software.amazon.awssdk:bom:2.42.7 --> diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 045ba69f4a..3fec97529e 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -8806,12 +8806,12 @@ <dependency> <groupId>org.apache.groovy</groupId> <artifactId>groovy</artifactId> - <version>4.0.29</version> + <version>5.0.4</version> </dependency> <dependency> <groupId>org.apache.groovy</groupId> <artifactId>groovy-xml</artifactId> - <version>4.0.29</version> + <version>5.0.4</version> </dependency> <dependency> <groupId>software.amazon.awssdk</groupId> diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 626ed41445..fda7d34acf 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -8804,14 +8804,14 @@ <version>4.1.5</version><!-- io.quarkiverse.cxf:quarkus-cxf-bom:3.33.0 --> </dependency> <dependency> - <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <artifactId>groovy</artifactId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <version>4.0.29</version><!-- org.apache.groovy:groovy-bom:4.0.29 --> + <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <artifactId>groovy</artifactId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <version>5.0.4</version><!-- org.apache.groovy:groovy-bom:5.0.4 --> </dependency> <dependency> - <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <artifactId>groovy-xml</artifactId><!-- org.apache.groovy:groovy-bom:4.0.29 --> - <version>4.0.29</version><!-- org.apache.groovy:groovy-bom:4.0.29 --> + <groupId>org.apache.groovy</groupId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <artifactId>groovy-xml</artifactId><!-- org.apache.groovy:groovy-bom:5.0.4 --> + <version>5.0.4</version><!-- org.apache.groovy:groovy-bom:5.0.4 --> </dependency> <dependency> <groupId>software.amazon.awssdk</groupId><!-- software.amazon.awssdk:bom:2.42.7 -->
