This is an automated email from the ASF dual-hosted git repository. fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit da53ef785062abf4349cd33034f9539befb17c22 Author: Marco Carletti <[email protected]> AuthorDate: Fri Aug 4 12:59:43 2023 +0200 [CSB-2169] Fixes missing parameters and profile --- .../META-INF/maven/archetype-metadata.xml | 6 ++++++ .../src/main/resources/archetype-resources/pom.xml | 25 ++++++++++++++++++++++ .../projects/build-it/archetype.properties | 4 +++- .../resources/projects/run-it/archetype.properties | 4 +++- 4 files changed, 37 insertions(+), 2 deletions(-) diff --git a/archetypes/camel-archetype-spring-boot/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml b/archetypes/camel-archetype-spring-boot/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml index 00e1831293e..1478a9c1a4d 100644 --- a/archetypes/camel-archetype-spring-boot/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml +++ b/archetypes/camel-archetype-spring-boot/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml @@ -24,12 +24,18 @@ <requiredProperty key="camel-version"> <defaultValue>${project.version}</defaultValue> </requiredProperty> + <requiredProperty key="camel-spring-boot-version"> + <defaultValue>${project.version}</defaultValue> + </requiredProperty> <requiredProperty key="spring-boot-version"> <defaultValue>${spring-boot-version}</defaultValue> </requiredProperty> <requiredProperty key="maven-compiler-plugin-version"> <defaultValue>${maven-compiler-plugin-version}</defaultValue> </requiredProperty> + <requiredProperty key="openshift-maven-plugin-version"> + <defaultValue>${openshift-maven-plugin-version}</defaultValue> + </requiredProperty> </requiredProperties> <fileSets> <fileSet filtered="true" packaged="true" encoding="UTF-8"> diff --git a/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml b/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml index 192a48da3ed..b783edad69d 100644 --- a/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml @@ -32,6 +32,7 @@ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <spring.boot-version>${spring-boot-version}</spring.boot-version> <surefire.plugin.version>3.0.0-M4</surefire.plugin.version> + <jkube.generator.from>registry.access.redhat.com/ubi8/openjdk-17:latest</jkube.generator.from> </properties> <dependencyManagement> @@ -130,4 +131,28 @@ </plugins> </build> + <profiles> + <profile> + <id>openshift</id> + <build> + <defaultGoal>install</defaultGoal> + <plugins> + <plugin> + <groupId>org.eclipse.jkube</groupId> + <artifactId>openshift-maven-plugin</artifactId> + <version>${openshift-maven-plugin-version}</version> + <executions> + <execution> + <goals> + <goal>resource</goal> + <goal>build</goal> + <goal>apply</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> diff --git a/archetypes/camel-archetype-spring-boot/src/test/resources/projects/build-it/archetype.properties b/archetypes/camel-archetype-spring-boot/src/test/resources/projects/build-it/archetype.properties index 092220946b0..383bb4d09e0 100644 --- a/archetypes/camel-archetype-spring-boot/src/test/resources/projects/build-it/archetype.properties +++ b/archetypes/camel-archetype-spring-boot/src/test/resources/projects/build-it/archetype.properties @@ -21,7 +21,9 @@ package=org.apache.camel.archetypes.archetypeIT # TODO: Remove these, after https://issues.apache.org/jira/browse/ARCHETYPE-574 fixed camel-version=${project.version} +camel-spring-boot-version=${project.version} logback-version=${logback-version} maven-compiler-plugin-version=${maven-compiler-plugin-version} maven-resources-plugin-version=${maven-resources-plugin-version} -spring-boot-version=${spring-boot-version} \ No newline at end of file +spring-boot-version=${spring-boot-version} +openshift-maven-plugin-version=${openshift-maven-plugin-version} diff --git a/archetypes/camel-archetype-spring-boot/src/test/resources/projects/run-it/archetype.properties b/archetypes/camel-archetype-spring-boot/src/test/resources/projects/run-it/archetype.properties index 29a04ed6d2e..344e28ea220 100644 --- a/archetypes/camel-archetype-spring-boot/src/test/resources/projects/run-it/archetype.properties +++ b/archetypes/camel-archetype-spring-boot/src/test/resources/projects/run-it/archetype.properties @@ -21,7 +21,9 @@ package=org.apache.camel.archetypes.archetypeIT # TODO: Remove these, after https://issues.apache.org/jira/browse/ARCHETYPE-574 fixed camel-version=${project.version} +camel-spring-boot-version=${project.version} logback-version=${logback-version} maven-compiler-plugin-version=${maven-compiler-plugin-version} maven-resources-plugin-version=${maven-resources-plugin-version} -spring-boot-version=${spring-boot-version} \ No newline at end of file +spring-boot-version=${spring-boot-version} +openshift-maven-plugin-version=${openshift-maven-plugin-version}
