This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.6.x-fixes by this push:
new 194ab066019 Fix post-merge issues (pom.xml conflicts)
194ab066019 is described below
commit 194ab0660191ff4ae9e761cbd152d41f06a26b24
Author: Andriy Redko <[email protected]>
AuthorDate: Thu Jul 2 10:26:44 2026 -0400
Fix post-merge issues (pom.xml conflicts)
---
distribution/src/main/release/samples/jax_rs/graalvm_basic/pom.xml | 4 ----
distribution/src/main/release/samples/jaxws_graalvm/pom.xml | 4 ----
2 files changed, 8 deletions(-)
diff --git a/distribution/src/main/release/samples/jax_rs/graalvm_basic/pom.xml
b/distribution/src/main/release/samples/jax_rs/graalvm_basic/pom.xml
index 68c4fa0a151..16120feb619 100644
--- a/distribution/src/main/release/samples/jax_rs/graalvm_basic/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/graalvm_basic/pom.xml
@@ -126,11 +126,7 @@
<plugin>
<groupId>org.graalvm.buildtools</groupId>
<artifactId>native-maven-plugin</artifactId>
-<<<<<<< HEAD
- <version>1.1.1</version>
-=======
<version>1.1.3</version>
->>>>>>> 22985c3ffb8 (Bump org.graalvm.buildtools:native-maven-plugin from
1.1.2 to 1.1.3 (#3269))
<executions>
<execution>
<goals>
diff --git a/distribution/src/main/release/samples/jaxws_graalvm/pom.xml
b/distribution/src/main/release/samples/jaxws_graalvm/pom.xml
index 909e79f051a..4f31be1b049 100644
--- a/distribution/src/main/release/samples/jaxws_graalvm/pom.xml
+++ b/distribution/src/main/release/samples/jaxws_graalvm/pom.xml
@@ -147,11 +147,7 @@
<plugin>
<groupId>org.graalvm.buildtools</groupId>
<artifactId>native-maven-plugin</artifactId>
-<<<<<<< HEAD
- <version>1.1.1</version>
-=======
<version>1.1.3</version>
->>>>>>> 22985c3ffb8 (Bump org.graalvm.buildtools:native-maven-plugin from
1.1.2 to 1.1.3 (#3269))
<executions>
<execution>
<goals>
