Upgrade to Camel Quarkus 2.3.0, make the examples runnable against alternative BOMs

.github/test-categories.yaml

@@ -39,3 +39,5 @@ group-06:
 group-07:
   - kafka
   - kamelet-chucknorris
+group-08:
+  - jdbc-datasource

.github/workflows/ci-build.yaml

@@ -69,13 +69,12 @@ jobs:
             && cd ${{ runner.temp }}/camel-quarkus \
             && echo "Current Camel Quarkus commit:" $(git rev-parse HEAD) \
             && ./mvnw ${MAVEN_ARGS} clean install -Dquickly
-      - name: mvn license:check formatter:validate impsort:check cq:sync-example-properties
+      - name: mvn license:check formatter:validate impsort:check
         run: |
           ./mvnw-for-each.sh ${MAVEN_ARGS} \
             license:check \
             net.revelc.code.formatter:formatter-maven-plugin:validate \
-            net.revelc.code:impsort-maven-plugin:check \
-            org.l2x6.cq:cq-maven-plugin:0.33.0:sync-example-properties
+            net.revelc.code:impsort-maven-plugin:check
       - name: Validate test categories YAML
         run: |
           VALID=true

aws-lambda/src/main/java/org/apache/camel/quarkus/examples/AWSLambdaHandler.java → aws-lambda/src/main/java/org/acme/aws/lambda/AWSLambdaHandler.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.quarkus.examples;
+package org.acme.aws.lambda;
 
 import javax.inject.Inject;
 import javax.inject.Named;

aws-lambda/src/main/java/org/apache/camel/quarkus/examples/CamelRoute.java → aws-lambda/src/main/java/org/acme/aws/lambda/CamelRoute.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.quarkus.examples;
+package org.acme.aws.lambda;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;

aws-lambda/src/main/java/org/apache/camel/quarkus/examples/GreetService.java → aws-lambda/src/main/java/org/acme/aws/lambda/GreetService.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.quarkus.examples;
+package org.acme.aws.lambda;
 
 import javax.enterprise.context.ApplicationScoped;
 

aws-lambda/src/main/java/org/apache/camel/quarkus/examples/Person.java → aws-lambda/src/main/java/org/acme/aws/lambda/Person.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.quarkus.examples;
+package org.acme.aws.lambda;
 
 public class Person {
 

aws-lambda/src/test/java/org/apache/camel/quarkus/examples/AWSLambdaHandlerTest.java → aws-lambda/src/test/java/org/acme/aws/lambda/AWSLambdaHandlerTest.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.quarkus.examples;
+package org.acme.aws.lambda;
 
 import io.quarkus.amazon.lambda.test.LambdaClient;
 import io.quarkus.test.junit.QuarkusTest;

aws-lambda/src/test/java/org/apache/camel/quarkus/examples/AWSLambdaHandlerTestIT.java → aws-lambda/src/test/java/org/acme/aws/lambda/AWSLambdaHandlerTestIT.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.quarkus.examples;
+package org.acme.aws.lambda;
 
 import io.quarkus.test.junit.NativeImageTest;
 

docs/modules/ROOT/attachments/examples.json

@@ -4,6 +4,11 @@
     "description": "Demonstrates how to set-up a Camel component (the `log` component in this case) programmatically using CDI",
     "link": "https://github.com/apache/camel-quarkus-examples/tree/main/timer-log-cdi"
   },
