Skip to content

Commit

Permalink
Archetype changes for product branch (#422) (#495)
Browse files Browse the repository at this point in the history
Co-authored-by: Marco Carletti <mcarlett@redhat.com>
  • Loading branch information
cunningt and mcarlett authored Jan 14, 2025
1 parent be32258 commit a8e638a
Show file tree
Hide file tree
Showing 11 changed files with 406 additions and 26 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<requiredProperties>
<requiredProperty key="camel-version">
<requiredProperty key="camel-spring-boot-version">
<defaultValue>${project.version}</defaultValue>
</requiredProperty>
<requiredProperty key="spring-boot-version">
Expand All @@ -30,6 +30,9 @@
<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">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,25 +30,21 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.release>17</maven.compiler.release>
<spring.boot-version>${spring-boot-version}</spring.boot-version>
<surefire.plugin.version>3.0.0-M4</surefire.plugin.version>
<surefire.plugin.version>3.5.0</surefire.plugin.version>
<jkube.generator.from>registry.access.redhat.com/ubi9/openjdk-17:latest</jkube.generator.from>
</properties>

<dependencyManagement>
<dependencies>
<!-- Camel BOM -->
<!-- Camel Spring Boot BOM -->
<dependency>
<groupId>org.apache.camel.springboot</groupId>
<groupId>com.redhat.camel.springboot.platform</groupId>
<artifactId>camel-spring-boot-bom</artifactId>
<version>${camel-version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- Spring Boot BOM -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring.boot-version}</version>
<version>${camel-spring-boot-version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -100,16 +96,36 @@
</dependency>
</dependencies>

<repositories>
<repository>
<id>redhat-ga</id>
<url>https://maven.repository.redhat.com/ga/</url>
<name>Red Hat GA repository</name>
<snapshots>
<enabled>false</enabled>
</snapshots>
<releases>
<enabled>true</enabled>
</releases>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>redhat-ga</id>
<url>https://maven.repository.redhat.com/ga/</url>
<name>Red Hat GA repository</name>
<snapshots>
<enabled>false</enabled>
</snapshots>
<releases>
<enabled>true</enabled>
</releases>
</pluginRepository>
</pluginRepositories>


<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin-version}</version>
<configuration>
<release>11</release>
</configuration>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
Expand All @@ -127,7 +143,40 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.plugin.version}</version>
</plugin>
<plugin>
<groupId>com.redhat.camel.springboot.platform</groupId>
<artifactId>patch-maven-plugin</artifactId>
<version>${camel-spring-boot-version}</version>
<extensions>true</extensions>
<configuration>
<skip>false</skip>
</configuration>
</plugin>
</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>
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,9 @@ version=0.0.1
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}
spring-boot-version=${spring-boot-version}
openshift-maven-plugin-version=${openshift-maven-plugin-version}
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,9 @@ version=0.0.1
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}
spring-boot-version=${spring-boot-version}
openshift-maven-plugin-version=${openshift-maven-plugin-version}
2 changes: 1 addition & 1 deletion archetypes/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<profile>
<id>archetypes-skip-tests</id>
<activation>
<property><name>skipTests</name></property>
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<archetype.test.skip>true</archetype.test.skip>
Expand Down
40 changes: 40 additions & 0 deletions maintenance/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2005-2023 Red Hat, Inc.
Red Hat 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.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>spring-boot-parent</artifactId>
<version>4.4.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>

<groupId>com.redhat.camel.springboot.platform</groupId>
<artifactId>redhat-camel-spring-boot-maintenance</artifactId>
<packaging>pom</packaging>
<name>Camel SB Maintenance</name>

<modules>
<module>redhat-camel-spring-boot-patch-metadata</module>
<module>redhat-camel-spring-boot-patch-repository</module>
</modules>

</project>
71 changes: 71 additions & 0 deletions maintenance/redhat-camel-spring-boot-patch-metadata/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2005-2023 Red Hat, Inc.
Red Hat 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.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>com.redhat.camel.springboot.platform</groupId>
<artifactId>redhat-camel-spring-boot-maintenance</artifactId>
<version>4.4.0-SNAPSHOT</version>
</parent>

<artifactId>redhat-camel-spring-boot-patch-metadata</artifactId>
<packaging>jar</packaging>
<name>Camel SB Patch Metadata</name>

<properties>
<!-- A list of versions used to filter patch metadata.xml -->
<patch.camel-version>4.4.0</patch.camel-version>
</properties>

<build>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>

<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>attach-artifacts</id>
<phase>package</phase>
<goals>
<goal>attach-artifact</goal>
</goals>
<configuration>
<artifacts>
<artifact>
<file>${project.build.outputDirectory}/metadata.xml</file>
<type>xml</type>
</artifact>
</artifacts>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!--
Copyright 2005-2023 Red Hat, Inc.
Red Hat 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.
-->
<metadata xmlns="urn:redhat:patch-metadata:1">
<product-bom groupId="com.redhat.camel.springboot.platform" artifactId="camel-spring-boot-bom" versions="[3.18,3.19)" />
<cves>
<!--cve id="CVE-2023-123456" description="A CVE"
cve-link="https://cve.mitre.org/cgi-bin/cvename.cgi?name=2023-123456"
bz-link="https://bugzilla.redhat.com/show_bug.cgi?id=0123456789">
<affects groupId="com.example" artifactId="example-*" versions="[1.0, 1.2)" fix="1.2" />
</cve-->
</cves>
<fixes>
<!--fix id="HF0-1" description="Camel on Spring Boot 3.18 HF0 (example) - Camel Core fix">
<affects groupId="org.apache.camel" artifactId="camel-core" versions="[3.0,${patch.camel-version})" fix="${patch.camel-version}" />
</fix-->
</fixes>
</metadata>
Loading

0 comments on commit a8e638a

Please sign in to comment.