From f216f4315e5838bc2b76cfd338dc9f9e0c5213a1 Mon Sep 17 00:00:00 2001
From: Ozan Gunalp <ozangunalp@gmail.com>
Date: Wed, 18 Dec 2024 13:53:22 +0100
Subject: [PATCH] Baseline Java 17, drop Java 11

---
 .github/workflows/build-main-branches.yml |  7 +------
 .github/workflows/build-podman.yml        | 11 -----------
 .github/workflows/build-pull.yml          |  5 -----
 pom.xml                                   | 19 +++++--------------
 4 files changed, 6 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/build-main-branches.yml b/.github/workflows/build-main-branches.yml
index 5ce0e89f7..e5172d21f 100644
--- a/.github/workflows/build-main-branches.yml
+++ b/.github/workflows/build-main-branches.yml
@@ -16,11 +16,6 @@ jobs:
         strategy:
             matrix:
                 java: [
-                    {
-                        'name': '',
-                        'version': '11',
-                        'build_opts': '-Drevapi.skip=true'
-                    },
                     {
                         'name': '',
                         'version': '17',
@@ -62,7 +57,7 @@ jobs:
             -   uses: actions/checkout@v4
             -   uses: actions/setup-java@v4
                 with:
-                    java-version: 11
+                    java-version: 17
                     distribution: temurin
                     cache: maven
             -   name: Coverage and Sonar
diff --git a/.github/workflows/build-podman.yml b/.github/workflows/build-podman.yml
index 329cecec4..66a582ac0 100644
--- a/.github/workflows/build-podman.yml
+++ b/.github/workflows/build-podman.yml
@@ -15,11 +15,6 @@ jobs:
         strategy:
             matrix:
                 java: [
-                    {
-                        'name': '',
-                        'version': '11',
-                        'build_opts': '-Drevapi.skip=true'
-                    },
                     {
                         'name': '',
                         'version': '17',
@@ -31,12 +26,6 @@ jobs:
                     {
                         'name': '',
                         'version': '23',
-                    },
-                    {
-                        'version': '11',
-                        'build_opts': '-Pslow-flaky-tests -Drevapi.skip=true',
-                        'name': 'Slow and Flaky tests',
-                        'continue-on-error': true
                     }
                 ]
         name: Build with Java ${{ matrix.java.version }} ${{ matrix.java.name }}
diff --git a/.github/workflows/build-pull.yml b/.github/workflows/build-pull.yml
index 5093d0fd5..17a790907 100644
--- a/.github/workflows/build-pull.yml
+++ b/.github/workflows/build-pull.yml
@@ -15,11 +15,6 @@ jobs:
         strategy:
             matrix:
                 java: [
-                    {
-                        'name': '',
-                        'version': '11',
-                        'build_opts': '-Drevapi.skip=true'
-                    },
                     {
                         'name': '',
                         'version': '17',
diff --git a/pom.xml b/pom.xml
index bf466dd7d..96d6eb95f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,9 +56,9 @@
 
 
   <properties>
-    <maven.compiler.release>11</maven.compiler.release>
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
+    <maven.compiler.release>17</maven.compiler.release>
+    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.target>17</maven.compiler.target>
 
     <vertx.version>4.5.11</vertx.version>
     <rxjava.version>2.2.21</rxjava.version>
@@ -145,6 +145,7 @@
     <module>smallrye-reactive-messaging-gcp-pubsub</module>
     <module>smallrye-reactive-messaging-pulsar</module>
     <module>smallrye-reactive-messaging-aws-sqs</module>
+    <module>smallrye-reactive-messaging-camel</module>
 
     <module>smallrye-connector-attribute-processor</module>
     <module>smallrye-reactive-messaging-connector-archetype</module>
@@ -686,16 +687,6 @@
   </build>
 
   <profiles>
-    <profile>
-      <id>with-camel</id>
-      <activation>
-        <jdk>[17,)</jdk>
-      </activation>
-      <modules>
-        <module>smallrye-reactive-messaging-camel</module>
-        <module>documentation</module>
-      </modules>
-    </profile>
     <profile>
       <id>skipped-from-release</id>
       <activation>
@@ -705,7 +696,7 @@
         </property>
       </activation>
       <modules>
-<!--        <module>documentation</module>--> <!-- deploy skipped in module -->
+        <module>documentation</module>
         <module>tck</module>
         <module>examples/quickstart</module>
         <module>examples/kafka-quickstart</module>