+  {
+    "title": "Connecting to a JDBC DataSource",
+    "description": "Shows how to connect to a Database using Datastores.",
+    "link": "https://github.com/apache/camel-quarkus-examples/tree/main/jdbc-datasource"
+  },
   {
     "title": "Custom `main()`",
     "description": "Shows how to start Camel from a custom `main()` method",

file-bindy-ftp/pom.xml

@@ -22,14 +22,19 @@
 
     <artifactId>camel-quarkus-examples-file-bindy-ftp</artifactId>
     <groupId>org.apache.camel.quarkus.examples</groupId>
-    <version>2.2.0</version>
+    <version>2.3.0-SNAPSHOT</version>
 
     <name>Camel Quarkus :: Examples :: File Bindy FTP</name>
     <description>Camel Quarkus Example :: File Bindy FTP</description>
 
     <properties>
-        <camel-quarkus.version>2.2.0</camel-quarkus.version>
-        <quarkus.version>2.2.0.Final</quarkus.version>
+        <quarkus.platform.version>2.3.0.Final</quarkus.platform.version>
+        <camel-quarkus.platform.version>2.3.0</camel-quarkus.platform.version>
+
+        <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
+        <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
+        <camel-quarkus.platform.group-id>org.apache.camel.quarkus</camel-quarkus.platform.group-id>
+        <camel-quarkus.platform.artifact-id>camel-quarkus-bom</camel-quarkus.platform.artifact-id>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -51,16 +56,16 @@
         <dependencies>
             <!-- Import BOM -->
             <dependency>
-                <groupId>org.apache.camel.quarkus</groupId>
-                <artifactId>camel-quarkus-bom</artifactId>
-                <version>${camel-quarkus.version}</version>
+                <groupId>${quarkus.platform.group-id}</groupId>
+                <artifactId>${quarkus.platform.artifact-id}</artifactId>
+                <version>${quarkus.platform.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
-                <groupId>org.apache.camel.quarkus</groupId>
-                <artifactId>camel-quarkus-bom-test</artifactId>
-                <version>${camel-quarkus.version}</version>
+                <groupId>${camel-quarkus.platform.group-id}</groupId>
+                <artifactId>${camel-quarkus.platform.artifact-id}</artifactId>
+                <version>${camel-quarkus.platform.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -174,9 +179,9 @@
                 </plugin>
 
                 <plugin>
-                    <groupId>io.quarkus</groupId>
+                    <groupId>${quarkus.platform.group-id}</groupId>
                     <artifactId>quarkus-maven-plugin</artifactId>
-                    <version>${quarkus.version}</version>
+                    <version>${quarkus.platform.version}</version>
                 </plugin>
 
                 <plugin>
@@ -223,7 +228,7 @@
 
         <plugins>
             <plugin>
-                <groupId>io.quarkus</groupId>
+                <groupId>${quarkus.platform.group-id}</groupId>
                 <artifactId>quarkus-maven-plugin</artifactId>
                 <executions>
                     <execution>

file-bindy-ftp/src/main/java/org/apache/camel/example/Book.java → file-bindy-ftp/src/main/java/org/acme/bindy/ftp/Book.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.example;
+package org.acme.bindy.ftp;
 
 import java.util.Objects;
 

file-bindy-ftp/src/main/java/org/apache/camel/example/BookGenerator.java → file-bindy-ftp/src/main/java/org/acme/bindy/ftp/BookGenerator.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.example;
+package org.acme.bindy.ftp;
 
 import java.util.ArrayList;
 import java.util.List;

file-bindy-ftp/src/main/java/org/apache/camel/example/Routes.java → file-bindy-ftp/src/main/java/org/acme/bindy/ftp/Routes.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.example;
+package org.acme.bindy.ftp;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;

file-bindy-ftp/src/test/java/org/apache/camel/example/FileToFtpIT.java → file-bindy-ftp/src/test/java/org/acme/bindy/ftp/FileToFtpIT.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.example;
+package org.acme.bindy.ftp;
 
 import io.quarkus.test.junit.NativeImageTest;
 

file-bindy-ftp/src/test/java/org/apache/camel/example/FileToFtpTest.java → file-bindy-ftp/src/test/java/org/acme/bindy/ftp/FileToFtpTest.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.example;
+package org.acme.bindy.ftp;
 
 import java.util.concurrent.TimeUnit;
 

file-bindy-ftp/src/test/java/org/apache/camel/example/FtpTestResource.java → file-bindy-ftp/src/test/java/org/acme/bindy/ftp/FtpTestResource.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.example;
+package org.acme.bindy.ftp;
 
 import java.io.IOException;
 import java.nio.file.Path;

file-split-log-xml/pom.xml

@@ -22,14 +22,19 @@
 
     <artifactId>camel-quarkus-examples-file-log-xml</artifactId>
     <groupId>org.apache.camel.quarkus.examples</groupId>
-    <version>2.2.0</version>
+    <version>2.3.0-SNAPSHOT</version>
 
     <name>Camel Quarkus :: Examples :: File To Log XML DSL</name>
     <description>Camel Quarkus Example :: File To Log XML DSL</description>
 
     <properties>
-        <camel-quarkus.version>2.2.0</camel-quarkus.version>
-        <quarkus.version>2.2.0.Final</quarkus.version>
+        <quarkus.platform.version>2.3.0.Final</quarkus.platform.version>
+        <camel-quarkus.platform.version>2.3.0</camel-quarkus.platform.version>
+
+        <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
+        <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
+        <camel-quarkus.platform.group-id>org.apache.camel.quarkus</camel-quarkus.platform.group-id>
+        <camel-quarkus.platform.artifact-id>camel-quarkus-bom</camel-quarkus.platform.artifact-id>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -51,9 +56,16 @@
         <dependencies>
             <!-- Import BOM -->
             <dependency>
-                <groupId>org.apache.camel.quarkus</groupId>
-                <artifactId>camel-quarkus-bom</artifactId>
-                <version>${camel-quarkus.version}</version>
+                <groupId>${quarkus.platform.group-id}</groupId>
+                <artifactId>${quarkus.platform.artifact-id}</artifactId>
+                <version>${quarkus.platform.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>${camel-quarkus.platform.group-id}</groupId>
+                <artifactId>${camel-quarkus.platform.artifact-id}</artifactId>
+                <version>${camel-quarkus.platform.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -146,9 +158,9 @@
                 </plugin>
 
                 <plugin>
-                    <groupId>io.quarkus</groupId>
+                    <groupId>${quarkus.platform.group-id}</groupId>
                     <artifactId>quarkus-maven-plugin</artifactId>
-                    <version>${quarkus.version}</version>
+                    <version>${quarkus.platform.version}</version>
                 </plugin>
 
                 <plugin>
@@ -196,7 +208,7 @@
 
         <plugins>
             <plugin>
-                <groupId>io.quarkus</groupId>
+                <groupId>${quarkus.platform.group-id}</groupId>
                 <artifactId>quarkus-maven-plugin</artifactId>
                 <executions>
                     <execution>

file-split-log-xml/src/main/java/org/acme/filereader/DummyClass.java → file-split-log-xml/src/main/java/org/acme/file/xml/DummyClass.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.acme.filereader;
+package org.acme.file.xml;
 
 public class DummyClass {
 }

file-split-log-xml/src/test/java/org/acme/filereader/FileSplitLogXmlIT.java → file-split-log-xml/src/test/java/org/acme/file/xml/FileSplitLogXmlIT.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.acme.filereader;
+package org.acme.file.xml;
 
 import io.quarkus.test.junit.NativeImageTest;
 

file-split-log-xml/src/test/java/org/acme/filereader/FileSplitLogXmlTest.java → file-split-log-xml/src/test/java/org/acme/file/xml/FileSplitLogXmlTest.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.acme.filereader;
+package org.acme.file.xml;
 
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;

health/pom.xml

@@ -22,14 +22,19 @@
 
     <artifactId>camel-quarkus-examples-health</artifactId>
     <groupId>org.apache.camel.quarkus.examples</groupId>
-    <version>2.2.0</version>
+    <version>2.3.0-SNAPSHOT</version>
 
     <name>Camel Quarkus :: Examples :: Health</name>
     <description>Camel Quarkus Example :: Health Check</description>
 
     <properties>
-        <camel-quarkus.version>2.2.0</camel-quarkus.version>
-        <quarkus.version>2.2.0.Final</quarkus.version>
+        <quarkus.platform.version>2.3.0.Final</quarkus.platform.version>
+        <camel-quarkus.platform.version>2.3.0</camel-quarkus.platform.version>
+
+        <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
+        <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
+        <camel-quarkus.platform.group-id>org.apache.camel.quarkus</camel-quarkus.platform.group-id>
+        <camel-quarkus.platform.artifact-id>camel-quarkus-bom</camel-quarkus.platform.artifact-id>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -51,9 +56,16 @@
         <dependencies>
             <!-- Import BOM -->
             <dependency>
-                <groupId>org.apache.camel.quarkus</groupId>
-                <artifactId>camel-quarkus-bom</artifactId>
-                <version>${camel-quarkus.version}</version>
+                <groupId>${quarkus.platform.group-id}</groupId>
+                <artifactId>${quarkus.platform.artifact-id}</artifactId>
+                <version>${quarkus.platform.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>${camel-quarkus.platform.group-id}</groupId>
+                <artifactId>${camel-quarkus.platform.artifact-id}</artifactId>
+                <version>${camel-quarkus.platform.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -145,9 +157,9 @@
                 </plugin>
 
                 <plugin>
-                    <groupId>io.quarkus</groupId>
+                    <groupId>${quarkus.platform.group-id}</groupId>
                     <artifactId>quarkus-maven-plugin</artifactId>
-                    <version>${quarkus.version}</version>
+                    <version>${quarkus.platform.version}</version>
                 </plugin>
 
                 <plugin>
@@ -194,7 +206,7 @@
 
         <plugins>
             <plugin>
-                <groupId>io.quarkus</groupId>
+                <groupId>${quarkus.platform.group-id}</groupId>
                 <artifactId>quarkus-maven-plugin</artifactId>
                 <executions>
                     <execution>