This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch camel-quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus-examples.git
commit b8a7e63d72338457df31ee1638584e7fa0eb223d Author: James Netherton <jamesnether...@gmail.com> AuthorDate: Mon Apr 29 10:54:53 2024 +0100 Migrate from deprecated quarkus.package.type to quarkus.native.enabled --- aws-lambda/pom.xml | 2 +- cluster-leader-election/pom.xml | 18 ++---------------- cxf-soap/pom.xml | 4 ++-- file-bindy-ftp/pom.xml | 2 +- file-split-log-xml/pom.xml | 4 ++-- health/pom.xml | 4 ++-- http-log/pom.xml | 4 ++-- jdbc-datasource/pom.xml | 4 ++-- jms-jpa/pom.xml | 4 ++-- jpa-idempotent-repository/pom.xml | 2 +- jta-jpa/pom.xml | 4 ++-- kafka/pom.xml | 2 +- kamelet-chucknorris/pom.xml | 4 ++-- .../test/java/org/acme/kamelet/ChuckNorrisTest.java | 4 ++-- observability/pom.xml | 2 +- platform-http-security-keycloak/pom.xml | 4 ++-- rest-json/pom.xml | 2 +- timer-log-kotlin/pom.xml | 4 ++-- timer-log-main/pom.xml | 4 ++-- .../src/test/java/org/acme/main/TimerLogMainTest.java | 4 ++-- timer-log/pom.xml | 4 ++-- vertx-websocket-chat/pom.xml | 4 ++-- 22 files changed, 38 insertions(+), 52 deletions(-) diff --git a/aws-lambda/pom.xml b/aws-lambda/pom.xml index 9ccce48..670bcd7 100644 --- a/aws-lambda/pom.xml +++ b/aws-lambda/pom.xml @@ -268,7 +268,7 @@ </property> </activation> <properties> - <quarkus.package.type>native</quarkus.package.type> + <quarkus.native.enabled>true</quarkus.native.enabled> </properties> <build> <plugins> diff --git a/cluster-leader-election/pom.xml b/cluster-leader-election/pom.xml index a814975..99278fa 100644 --- a/cluster-leader-election/pom.xml +++ b/cluster-leader-election/pom.xml @@ -269,7 +269,7 @@ </property> </activation> <properties> - <quarkus.package.type>native</quarkus.package.type> + <quarkus.native.enabled>true</quarkus.native.enabled> </properties> <build> <plugins> @@ -284,7 +284,7 @@ </goals> <configuration> <systemPropertyVariables> - <quarkus.package.type>${quarkus.package.type}</quarkus.package.type> + <quarkus.native.enabled>${quarkus.native.enabled}</quarkus.native.enabled> </systemPropertyVariables> </configuration> </execution> @@ -293,20 +293,6 @@ </plugins> </build> </profile> - <!-- TODO: https://github.com/apache/camel-quarkus/issues/5515 --> - <profile> - <id>native-disabled-github-ci</id> - <activation> - <property> - <name>env.CI</name> - <value>true</value> - </property> - </activation> - <properties> - <quarkus.package.type>fast-jar</quarkus.package.type> - <skipITs>true</skipITs> - </properties> - </profile> <profile> <id>kubernetes</id> <activation> diff --git a/cxf-soap/pom.xml b/cxf-soap/pom.xml index f9cfe64..363afd5 100644 --- a/cxf-soap/pom.xml +++ b/cxf-soap/pom.xml @@ -273,7 +273,7 @@ </property> </activation> <properties> - <quarkus.package.type>native</quarkus.package.type> + <quarkus.native.enabled>true</quarkus.native.enabled> </properties> <build> <plugins> @@ -288,7 +288,7 @@ </goals> <configuration> <systemPropertyVariables> - <quarkus.package.type>${quarkus.package.type}</quarkus.package.type> + <quarkus.native.enabled>${quarkus.native.enabled}</quarkus.native.enabled> </systemPropertyVariables> </configuration> </execution> diff --git a/file-bindy-ftp/pom.xml b/file-bindy-ftp/pom.xml index 53716cf..1587eb6 100644 --- a/file-bindy-ftp/pom.xml +++ b/file-bindy-ftp/pom.xml @@ -324,7 +324,7 @@ </property> </activation> <properties> - <quarkus.package.type>native</quarkus.package.type> + <quarkus.native.enabled>true</quarkus.native.enabled> </properties> <build> <plugins> diff --git a/file-split-log-xml/pom.xml b/file-split-log-xml/pom.xml index 5b7dee9..20d7d74 100644 --- a/file-split-log-xml/pom.xml +++ b/file-split-log-xml/pom.xml @@ -263,7 +263,7 @@ </property> </activation> <properties> - <quarkus.package.type>native</quarkus.package.type> + <quarkus.native.enabled>true</quarkus.native.enabled> </properties> <build> <plugins> @@ -278,7 +278,7 @@ </goals> <configuration> <systemPropertyVariables> - <quarkus.package.type>${quarkus.package.type}</quarkus.package.type> + <quarkus.native.enabled>${quarkus.native.enabled}</quarkus.native.enabled> </systemPropertyVariables> </configuration> </execution> diff --git a/health/pom.xml b/health/pom.xml index 7bcb5c1..c570702 100644 --- a/health/pom.xml +++ b/health/pom.xml @@ -258,7 +258,7 @@ </property> </activation> <properties> - <quarkus.package.type>native</quarkus.package.type> + <quarkus.native.enabled>true</quarkus.native.enabled> </properties> <build> <plugins> @@ -273,7 +273,7 @@ </goals> <configuration> <systemPropertyVariables> - <quarkus.package.type>${quarkus.package.type}</quarkus.package.type> + <quarkus.native.enabled>${quarkus.native.enabled}</quarkus.native.enabled> </systemPropertyVariables> </configuration> </execution> diff --git a/http-log/pom.xml b/http-log/pom.xml index 6fbfb0a..099136d 100644 --- a/http-log/pom.xml +++ b/http-log/pom.xml @@ -259,7 +259,7 @@ </property> </activation> <properties> - <quarkus.package.type>native</quarkus.package.type> + <quarkus.native.enabled>true</quarkus.native.enabled> </properties> <build> <plugins> @@ -274,7 +274,7 @@ </goals> <configuration> <systemPropertyVariables> - <quarkus.package.type>${quarkus.package.type}</quarkus.package.type> + <quarkus.native.enabled>${quarkus.native.enabled}</quarkus.native.enabled> </systemPropertyVariables> </configuration> </execution> diff --git a/jdbc-datasource/pom.xml b/jdbc-datasource/pom.xml index 79a7e1b..f2e483f 100644 --- a/jdbc-datasource/pom.xml +++ b/jdbc-datasource/pom.xml @@ -271,7 +271,7 @@ </goals> <configuration> <systemPropertyVariables> - <quarkus.package.type>${quarkus.package.type}</quarkus.package.type> + <quarkus.native.enabled>${quarkus.native.enabled}</quarkus.native.enabled> </systemPropertyVariables> </configuration> </execution> @@ -280,7 +280,7 @@ </plugins> </build> <properties> - <quarkus.package.type>native</quarkus.package.type> + <quarkus.native.enabled>true</quarkus.native.enabled> </properties> </profile> <profile> diff --git a/jms-jpa/pom.xml b/jms-jpa/pom.xml index 711a0d9..e551098 100644 --- a/jms-jpa/pom.xml +++ b/jms-jpa/pom.xml @@ -304,7 +304,7 @@ </goals> <configuration> <systemPropertyVariables> - <quarkus.package.type>${quarkus.package.type}</quarkus.package.type> + <quarkus.native.enabled>${quarkus.native.enabled}</quarkus.native.enabled> </systemPropertyVariables> </configuration> </execution> @@ -313,7 +313,7 @@ </plugins> </build> <properties> - <quarkus.package.type>native</quarkus.package.type> + <quarkus.native.enabled>true</quarkus.native.enabled> </properties> </profile> </profiles> diff --git a/jpa-idempotent-repository/pom.xml b/jpa-idempotent-repository/pom.xml index 0139ff8..d9039e1 100644 --- a/jpa-idempotent-repository/pom.xml +++ b/jpa-idempotent-repository/pom.xml @@ -336,7 +336,7 @@ </property> </activation> <properties> - <quarkus.package.type>native</quarkus.package.type> + <quarkus.native.enabled>true</quarkus.native.enabled> </properties> <build> <plugins> diff --git a/jta-jpa/pom.xml b/jta-jpa/pom.xml index c0085ec..23dc4f3 100644 --- a/jta-jpa/pom.xml +++ b/jta-jpa/pom.xml @@ -274,7 +274,7 @@ </goals> <configuration> <systemPropertyVariables> - <quarkus.package.type>${quarkus.package.type}</quarkus.package.type> + <quarkus.native.enabled>${quarkus.native.enabled}</quarkus.native.enabled> </systemPropertyVariables> </configuration> </execution> @@ -283,7 +283,7 @@ </plugins> </build> <properties> - <quarkus.package.type>native</quarkus.package.type> + <quarkus.native.enabled>true</quarkus.native.enabled> </properties> </profile> </profiles> diff --git a/kafka/pom.xml b/kafka/pom.xml index 8ca8f33..4366a17 100644 --- a/kafka/pom.xml +++ b/kafka/pom.xml @@ -288,7 +288,7 @@ </property> </activation> <properties> - <quarkus.package.type>native</quarkus.package.type> + <quarkus.native.enabled>true</quarkus.native.enabled> </properties> <build> <plugins> diff --git a/kamelet-chucknorris/pom.xml b/kamelet-chucknorris/pom.xml index 205f379..50f302e 100644 --- a/kamelet-chucknorris/pom.xml +++ b/kamelet-chucknorris/pom.xml @@ -290,7 +290,7 @@ </property> </activation> <properties> - <quarkus.package.type>native</quarkus.package.type> + <quarkus.native.enabled>true</quarkus.native.enabled> <quarkus.runner>${project.build.directory}/${project.artifactId}-${project.version}-runner</quarkus.runner> </properties> <build> @@ -306,7 +306,7 @@ </goals> <configuration> <systemPropertyVariables> - <quarkus.package.type>${quarkus.package.type}</quarkus.package.type> + <quarkus.native.enabled>${quarkus.native.enabled}</quarkus.native.enabled> <quarkus.runner>${quarkus.runner}</quarkus.runner> </systemPropertyVariables> </configuration> diff --git a/kamelet-chucknorris/src/test/java/org/acme/kamelet/ChuckNorrisTest.java b/kamelet-chucknorris/src/test/java/org/acme/kamelet/ChuckNorrisTest.java index 9329ba6..1fe38c8 100644 --- a/kamelet-chucknorris/src/test/java/org/acme/kamelet/ChuckNorrisTest.java +++ b/kamelet-chucknorris/src/test/java/org/acme/kamelet/ChuckNorrisTest.java @@ -34,7 +34,7 @@ import static org.awaitility.Awaitility.await; @QuarkusTest public class ChuckNorrisTest { - private static final String PACKAGE_TYPE = System.getProperty("quarkus.package.type"); + private static final String NATIVE_ENABLED = System.getProperty("quarkus.native.enabled"); @Test public void testTimerLogMain() throws IOException { @@ -85,7 +85,7 @@ public class ChuckNorrisTest { } private static boolean isNative() { - return PACKAGE_TYPE != null && PACKAGE_TYPE.equals("native"); + return NATIVE_ENABLED != null && NATIVE_ENABLED.equals("true"); } static final class QuarkusRunnerExecutor extends QuarkusProcessExecutor { diff --git a/observability/pom.xml b/observability/pom.xml index b459ae2..82ab998 100644 --- a/observability/pom.xml +++ b/observability/pom.xml @@ -276,7 +276,7 @@ </property> </activation> <properties> - <quarkus.package.type>native</quarkus.package.type> + <quarkus.native.enabled>true</quarkus.native.enabled> </properties> <build> <pluginManagement> diff --git a/platform-http-security-keycloak/pom.xml b/platform-http-security-keycloak/pom.xml index 78ece3e..b449649 100644 --- a/platform-http-security-keycloak/pom.xml +++ b/platform-http-security-keycloak/pom.xml @@ -256,7 +256,7 @@ </property> </activation> <properties> - <quarkus.package.type>native</quarkus.package.type> + <quarkus.native.enabled>true</quarkus.native.enabled> </properties> <build> <plugins> @@ -271,7 +271,7 @@ </goals> <configuration> <systemPropertyVariables> - <quarkus.package.type>${quarkus.package.type}</quarkus.package.type> + <quarkus.native.enabled>${quarkus.native.enabled}</quarkus.native.enabled> </systemPropertyVariables> </configuration> </execution> diff --git a/rest-json/pom.xml b/rest-json/pom.xml index 13e691c..2b58819 100644 --- a/rest-json/pom.xml +++ b/rest-json/pom.xml @@ -251,7 +251,7 @@ </property> </activation> <properties> - <quarkus.package.type>native</quarkus.package.type> + <quarkus.native.enabled>true</quarkus.native.enabled> </properties> <build> <pluginManagement> diff --git a/timer-log-kotlin/pom.xml b/timer-log-kotlin/pom.xml index 8f7c207..ce546cc 100644 --- a/timer-log-kotlin/pom.xml +++ b/timer-log-kotlin/pom.xml @@ -297,7 +297,7 @@ </property> </activation> <properties> - <quarkus.package.type>native</quarkus.package.type> + <quarkus.native.enabled>true</quarkus.native.enabled> </properties> <build> <plugins> @@ -312,7 +312,7 @@ </goals> <configuration> <systemPropertyVariables> - <quarkus.package.type>${quarkus.package.type}</quarkus.package.type> + <quarkus.native.enabled>${quarkus.native.enabled}</quarkus.native.enabled> </systemPropertyVariables> </configuration> </execution> diff --git a/timer-log-main/pom.xml b/timer-log-main/pom.xml index 70ffe40..b3bf998 100644 --- a/timer-log-main/pom.xml +++ b/timer-log-main/pom.xml @@ -285,7 +285,7 @@ </property> </activation> <properties> - <quarkus.package.type>native</quarkus.package.type> + <quarkus.native.enabled>true</quarkus.native.enabled> <quarkus.runner>${project.build.directory}/${project.artifactId}-${project.version}-runner</quarkus.runner> </properties> <build> @@ -301,7 +301,7 @@ </goals> <configuration> <systemPropertyVariables> - <quarkus.package.type>${quarkus.package.type}</quarkus.package.type> + <quarkus.native.enabled>${quarkus.native.enabled}</quarkus.native.enabled> <quarkus.runner>${quarkus.runner}</quarkus.runner> </systemPropertyVariables> </configuration> diff --git a/timer-log-main/src/test/java/org/acme/main/TimerLogMainTest.java b/timer-log-main/src/test/java/org/acme/main/TimerLogMainTest.java index 644b4a7..7308269 100644 --- a/timer-log-main/src/test/java/org/acme/main/TimerLogMainTest.java +++ b/timer-log-main/src/test/java/org/acme/main/TimerLogMainTest.java @@ -34,7 +34,7 @@ import static org.awaitility.Awaitility.await; @QuarkusTest public class TimerLogMainTest { - private static final String PACKAGE_TYPE = System.getProperty("quarkus.package.type"); + private static final String NATIVE_ENABLED = System.getProperty("quarkus.native.enabled"); @Test public void testTimerLogMain() throws IOException { @@ -85,7 +85,7 @@ public class TimerLogMainTest { } private static boolean isNative() { - return PACKAGE_TYPE != null && PACKAGE_TYPE.equals("native"); + return NATIVE_ENABLED != null && NATIVE_ENABLED.equals("true"); } static final class QuarkusRunnerExecutor extends QuarkusProcessExecutor { diff --git a/timer-log/pom.xml b/timer-log/pom.xml index d34eb02..37ace41 100644 --- a/timer-log/pom.xml +++ b/timer-log/pom.xml @@ -261,7 +261,7 @@ </property> </activation> <properties> - <quarkus.package.type>native</quarkus.package.type> + <quarkus.native.enabled>true</quarkus.native.enabled> </properties> <build> <plugins> @@ -276,7 +276,7 @@ </goals> <configuration> <systemPropertyVariables> - <quarkus.package.type>${quarkus.package.type}</quarkus.package.type> + <quarkus.native.enabled>${quarkus.native.enabled}</quarkus.native.enabled> </systemPropertyVariables> </configuration> </execution> diff --git a/vertx-websocket-chat/pom.xml b/vertx-websocket-chat/pom.xml index 143f42e..dcfe9f5 100644 --- a/vertx-websocket-chat/pom.xml +++ b/vertx-websocket-chat/pom.xml @@ -258,7 +258,7 @@ </property> </activation> <properties> - <quarkus.package.type>native</quarkus.package.type> + <quarkus.native.enabled>true</quarkus.native.enabled> </properties> <build> <plugins> @@ -273,7 +273,7 @@ </goals> <configuration> <systemPropertyVariables> - <quarkus.package.type>${quarkus.package.type}</quarkus.package.type> + <quarkus.native.enabled>${quarkus.native.enabled}</quarkus.native.enabled> </systemPropertyVariables> </configuration> </execution>