Integrate Helidon Build Tools 4.0.0-M1 (helidon-io#7330)

dalexandrov · Aug 9, 2023 · cd2098f · cd2098f
1 parent 7121a3f
commit cd2098f
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 12 deletions.
diff --git a/applications/parent/pom.xml b/applications/parent/pom.xml
@@ -42,8 +42,8 @@
         <version.plugin.dependency>3.6.0</version.plugin.dependency>
         <version.plugin.exec>3.1.0</version.plugin.exec>
         <version.plugin.failsafe>3.1.2</version.plugin.failsafe>
-        <version.plugin.helidon>3.0.3</version.plugin.helidon>
-        <version.plugin.helidon-cli>3.0.3</version.plugin.helidon-cli>
+        <version.plugin.helidon>4.0.0-M1</version.plugin.helidon>
+        <version.plugin.helidon-cli>4.0.0-M1</version.plugin.helidon-cli>
         <version.plugin.jar>3.0.2</version.plugin.jar>
         <version.plugin.nativeimage>0.9.16</version.plugin.nativeimage>
         <version.plugin.os>1.5.0.Final</version.plugin.os>

diff --git a/etc/scripts/test-packaging-jlink.sh b/etc/scripts/test-packaging-jlink.sh
@@ -30,9 +30,6 @@ cd ${WS_DIR}/tests/integration/native-image
 # Prime build all native-image tests
 mvn ${MAVEN_ARGS} -e clean install
 
-echo Skipping jlink tests, until we switch to Smallrye based Jandex in build tools - org.jboss fails with NPE on Java 21
-exit 0
-
 # Build jlink images
 # mp-2 fails because of https://github.com/oracle/helidon-build-tools/issues/478
 readonly native_image_tests="mp-1 mp-3"

diff --git a/examples/nima/quickstart-standalone/pom.xml b/examples/nima/quickstart-standalone/pom.xml
@@ -41,8 +41,8 @@
         <version.plugin.dependency>3.0.0</version.plugin.dependency>
         <version.plugin.exec>1.6.0</version.plugin.exec>
         <version.plugin.failsafe>3.0.0-M5</version.plugin.failsafe>
-        <version.plugin.helidon>2.2.3</version.plugin.helidon>
-        <version.plugin.helidon-cli>2.2.3</version.plugin.helidon-cli>
+        <version.plugin.helidon>4.0.0-M1</version.plugin.helidon>
+        <version.plugin.helidon-cli>4.0.0-M1</version.plugin.helidon-cli>
         <version.plugin.jar>3.0.2</version.plugin.jar>
         <version.plugin.os>1.5.0.Final</version.plugin.os>
         <version.plugin.resources>2.7</version.plugin.resources>

diff --git a/examples/quickstarts/helidon-standalone-quickstart-mp/pom.xml b/examples/quickstarts/helidon-standalone-quickstart-mp/pom.xml
@@ -41,8 +41,8 @@
         <version.plugin.eclipselink>2.7.5.1</version.plugin.eclipselink>
         <version.plugin.exec>1.6.0</version.plugin.exec>
         <version.plugin.failsafe>3.0.0-M5</version.plugin.failsafe>
-        <version.plugin.helidon>3.0.3</version.plugin.helidon>
-        <version.plugin.helidon-cli>3.0.3</version.plugin.helidon-cli>
+        <version.plugin.helidon>4.0.0-M1</version.plugin.helidon>
+        <version.plugin.helidon-cli>4.0.0-M1</version.plugin.helidon-cli>
         <version.plugin.jandex>3.1.2</version.plugin.jandex>
         <version.plugin.jar>3.0.2</version.plugin.jar>
         <version.plugin.os>1.5.0.Final</version.plugin.os>

diff --git a/examples/quickstarts/helidon-standalone-quickstart-se/pom.xml b/examples/quickstarts/helidon-standalone-quickstart-se/pom.xml
@@ -41,8 +41,8 @@
         <version.plugin.dependency>3.6.0</version.plugin.dependency>
         <version.plugin.exec>1.6.0</version.plugin.exec>
         <version.plugin.failsafe>3.0.0-M5</version.plugin.failsafe>
-        <version.plugin.helidon>3.0.3</version.plugin.helidon>
-        <version.plugin.helidon-cli>3.0.3</version.plugin.helidon-cli>
+        <version.plugin.helidon>4.0.0-M1</version.plugin.helidon>
+        <version.plugin.helidon-cli>4.0.0-M1</version.plugin.helidon-cli>
         <version.plugin.jar>3.0.2</version.plugin.jar>
         <version.plugin.os>1.5.0.Final</version.plugin.os>
         <version.plugin.protobuf>0.5.1</version.plugin.protobuf>

diff --git a/pom.xml b/pom.xml
@@ -104,7 +104,7 @@
         <version.plugin.exec>3.1.0</version.plugin.exec>
         <version.plugin.failsafe>3.1.2</version.plugin.failsafe>
         <version.plugin.glassfish-copyright>2.3</version.plugin.glassfish-copyright>
-        <version.plugin.helidon-build-tools>3.0.5</version.plugin.helidon-build-tools>
+        <version.plugin.helidon-build-tools>4.0.0-M1</version.plugin.helidon-build-tools>
         <version.plugin.hibernate-enhance>${version.lib.hibernate}</version.plugin.hibernate-enhance>
         <version.plugin.jacoco>0.8.5</version.plugin.jacoco>
         <version.plugin.jandex>3.1.2</version.plugin.jandex>